Merge branch 'main' into cargo-zigbuild

richarddavison · web-flow · commit 306c2cdaaf8f · 2024-01-29T15:00:00.000+01:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -54,5 +54,5 @@ jobs:
             ./llrt-lambda-arm64.zip
             ./llrt-linux-x64.zip
             ./llrt-linux-arm64.zip
-            ./lrt-darwin-x64.zip
+            ./llrt-darwin-x64.zip
             ./llrt-darwin-arm64.zip
diff --git a/Makefile b/Makefile
@@ -146,7 +146,6 @@ test-ci: clean-js | toolchain js
 	$(CARGO_TEST_CMD) $(TOOLCHAIN) -Z panic-abort-tests test --target $(CURRENT_TARGET)
 	$(CARGO_TEST_CMD) $(TOOLCHAIN) run -r --target $(CURRENT_TARGET) -- test -d bundle
 
-
 libs-arm64: lib/arm64/libzstd.a lib/zstd.h
 libs-x64: lib/x64/libzstd.a lib/zstd.h
 
diff --git a/src/console.rs b/src/console.rs
@@ -545,8 +545,13 @@ fn format_values_internal<'js>(
     tty: bool,
     newline_char: char,
 ) -> Result<()> {
+    let mut write_space = false;
     for arg in args.0.into_iter() {
+        if write_space {
+            result.push(' ');
+        }
         stringify_value(result, ctx, arg, tty, newline_char)?;
+        write_space = true
     }
     Ok(())
 }

Original file line number	Diff line number	Diff line change
`@@ -545,8 +545,13 @@ fn format_values_internal<'js>(`
`545`	`545`	`tty: bool,`
`546`	`546`	`newline_char: char,`
`547`	`547`	`) -> Result<()> {`
	`548`	`+ let mut write_space = false;`
`548`	`549`	`for arg in args.0.into_iter() {`
	`550`	`+ if write_space {`
	`551`	`+ result.push(' ');`
	`552`	`+ }`
`549`	`553`	`stringify_value(result, ctx, arg, tty, newline_char)?;`
	`554`	`+ write_space = true`
`550`	`555`	`}`
`551`	`556`	`Ok(())`
`552`	`557`	`}`