Merge branch 'main' into fix/replace_panic_with_internal_error

roc-lang · Jun 27, 2023 · feec075 · feec075
2 parents 3803331 + e3ab023
commit feec075
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/crates/ast/src/solve_type.rs b/crates/ast/src/solve_type.rs
@@ -606,7 +606,10 @@ fn solve<'a>(
                             let result = offenders.len();
 
                             if result > 0 {
-                                dbg!(&subs, &offenders, &let_con.def_types);
+                                eprintln!(
+                                    "subs: {:?}\n\noffenders: {:?}\n\nlet_con.def_types: {:?}\n",
+                                    &subs, &offenders, &let_con.def_types
+                                );
                             }
 
                             result

diff --git a/crates/glue/tests/fixture-templates/rust/build.rs b/crates/glue/tests/fixture-templates/rust/build.rs
@@ -10,6 +10,11 @@
 // file with the same name in the fixture-templates/ directory.
 
 fn main() {
+    #[cfg(not(windows))]
     println!("cargo:rustc-link-lib=dylib=app");
+
+    #[cfg(windows)]
+    println!("cargo:rustc-link-lib=dylib=libapp");
+
     println!("cargo:rustc-link-search=.");
 }
diff --git a/examples/glue/rust-platform/src/lib.rs b/examples/glue/rust-platform/src/lib.rs
@@ -87,7 +87,7 @@ pub extern "C" fn rust_main() -> i32 {
     let mut op: Op = roc_main();
 
     loop {
-        match dbg!(op.discriminant()) {
+        match op.discriminant() {
             StdoutWrite => {
                 let stdout_write = op.get_StdoutWrite();
                 let output: RocStr = stdout_write.f0;