From 10da414ca5263a3c571af64cca1e06d61fb97c8c Mon Sep 17 00:00:00 2001 From: simonjiao Date: Tue, 6 Aug 2024 16:42:17 +0800 Subject: [PATCH] fix some warnings (#4174) --- .cargo/{config => config.toml} | 0 genesis/tests/generated_files.rs | 4 ++-- rpc/api/src/tests.rs | 4 ++-- scripts/dev_setup.sh | 2 +- vm/stdlib/tests/generated_files.rs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) rename .cargo/{config => config.toml} (100%) diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml diff --git a/genesis/tests/generated_files.rs b/genesis/tests/generated_files.rs index 071ebc7619..19940dcc1c 100644 --- a/genesis/tests/generated_files.rs +++ b/genesis/tests/generated_files.rs @@ -11,8 +11,8 @@ fn assert_that_version_control_has_no_unstaged_changes() { .output() .unwrap(); let output_string = String::from_utf8(output.stdout).unwrap(); - // remove .cargo/config from output - let output_string = output_string.replace("M .cargo/config", ""); + // remove .cargo/config.toml from output + let output_string = output_string.replace("M .cargo/config.toml", ""); let output_string = output_string.trim().to_string(); if !output_string.is_empty() { println!("git status output:\n {}", output_string) diff --git a/rpc/api/src/tests.rs b/rpc/api/src/tests.rs index 4205d703fc..0e9973e581 100644 --- a/rpc/api/src/tests.rs +++ b/rpc/api/src/tests.rs @@ -41,8 +41,8 @@ fn assert_that_version_control_has_no_unstaged_changes() { .output() .unwrap(); let output_string = String::from_utf8(output.stdout).unwrap(); - // remove .cargo/config from output - let output_string = output_string.replace("M .cargo/config", ""); + // remove .cargo/config.toml from output + let output_string = output_string.replace("M .cargo/config.toml", ""); let output_string = output_string.trim().to_string(); if !output_string.is_empty() { println!("git status output:\n {}", output_string) diff --git a/scripts/dev_setup.sh b/scripts/dev_setup.sh index 832d9fd605..c5a2e31723 100755 --- a/scripts/dev_setup.sh +++ b/scripts/dev_setup.sh @@ -568,7 +568,7 @@ function install_mold { cp "${TMPFILE}/mold-1.5.1-x86_64-linux/bin/mold" "$(pwd)/mold" # rm -rf "$TMPFILE" chmod +x "$(pwd)/mold" - printf $"[target.x86_64-unknown-linux-gnu]\nlinker = \"/usr/bin/clang\"\nrustflags = [\"-C\", \"link-arg=-fuse-ld=$(pwd)/mold\"]\n" >> ./.cargo/config + printf $"[target.x86_64-unknown-linux-gnu]\nlinker = \"/usr/bin/clang\"\nrustflags = [\"-C\", \"link-arg=-fuse-ld=$(pwd)/mold\"]\n" >> ./.cargo/config.toml else echo "Mold is only supported on x86_64" fi diff --git a/vm/stdlib/tests/generated_files.rs b/vm/stdlib/tests/generated_files.rs index f2e00159d1..4babe8f0ec 100644 --- a/vm/stdlib/tests/generated_files.rs +++ b/vm/stdlib/tests/generated_files.rs @@ -15,8 +15,8 @@ fn assert_that_version_control_has_no_unstaged_changes() { .output() .unwrap(); let output_string = String::from_utf8(output.stdout).unwrap(); - // remove .cargo/config from output - let output_string = output_string.replace("M .cargo/config", ""); + // remove .cargo/config.toml from output + let output_string = output_string.replace("M .cargo/config.toml", ""); let output_string = output_string.trim().to_string(); if !output_string.is_empty() { println!("git status output:\n {}", output_string)