diff --git a/crates/cli/tests/fixtures/multi-dep-str/platform/host.zig b/crates/cli/tests/fixtures/multi-dep-str/platform/host.zig index ec51bae0db..029a3ea4ed 100644 --- a/crates/cli/tests/fixtures/multi-dep-str/platform/host.zig +++ b/crates/cli/tests/fixtures/multi-dep-str/platform/host.zig @@ -52,7 +52,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; } diff --git a/crates/cli/tests/fixtures/multi-dep-thunk/platform/host.zig b/crates/cli/tests/fixtures/multi-dep-thunk/platform/host.zig index 8fa8f43761..3859fd9015 100644 --- a/crates/cli/tests/fixtures/multi-dep-thunk/platform/host.zig +++ b/crates/cli/tests/fixtures/multi-dep-thunk/platform/host.zig @@ -52,7 +52,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; } diff --git a/crates/cli/tests/fixtures/packages/platform/host.zig b/crates/cli/tests/fixtures/packages/platform/host.zig index ec51bae0db..029a3ea4ed 100644 --- a/crates/cli/tests/fixtures/packages/platform/host.zig +++ b/crates/cli/tests/fixtures/packages/platform/host.zig @@ -52,7 +52,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; } diff --git a/crates/cli_testing_examples/algorithms/fibonacci-platform/host.zig b/crates/cli_testing_examples/algorithms/fibonacci-platform/host.zig index e47943f057..e75b1dd7a0 100644 --- a/crates/cli_testing_examples/algorithms/fibonacci-platform/host.zig +++ b/crates/cli_testing_examples/algorithms/fibonacci-platform/host.zig @@ -66,7 +66,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; } diff --git a/crates/cli_testing_examples/algorithms/quicksort-platform/host.zig b/crates/cli_testing_examples/algorithms/quicksort-platform/host.zig index bf75f85e11..50362d5f5c 100644 --- a/crates/cli_testing_examples/algorithms/quicksort-platform/host.zig +++ b/crates/cli_testing_examples/algorithms/quicksort-platform/host.zig @@ -63,7 +63,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; } diff --git a/crates/cli_testing_examples/benchmarks/platform/host.zig b/crates/cli_testing_examples/benchmarks/platform/host.zig index 1697387715..f227605d28 100644 --- a/crates/cli_testing_examples/benchmarks/platform/host.zig +++ b/crates/cli_testing_examples/benchmarks/platform/host.zig @@ -68,7 +68,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; } diff --git a/crates/cli_testing_examples/expects/zig-platform/host.zig b/crates/cli_testing_examples/expects/zig-platform/host.zig index a12639395b..1ac9ce6dbe 100644 --- a/crates/cli_testing_examples/expects/zig-platform/host.zig +++ b/crates/cli_testing_examples/expects/zig-platform/host.zig @@ -52,7 +52,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { // This platform uses stdout for testing purposes instead of the normal stderr. const stdout = std.io.getStdOut().writer(); stdout.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; diff --git a/crates/compiler/builtins/bitcode/src/dbg.zig b/crates/compiler/builtins/bitcode/src/dbg.zig index a10d44425d..29004d7f37 100644 --- a/crates/compiler/builtins/bitcode/src/dbg.zig +++ b/crates/compiler/builtins/bitcode/src/dbg.zig @@ -3,7 +3,7 @@ const builtin = @import("builtin"); const RocStr = @import("str.zig").RocStr; // An optional debug impl to be called during `roc test` -pub fn dbg_impl(loc: *const RocStr, src: *const RocStr, msg: *const RocStr) callconv(.C) void { +pub fn dbg_impl(loc: *const RocStr, msg: *const RocStr, src: *const RocStr) callconv(.C) void { if (builtin.target.cpu.arch != .wasm32) { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; diff --git a/crates/compiler/builtins/bitcode/src/utils.zig b/crates/compiler/builtins/bitcode/src/utils.zig index 61a2a3ee85..2dd3f1fd2a 100644 --- a/crates/compiler/builtins/bitcode/src/utils.zig +++ b/crates/compiler/builtins/bitcode/src/utils.zig @@ -20,11 +20,11 @@ extern fn roc_realloc(c_ptr: *anyopaque, new_size: usize, old_size: usize, align // This should never be passed a null pointer. extern fn roc_dealloc(c_ptr: *anyopaque, alignment: u32) callconv(.C) void; -extern fn roc_dbg(loc: *anyopaque, src: *anyopaque, message: *anyopaque) callconv(.C) void; +extern fn roc_dbg(loc: *anyopaque, message: *anyopaque, src: *anyopaque) callconv(.C) void; // Since roc_dbg is never used by the builtins, we need at export a function that uses it to stop DCE. pub fn test_dbg(loc: *anyopaque, src: *anyopaque, message: *anyopaque) callconv(.C) void { - roc_dbg(loc, src, message); + roc_dbg(loc, message, src); } extern fn kill(pid: c_int, sig: c_int) c_int; @@ -47,7 +47,7 @@ fn testing_roc_mmap(addr: ?*anyopaque, length: c_uint, prot: c_int, flags: c_int return mmap(addr, length, prot, flags, fd, offset); } -fn testing_roc_dbg(loc: *anyopaque, src: *anyopaque, message: *anyopaque) callconv(.C) void { +fn testing_roc_dbg(loc: *anyopaque, message: *anyopaque, src: *anyopaque) callconv(.C) void { _ = message; _ = src; _ = loc; diff --git a/crates/compiler/gen_llvm/src/llvm/build.rs b/crates/compiler/gen_llvm/src/llvm/build.rs index 6231d42cc2..99048f0b7a 100644 --- a/crates/compiler/gen_llvm/src/llvm/build.rs +++ b/crates/compiler/gen_llvm/src/llvm/build.rs @@ -919,9 +919,10 @@ impl<'a, 'ctx, 'env> Env<'a, 'ctx, 'env> { let src = self.string_to_arg(env, source); let msg = self.string_to_arg(env, message); + // TODO: at some point it will be a breaking change, but flip order to (loc, src, msg) let call = self.builder - .new_build_call(function, &[loc.into(), src.into(), msg.into()], "roc_dbg"); + .new_build_call(function, &[loc.into(), msg.into(), src.into()], "roc_dbg"); call.set_call_convention(C_CALL_CONV); } diff --git a/crates/compiler/gen_llvm/src/llvm/externs.rs b/crates/compiler/gen_llvm/src/llvm/externs.rs index 61acf443c2..08e153ee60 100644 --- a/crates/compiler/gen_llvm/src/llvm/externs.rs +++ b/crates/compiler/gen_llvm/src/llvm/externs.rs @@ -167,8 +167,8 @@ pub fn add_default_roc_externs(env: &Env<'_, '_, '_>) { let fn_val = module.get_function("roc_dbg").unwrap(); let mut params = fn_val.get_param_iter(); let loc_arg = params.next().unwrap(); - let src_arg = params.next().unwrap(); let msg_arg = params.next().unwrap(); + let src_arg = params.next().unwrap(); debug_assert!(params.next().is_none()); @@ -181,7 +181,7 @@ pub fn add_default_roc_externs(env: &Env<'_, '_, '_>) { let dbg_impl = module.get_function(bitcode::UTILS_DBG_IMPL).unwrap(); let call = builder.new_build_call( dbg_impl, - &[loc_arg.into(), src_arg.into(), msg_arg.into()], + &[loc_arg.into(), msg_arg.into(), src_arg.into()], "call_utils_dbg_impl", ); diff --git a/crates/compiler/gen_wasm/src/lib.rs b/crates/compiler/gen_wasm/src/lib.rs index 65234eca60..3cb059f5d1 100644 --- a/crates/compiler/gen_wasm/src/lib.rs +++ b/crates/compiler/gen_wasm/src/lib.rs @@ -290,7 +290,7 @@ mod dummy_platform_functions { } #[no_mangle] - pub unsafe extern "C" fn roc_dbg(_loc: *mut c_void, _src: *mut c_void, _msg: *mut c_void) { + pub unsafe extern "C" fn roc_dbg(_loc: *mut c_void, _msg: *mut c_void, _src: *mut c_void) { unimplemented!("It is not valid to call roc dbg from within the compiler. Please use the \"platform\" feature if this is a platform.") } diff --git a/crates/glue/tests/fixtures/advanced-recursive-union/src/lib.rs b/crates/glue/tests/fixtures/advanced-recursive-union/src/lib.rs index 2aa41aa824..bf300bcb9f 100644 --- a/crates/glue/tests/fixtures/advanced-recursive-union/src/lib.rs +++ b/crates/glue/tests/fixtures/advanced-recursive-union/src/lib.rs @@ -77,7 +77,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/arguments/src/lib.rs b/crates/glue/tests/fixtures/arguments/src/lib.rs index 302553bcfa..a56170a3cd 100644 --- a/crates/glue/tests/fixtures/arguments/src/lib.rs +++ b/crates/glue/tests/fixtures/arguments/src/lib.rs @@ -49,7 +49,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/basic-record/src/lib.rs b/crates/glue/tests/fixtures/basic-record/src/lib.rs index afbbc41ab2..015b37a037 100644 --- a/crates/glue/tests/fixtures/basic-record/src/lib.rs +++ b/crates/glue/tests/fixtures/basic-record/src/lib.rs @@ -71,7 +71,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/basic-recursive-union/src/lib.rs b/crates/glue/tests/fixtures/basic-recursive-union/src/lib.rs index 3afcd83554..1c1658e1fc 100644 --- a/crates/glue/tests/fixtures/basic-recursive-union/src/lib.rs +++ b/crates/glue/tests/fixtures/basic-recursive-union/src/lib.rs @@ -82,7 +82,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/closures/src/lib.rs b/crates/glue/tests/fixtures/closures/src/lib.rs index d911b7bc19..1d3be6bda5 100644 --- a/crates/glue/tests/fixtures/closures/src/lib.rs +++ b/crates/glue/tests/fixtures/closures/src/lib.rs @@ -49,7 +49,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/enumeration/src/lib.rs b/crates/glue/tests/fixtures/enumeration/src/lib.rs index 1bb55876b2..aec7b403a9 100644 --- a/crates/glue/tests/fixtures/enumeration/src/lib.rs +++ b/crates/glue/tests/fixtures/enumeration/src/lib.rs @@ -75,7 +75,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/list-recursive-union/src/lib.rs b/crates/glue/tests/fixtures/list-recursive-union/src/lib.rs index 61d440a444..89ac109ec2 100644 --- a/crates/glue/tests/fixtures/list-recursive-union/src/lib.rs +++ b/crates/glue/tests/fixtures/list-recursive-union/src/lib.rs @@ -77,7 +77,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/multiple-modules/src/lib.rs b/crates/glue/tests/fixtures/multiple-modules/src/lib.rs index 665efaf527..4750a9a64a 100644 --- a/crates/glue/tests/fixtures/multiple-modules/src/lib.rs +++ b/crates/glue/tests/fixtures/multiple-modules/src/lib.rs @@ -75,7 +75,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/nested-record/src/lib.rs b/crates/glue/tests/fixtures/nested-record/src/lib.rs index f0f89ea593..d1acc81a34 100644 --- a/crates/glue/tests/fixtures/nested-record/src/lib.rs +++ b/crates/glue/tests/fixtures/nested-record/src/lib.rs @@ -75,7 +75,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/nonnullable-unwrapped/src/lib.rs b/crates/glue/tests/fixtures/nonnullable-unwrapped/src/lib.rs index 7e8f013a84..888ec70c84 100644 --- a/crates/glue/tests/fixtures/nonnullable-unwrapped/src/lib.rs +++ b/crates/glue/tests/fixtures/nonnullable-unwrapped/src/lib.rs @@ -90,7 +90,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/nullable-unwrapped/src/lib.rs b/crates/glue/tests/fixtures/nullable-unwrapped/src/lib.rs index d95bed1cc8..4a5558012a 100644 --- a/crates/glue/tests/fixtures/nullable-unwrapped/src/lib.rs +++ b/crates/glue/tests/fixtures/nullable-unwrapped/src/lib.rs @@ -82,7 +82,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/nullable-wrapped/src/lib.rs b/crates/glue/tests/fixtures/nullable-wrapped/src/lib.rs index 0b7aefed88..542aa904a5 100644 --- a/crates/glue/tests/fixtures/nullable-wrapped/src/lib.rs +++ b/crates/glue/tests/fixtures/nullable-wrapped/src/lib.rs @@ -101,7 +101,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/option/src/lib.rs b/crates/glue/tests/fixtures/option/src/lib.rs index 93361db876..1cd1ec5c26 100644 --- a/crates/glue/tests/fixtures/option/src/lib.rs +++ b/crates/glue/tests/fixtures/option/src/lib.rs @@ -51,7 +51,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/rocresult/src/lib.rs b/crates/glue/tests/fixtures/rocresult/src/lib.rs index 05a7434e01..8fd4aee837 100644 --- a/crates/glue/tests/fixtures/rocresult/src/lib.rs +++ b/crates/glue/tests/fixtures/rocresult/src/lib.rs @@ -51,7 +51,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/single-tag-union/src/lib.rs b/crates/glue/tests/fixtures/single-tag-union/src/lib.rs index 0c6353039d..9d3eeb433d 100644 --- a/crates/glue/tests/fixtures/single-tag-union/src/lib.rs +++ b/crates/glue/tests/fixtures/single-tag-union/src/lib.rs @@ -77,7 +77,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/union-with-padding/src/lib.rs b/crates/glue/tests/fixtures/union-with-padding/src/lib.rs index f22aba100f..ee8f92f0ff 100644 --- a/crates/glue/tests/fixtures/union-with-padding/src/lib.rs +++ b/crates/glue/tests/fixtures/union-with-padding/src/lib.rs @@ -82,7 +82,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/glue/tests/fixtures/union-without-padding/src/lib.rs b/crates/glue/tests/fixtures/union-without-padding/src/lib.rs index ed39a3041a..e5d35357b0 100644 --- a/crates/glue/tests/fixtures/union-without-padding/src/lib.rs +++ b/crates/glue/tests/fixtures/union-without-padding/src/lib.rs @@ -79,7 +79,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/roc_std/src/lib.rs b/crates/roc_std/src/lib.rs index b5874c200f..60529aafa0 100644 --- a/crates/roc_std/src/lib.rs +++ b/crates/roc_std/src/lib.rs @@ -36,7 +36,7 @@ extern "C" { ) -> *mut c_void; pub fn roc_dealloc(ptr: *mut c_void, alignment: u32); pub fn roc_panic(c_ptr: *mut c_void, tag_id: u32); - pub fn roc_dbg(loc: *mut c_void, src: *mut c_void, msg: *mut c_void); + pub fn roc_dbg(loc: *mut c_void, msg: *mut c_void, src: *mut c_void); pub fn roc_memset(dst: *mut c_void, c: i32, n: usize) -> *mut c_void; } diff --git a/crates/roc_std/tests/test_roc_std.rs b/crates/roc_std/tests/test_roc_std.rs index f43be21638..559c586131 100644 --- a/crates/roc_std/tests/test_roc_std.rs +++ b/crates/roc_std/tests/test_roc_std.rs @@ -40,8 +40,8 @@ pub unsafe extern "C" fn roc_panic(msg: *mut roc_std::RocStr, _tag_id: u32) { #[no_mangle] pub unsafe extern "C" fn roc_dbg( loc: *mut roc_std::RocStr, - src: *mut roc_std::RocStr, msg: *mut roc_std::RocStr, + src: *mut roc_std::RocStr, ) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/crates/valgrind/zig-platform/host.zig b/crates/valgrind/zig-platform/host.zig index c06912c30f..27df651918 100644 --- a/crates/valgrind/zig-platform/host.zig +++ b/crates/valgrind/zig-platform/host.zig @@ -58,7 +58,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; } diff --git a/examples/cli/effects-platform/host.zig b/examples/cli/effects-platform/host.zig index ca72714e78..04b650705f 100644 --- a/examples/cli/effects-platform/host.zig +++ b/examples/cli/effects-platform/host.zig @@ -72,7 +72,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; } diff --git a/examples/cli/false-interpreter/platform/src/lib.rs b/examples/cli/false-interpreter/platform/src/lib.rs index b33e1c660f..b889ee3678 100644 --- a/examples/cli/false-interpreter/platform/src/lib.rs +++ b/examples/cli/false-interpreter/platform/src/lib.rs @@ -63,7 +63,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/examples/cli/tui-platform/host.zig b/examples/cli/tui-platform/host.zig index a03b1229a7..a9e9c40f50 100644 --- a/examples/cli/tui-platform/host.zig +++ b/examples/cli/tui-platform/host.zig @@ -127,7 +127,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; } diff --git a/examples/glue/rust-platform/src/lib.rs b/examples/glue/rust-platform/src/lib.rs index 61fa32575a..022ea94a18 100644 --- a/examples/glue/rust-platform/src/lib.rs +++ b/examples/glue/rust-platform/src/lib.rs @@ -44,7 +44,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/examples/gui/breakout/platform/src/roc.rs b/examples/gui/breakout/platform/src/roc.rs index aa0762f94a..8c651dbd07 100644 --- a/examples/gui/breakout/platform/src/roc.rs +++ b/examples/gui/breakout/platform/src/roc.rs @@ -198,7 +198,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/examples/gui/platform/src/roc.rs b/examples/gui/platform/src/roc.rs index a915f2a3d6..14ede5abed 100644 --- a/examples/gui/platform/src/roc.rs +++ b/examples/gui/platform/src/roc.rs @@ -40,7 +40,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/examples/jvm-interop/bridge.c b/examples/jvm-interop/bridge.c index ced764d59f..4bd4aafc27 100644 --- a/examples/jvm-interop/bridge.c +++ b/examples/jvm-interop/bridge.c @@ -275,7 +275,7 @@ __attribute__((noreturn)) void roc_panic(struct RocStr *msg, unsigned int tag_id longjmp(exception_buffer, 1); } -void roc_dbg(struct RocStr *loc, struct RocStr *src, struct RocStr *msg) { +void roc_dbg(struct RocStr *loc, struct RocStr *msg, struct RocStr *src) { char* loc_bytes = is_small_str(*loc) ? (char*)loc : (char*)loc->bytes; char* src_bytes = is_small_str(*src) ? (char*)src : (char*)src->bytes; char* msg_bytes = is_small_str(*msg) ? (char*)msg : (char*)msg->bytes; diff --git a/examples/nodejs-interop/native-c-api/demo.c b/examples/nodejs-interop/native-c-api/demo.c index a0a9cb34ae..cd36922bba 100644 --- a/examples/nodejs-interop/native-c-api/demo.c +++ b/examples/nodejs-interop/native-c-api/demo.c @@ -27,7 +27,7 @@ void roc_panic(void *ptr, unsigned int alignment) napi_throw_error(napi_global_env, NULL, (char *)ptr); } -void roc_dbg(char* loc, char* src, char* msg) { +void roc_dbg(char* loc, char* msg, char* src) { fprintf(stderr, "[%s] %s = %s\n", loc, src, msg); } diff --git a/examples/platform-switching/c-platform/host.c b/examples/platform-switching/c-platform/host.c index 7b6a9c5e87..2b0baf8e15 100644 --- a/examples/platform-switching/c-platform/host.c +++ b/examples/platform-switching/c-platform/host.c @@ -29,7 +29,7 @@ void roc_panic(void* ptr, unsigned int alignment) { exit(1); } -void roc_dbg(char* loc, char* src, char* msg) { +void roc_dbg(char* loc, char* msg, char* src) { fprintf(stderr, "[%s] %s = %s\n", loc, src, msg); } diff --git a/examples/platform-switching/rust-platform/src/lib.rs b/examples/platform-switching/rust-platform/src/lib.rs index 5b792c918e..f3c83ed557 100644 --- a/examples/platform-switching/rust-platform/src/lib.rs +++ b/examples/platform-switching/rust-platform/src/lib.rs @@ -46,7 +46,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/examples/platform-switching/zig-platform/host.zig b/examples/platform-switching/zig-platform/host.zig index c06912c30f..27df651918 100644 --- a/examples/platform-switching/zig-platform/host.zig +++ b/examples/platform-switching/zig-platform/host.zig @@ -58,7 +58,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; } diff --git a/examples/python-interop/demo.c b/examples/python-interop/demo.c index abaf0ffe16..453adf6028 100644 --- a/examples/python-interop/demo.c +++ b/examples/python-interop/demo.c @@ -27,7 +27,7 @@ __attribute__((noreturn)) void roc_panic(void *ptr, unsigned int alignment) PyErr_SetString(PyExc_RuntimeError, (char *)ptr); } -void roc_dbg(char* loc, char* src, char* msg) { +void roc_dbg(char* loc, char* msg, char* src) { fprintf(stderr, "[%s] %s = %s\n", loc, src, msg); } diff --git a/examples/python-interop/platform/host.c b/examples/python-interop/platform/host.c index 90b873df81..8d3ab3c39f 100644 --- a/examples/python-interop/platform/host.c +++ b/examples/python-interop/platform/host.c @@ -24,7 +24,7 @@ void roc_panic(void* ptr, unsigned int alignment) { exit(1); } -void roc_dbg(char* loc, char* src, char* msg) { +void roc_dbg(char* loc, char* msg, char* src) { fprintf(stderr, "[%s] %s = %s\n", loc, src, msg); } diff --git a/examples/ruby-interop/demo.c b/examples/ruby-interop/demo.c index 637eb0f446..7bbbcf1eb1 100644 --- a/examples/ruby-interop/demo.c +++ b/examples/ruby-interop/demo.c @@ -23,7 +23,7 @@ __attribute__((noreturn)) void roc_panic(void *ptr, unsigned int alignment) rb_raise(rb_eException, "%s", (char *)ptr); } -void roc_dbg(char* loc, char* src, char* msg) { +void roc_dbg(char* loc, char* msg, char* src) { fprintf(stderr, "[%s] %s = %s\n", loc, src, msg); } diff --git a/examples/ruby-interop/platform/host.c b/examples/ruby-interop/platform/host.c index 7c8d7d5898..10267c6eaa 100644 --- a/examples/ruby-interop/platform/host.c +++ b/examples/ruby-interop/platform/host.c @@ -24,7 +24,7 @@ void roc_panic(void* ptr, unsigned int alignment) { exit(1); } -void roc_dbg(char* loc, char* src, char* msg) { +void roc_dbg(char* loc, char* msg, char* src) { fprintf(stderr, "[%s] %s = %s\n", loc, src, msg); } diff --git a/examples/static-site-gen/platform/src/lib.rs b/examples/static-site-gen/platform/src/lib.rs index 3aadc4e368..5abff2999b 100644 --- a/examples/static-site-gen/platform/src/lib.rs +++ b/examples/static-site-gen/platform/src/lib.rs @@ -100,7 +100,7 @@ pub unsafe extern "C" fn roc_panic(msg: *mut RocStr, tag_id: u32) { } #[no_mangle] -pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, src: *mut RocStr, msg: *mut RocStr) { +pub unsafe extern "C" fn roc_dbg(loc: *mut RocStr, msg: *mut RocStr, src: *mut RocStr) { eprintln!("[{}] {} = {}", &*loc, &*src, &*msg); } diff --git a/examples/virtual-dom-wip/platform/src/client-side/host.zig b/examples/virtual-dom-wip/platform/src/client-side/host.zig index 3874ad726e..029504e4fa 100644 --- a/examples/virtual-dom-wip/platform/src/client-side/host.zig +++ b/examples/virtual-dom-wip/platform/src/client-side/host.zig @@ -42,7 +42,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; } diff --git a/examples/virtual-dom-wip/platform/src/server-side/host.zig b/examples/virtual-dom-wip/platform/src/server-side/host.zig index 561d88dcd5..f2dcc9b756 100644 --- a/examples/virtual-dom-wip/platform/src/server-side/host.zig +++ b/examples/virtual-dom-wip/platform/src/server-side/host.zig @@ -42,7 +42,7 @@ export fn roc_panic(msg: *RocStr, tag_id: u32) callconv(.C) void { std.process.exit(1); } -export fn roc_dbg(loc: *RocStr, src: *RocStr, msg: *RocStr) callconv(.C) void { +export fn roc_dbg(loc: *RocStr, msg: *RocStr, src: *RocStr) callconv(.C) void { const stderr = std.io.getStdErr().writer(); stderr.print("[{s}] {s} = {s}\n", .{ loc.asSlice(), src.asSlice(), msg.asSlice() }) catch unreachable; }