diff --git a/tool/auto-style.rb b/tool/auto-style.rb index 71139c8eb8..39e7d14cb9 100755 --- a/tool/auto-style.rb +++ b/tool/auto-style.rb @@ -191,7 +191,7 @@ updated_files = git.updated_paths files = updated_files.select {|l| /^\d/ !~ l and /\.bat\z/ !~ l and (/\A(?:config|[Mm]akefile|GNUmakefile|README)/ =~ File.basename(l) or - /\A\z|\.(?:[chsy]|\d+|e?rb|tmpl|bas[eh]|z?sh|in|ma?k|def|src|trans|rdoc|ja|en|el|sed|awk|p[ly]|scm|mspec|html|)\z/ =~ File.extname(l)) + /\A\z|\.(?:[chsy]|\d+|e?rb|tmpl|bas[eh]|z?sh|in|ma?k|def|src|trans|rdoc|ja|en|el|sed|awk|p[ly]|scm|mspec|html|rs)\z/ =~ File.extname(l)) } files.select! {|n| File.file?(n) } files.reject! do |f| diff --git a/zjit/src/codegen.rs b/zjit/src/codegen.rs index 58a5a6d5fa..918d6bdf69 100644 --- a/zjit/src/codegen.rs +++ b/zjit/src/codegen.rs @@ -818,7 +818,7 @@ fn gen_fixnum_ge(asm: &mut Assembler, left: lir::Opnd, right: lir::Opnd) -> Opti fn gen_anytostring(asm: &mut Assembler, val: lir::Opnd, str: lir::Opnd, state: &FrameState) -> Option { // Save PC gen_save_pc(asm, state); - + asm_comment!(asm, "call rb_obj_as_string_result"); Some(asm.ccall( rb_obj_as_string_result as *const u8, diff --git a/zjit/src/hir.rs b/zjit/src/hir.rs index 682dae9423..4477c3eb7b 100644 --- a/zjit/src/hir.rs +++ b/zjit/src/hir.rs @@ -1440,7 +1440,7 @@ impl Function { if self.is_a(str, types::String) { self.make_equal_to(insn_id, str); } else { - self.push_insn_id(block, insn_id); + self.push_insn_id(block, insn_id); } } _ => { self.push_insn_id(block, insn_id); }