From bc0c9250f95d5eff11ab6fee1ece5a912344c54d Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Sat, 30 Nov 2024 14:16:29 -0500 Subject: [PATCH] Convert unused dbg!()s to eprintln!()s This makes it nicer to work with dbg! normally, because grepping the code base for dbg!() reveals only the usages of it that are currently active. --- crates/compiler/can/src/suffixed.rs | 2 +- crates/compiler/gen_dev/src/run_roc.rs | 2 +- crates/compiler/parse/tests/test_parse.rs | 4 ++-- crates/compiler/specialize_types/src/specialize_type.rs | 2 +- crates/compiler/test_gen/src/helpers/dev.rs | 2 -- crates/compiler/unify/src/unify.rs | 4 ++-- crates/linker/src/macho.rs | 5 ----- crates/linker/src/pe.rs | 1 - crates/repl_test/test_wasm.sh | 2 +- crates/repl_wasm/src/externs_js.rs | 2 +- 10 files changed, 9 insertions(+), 17 deletions(-) diff --git a/crates/compiler/can/src/suffixed.rs b/crates/compiler/can/src/suffixed.rs index 7f8ef1f88e..3b17220623 100644 --- a/crates/compiler/can/src/suffixed.rs +++ b/crates/compiler/can/src/suffixed.rs @@ -164,7 +164,7 @@ pub fn unwrap_suffixed_expression<'a>( // USEFUL TO SEE THE UNWRAPPING // OF AST NODES AS THEY DESCEND // if is_expr_suffixed(&loc_expr.value) { - // dbg!(&maybe_def_pat, &loc_expr, &unwrapped_expression); + // eprintln!("{:?}, {:?}, {:?}", &maybe_def_pat, &loc_expr, &unwrapped_expression); // } unwrapped_expression diff --git a/crates/compiler/gen_dev/src/run_roc.rs b/crates/compiler/gen_dev/src/run_roc.rs index a0d20c0d12..3cafcd632a 100644 --- a/crates/compiler/gen_dev/src/run_roc.rs +++ b/crates/compiler/gen_dev/src/run_roc.rs @@ -19,7 +19,7 @@ macro_rules! run_jit_function_raw { let result = main(); if !$errors.is_empty() { - dbg!(&$errors); + eprintln!("{:?}", &$errors); assert_eq!( $errors, diff --git a/crates/compiler/parse/tests/test_parse.rs b/crates/compiler/parse/tests/test_parse.rs index 2e4e0deadb..e73ee85f98 100644 --- a/crates/compiler/parse/tests/test_parse.rs +++ b/crates/compiler/parse/tests/test_parse.rs @@ -372,10 +372,10 @@ mod test_parse { let parsed = parse_module_defs(arena, state, ast::Defs::default()); match parsed { Ok(_) => { - // dbg!(_state); + // eprintln!("{:?}", _state); } Err(_) => { - // dbg!(_fail, _state); + // eprintln!("{:?}, {:?}", _fail, _state); panic!("Failed to parse!"); } } diff --git a/crates/compiler/specialize_types/src/specialize_type.rs b/crates/compiler/specialize_types/src/specialize_type.rs index 794bdf269e..5e5d6fbed1 100644 --- a/crates/compiler/specialize_types/src/specialize_type.rs +++ b/crates/compiler/specialize_types/src/specialize_type.rs @@ -155,7 +155,7 @@ impl<'a, 'c, 'd, 'e, 'f, 'm, 'p, P: Push> Env<'a, 'c, 'd, 'e, 'f, 'm, ' } // Convert the Content to a MonoType, often by passing an iterator. None of these iterators introduce allocations. - let mono_id = match dbg!(*subs.get_content_without_compacting(root_var)) { + let mono_id = match *subs.get_content_without_compacting(root_var) { Content::Structure(flat_type) => match flat_type { FlatType::Apply(symbol, args) => { if symbol.is_builtin() { diff --git a/crates/compiler/test_gen/src/helpers/dev.rs b/crates/compiler/test_gen/src/helpers/dev.rs index cf6dda823d..84b3e5dcfc 100644 --- a/crates/compiler/test_gen/src/helpers/dev.rs +++ b/crates/compiler/test_gen/src/helpers/dev.rs @@ -340,8 +340,6 @@ pub(crate) fn asm_evals_to( let result = crate::helpers::dev::run_test_main::(&lib); if !errors.is_empty() { - dbg!(&errors); - assert_eq!( errors, std::vec::Vec::new(), diff --git a/crates/compiler/unify/src/unify.rs b/crates/compiler/unify/src/unify.rs index 815570ec69..d5829a4170 100644 --- a/crates/compiler/unify/src/unify.rs +++ b/crates/compiler/unify/src/unify.rs @@ -448,9 +448,9 @@ fn debug_print_unified_types( // let (type1, _problems1) = subs.var_to_error_type(ctx.first); // let (type2, _problems2) = subs.var_to_error_type(ctx.second); // println!("\n --------------- \n"); - // dbg!(ctx.first, type1); + // eprintln!("{:?}, {:?}", ctx.first, type1); // println!("\n --- \n"); - // dbg!(ctx.second, type2); + // eprintln!({:?}, {:?}", ctx.second, type2); // println!("\n --------------- \n"); let content_1 = env.get(ctx.first).content; let content_2 = env.get(ctx.second).content; diff --git a/crates/linker/src/macho.rs b/crates/linker/src/macho.rs index 4323ece88d..87be587cd5 100644 --- a/crates/linker/src/macho.rs +++ b/crates/linker/src/macho.rs @@ -763,11 +763,6 @@ fn gen_macho_le( // .set(LE , old_offset + md.added_byte_count as u32); // } - // // dbg!(§ion.reloff.get(LE)); - // // dbg!(section.reloff.get(LE) as i32); - // // dbg!(§ion); - // // dbg!(&md.added_byte_count); - // // dbg!(String::from_utf8_lossy(§ion.sectname)); // if section.nreloc.get(LE) > 0 { // section.reloff.set( // LE , diff --git a/crates/linker/src/pe.rs b/crates/linker/src/pe.rs index 96125f3169..4002f6891f 100644 --- a/crates/linker/src/pe.rs +++ b/crates/linker/src/pe.rs @@ -614,7 +614,6 @@ impl DynamicRelocationsPe { let mut it = import_table.descriptors()?; while let Some(descriptor) = it.next()? { let name = import_table.name(descriptor.name.get(LE))?; - // dbg!(String::from_utf8_lossy(name)); if name == APP_DLL.as_bytes() { return Ok(Some((*descriptor, index))); diff --git a/crates/repl_test/test_wasm.sh b/crates/repl_test/test_wasm.sh index bbc8374d28..5d510dccab 100755 --- a/crates/repl_test/test_wasm.sh +++ b/crates/repl_test/test_wasm.sh @@ -6,7 +6,7 @@ set -euxo pipefail # If we ever decide to do that, one of the cargo processes will need to use the `--target-dir` option. # We need to clear RUSTFLAGS for this command, as CI sets normally some flags that are specific to CPU targets. -# Tests target wasm32-wasi instead of wasm32-unknown-unknown, so that we can debug with println! and dbg! +# Tests target wasm32-wasi instead of wasm32-unknown-unknown, so that we can debug with println! and dbg # This has to be built with lto for now. If we do not use lto, it will pull in system calls we don't yet support. # TODO: Add system calls to our wasi interp so that this can just be built in release without lto. RUSTFLAGS="" cargo build --locked --profile release-with-lto --target wasm32-wasi -p roc_repl_wasm --no-default-features --features wasi_test diff --git a/crates/repl_wasm/src/externs_js.rs b/crates/repl_wasm/src/externs_js.rs index 72ad6c20d1..ef973105ef 100644 --- a/crates/repl_wasm/src/externs_js.rs +++ b/crates/repl_wasm/src/externs_js.rs @@ -20,7 +20,7 @@ extern "C" { // To debug in the browser, start up the web REPL as per instructions in repl_www/README.md // and sprinkle your code with console_log!("{:?}", my_value); -// (Or if you're running the unit tests with WASI, you can just use println! or dbg!) +// (Or if you're running the unit tests with WASI, you can just use println! or dbg) #[macro_export] macro_rules! console_log { ($($t:tt)*) => (log(&format_args!($($t)*).to_string()))