Rename

Author: tekknolagi

zjit/src/backend/lir.rs

@@ -1903,15 +1903,15 @@ impl Assembler
 
 /// Return a result of fmt::Display for Assembler without escape sequence
 pub fn lir_string(asm: &Assembler) -> String {
-    use crate::utils::TTY_TERMINAL_COLOR;
+    use crate::ttycolors::TTY_TERMINAL_COLOR;
     format!("{asm}").replace(TTY_TERMINAL_COLOR.bold_begin, "").replace(TTY_TERMINAL_COLOR.bold_end, "")
 }
 
 impl fmt::Display for Assembler {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         // Count the number of duplicated label names to disambiguate them if needed
         let mut label_counts: HashMap<&String, usize> = HashMap::new();
-        let colors = crate::utils::get_colors();
+        let colors = crate::ttycolors::get_colors();
         let bold_begin = colors.bold_begin;
         let bold_end = colors.bold_end;
         for label_name in self.label_names.iter() {
@@ -2507,7 +2507,7 @@ impl AssemblerPanicHook {
 
     /// Dump Assembler, highlighting the insn_idx line
     fn dump_asm(asm: &Assembler, insn_idx: usize) {
-        let colors = crate::utils::get_colors();
+        let colors = crate::ttycolors::get_colors();
         let bold_begin = colors.bold_begin;
         let bold_end = colors.bold_end;
         let lir_string = lir_string(asm);

zjit/src/disasm.rs

@@ -33,7 +33,7 @@ pub fn disasm_addr_range(cb: &CodeBlock, start_addr: usize, end_addr: usize) ->
     let start_addr = 0;
     let insns = cs.disasm_all(code_slice, start_addr as u64).unwrap();
 
-    let colors = crate::utils::get_colors();
+    let colors = crate::ttycolors::get_colors();
     let bold_begin = colors.bold_begin;
     let bold_end = colors.bold_end;
 

zjit/src/utils.rs zjit/src/ttycolors.rszjit/src/utils.rs renamed to zjit/src/ttycolors.rs

@@ -23,7 +23,7 @@ pub static NON_TTY_TERMINAL_COLOR: TerminalColor = TerminalColor {
 
 /// Terminal escape codes for colors, font weight, etc. Only enabled if stdout is a TTY.
 pub fn get_colors() -> &'static TerminalColor {
-    if crate::utils::stdout_supports_colors() {
+    if stdout_supports_colors() {
         &TTY_TERMINAL_COLOR
     } else {
         &NON_TTY_TERMINAL_COLOR