From c3f7de07831b2cf03e1d585b39aff101093adb26 Mon Sep 17 00:00:00 2001 From: Sean Klein Date: Fri, 20 Jan 2023 00:42:48 -0500 Subject: [PATCH 1/2] Bump rust toolchain --- .github/buildomat/jobs/build-and-test-linux.sh | 6 +++--- .github/buildomat/jobs/build-and-test.sh | 6 +++--- .github/buildomat/jobs/build-end-to-end-tests.sh | 2 +- .github/buildomat/jobs/package.sh | 2 +- oximeter/oximeter/src/histogram.rs | 1 - rust-toolchain.toml | 2 +- sled-agent/src/serial.rs | 2 +- test-utils/src/dev/test_cmds.rs | 2 +- wicketd/src/artifacts.rs | 2 +- 9 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/buildomat/jobs/build-and-test-linux.sh b/.github/buildomat/jobs/build-and-test-linux.sh index 2ec39d26502..6647c7bb465 100644 --- a/.github/buildomat/jobs/build-and-test-linux.sh +++ b/.github/buildomat/jobs/build-and-test-linux.sh @@ -3,7 +3,7 @@ #: name = "build-and-test (ubuntu-20.04)" #: variety = "basic" #: target = "ubuntu-20.04" -#: rust_toolchain = "nightly-2022-09-27" +#: rust_toolchain = "nightly-2023-01-19" #: output_rules = [ #: "/var/tmp/omicron_tmp/*", #: "!/var/tmp/omicron_tmp/crdb-base*", @@ -53,7 +53,7 @@ banner build export RUSTFLAGS="-D warnings" export RUSTDOCFLAGS="-D warnings" export TMPDIR=$TEST_TMPDIR -ptime -m cargo +'nightly-2022-09-27' build --locked --all-targets --verbose +ptime -m cargo +'nightly-2023-01-19' build --locked --all-targets --verbose # # NOTE: We're using using the same RUSTFLAGS and RUSTDOCFLAGS as above to avoid @@ -63,7 +63,7 @@ ptime -m cargo +'nightly-2022-09-27' build --locked --all-targets --verbose # from end-to-end-tests. # banner test -ptime -m cargo +'nightly-2022-09-27' test --locked --verbose \ +ptime -m cargo +'nightly-2023-01-19' test --locked --verbose \ --no-fail-fast # diff --git a/.github/buildomat/jobs/build-and-test.sh b/.github/buildomat/jobs/build-and-test.sh index 15c39c8fa2a..410a44f8ef9 100644 --- a/.github/buildomat/jobs/build-and-test.sh +++ b/.github/buildomat/jobs/build-and-test.sh @@ -3,7 +3,7 @@ #: name = "build-and-test (helios)" #: variety = "basic" #: target = "helios-latest" -#: rust_toolchain = "nightly-2022-09-27" +#: rust_toolchain = "nightly-2023-01-19" #: output_rules = [ #: "/var/tmp/omicron_tmp/*", #: "!/var/tmp/omicron_tmp/crdb-base*", @@ -53,7 +53,7 @@ banner build export RUSTFLAGS="-D warnings" export RUSTDOCFLAGS="-D warnings" export TMPDIR=$TEST_TMPDIR -ptime -m cargo +'nightly-2022-09-27' build --locked --all-targets --verbose +ptime -m cargo +'nightly-2023-01-19' build --locked --all-targets --verbose # # NOTE: We're using using the same RUSTFLAGS and RUSTDOCFLAGS as above to avoid @@ -63,7 +63,7 @@ ptime -m cargo +'nightly-2022-09-27' build --locked --all-targets --verbose # from end-to-end-tests. # banner test -ptime -m cargo +'nightly-2022-09-27' test --locked --verbose \ +ptime -m cargo +'nightly-2023-01-19' test --locked --verbose \ --no-fail-fast # diff --git a/.github/buildomat/jobs/build-end-to-end-tests.sh b/.github/buildomat/jobs/build-end-to-end-tests.sh index b32e532f9e4..bc80d4f9514 100644 --- a/.github/buildomat/jobs/build-end-to-end-tests.sh +++ b/.github/buildomat/jobs/build-end-to-end-tests.sh @@ -3,7 +3,7 @@ #: name = "helios / build-end-to-end-tests" #: variety = "basic" #: target = "helios-latest" -#: rust_toolchain = "nightly-2022-04-27" +#: rust_toolchain = "nightly-2023-01-19" #: output_rules = [ #: "=/work/*.gz", #: ] diff --git a/.github/buildomat/jobs/package.sh b/.github/buildomat/jobs/package.sh index 3d4c185d863..85c55e7dd25 100644 --- a/.github/buildomat/jobs/package.sh +++ b/.github/buildomat/jobs/package.sh @@ -3,7 +3,7 @@ #: name = "helios / package" #: variety = "basic" #: target = "helios-latest" -#: rust_toolchain = "nightly-2022-09-27" +#: rust_toolchain = "nightly-2023-01-19" #: output_rules = [ #: "=/work/package.tar.gz", #: "=/work/zones/*.tar.gz", diff --git a/oximeter/oximeter/src/histogram.rs b/oximeter/oximeter/src/histogram.rs index f5743726324..12794aa07d6 100644 --- a/oximeter/oximeter/src/histogram.rs +++ b/oximeter/oximeter/src/histogram.rs @@ -512,7 +512,6 @@ where let edges = [ vec![::zero()], (start_decade..end_decade) - .into_iter() .flat_map(|x| x.span_decade()) .collect(), ] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index a0e2f61d669..c5fa71882ac 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -10,5 +10,5 @@ [toolchain] # NOTE: This toolchain is also specified within .github/buildomat/jobs/{build-and-test,package}.sh. # If you update it here, update that file too. -channel = "nightly-2022-09-27" +channel = "nightly-2023-01-19" profile = "default" diff --git a/sled-agent/src/serial.rs b/sled-agent/src/serial.rs index 2470997be19..54586fa886c 100644 --- a/sled-agent/src/serial.rs +++ b/sled-agent/src/serial.rs @@ -100,7 +100,7 @@ impl BufferData { )) } else if from_end < self.rolling.len() { // (apologies to Takenobu Mitsuyoshi) - let rolling_start = self.rolling.len() - from_end as usize; + let rolling_start = self.rolling.len() - from_end; Ok(( Box::new(self.rolling.iter().copied().skip(rolling_start)), from_start, diff --git a/test-utils/src/dev/test_cmds.rs b/test-utils/src/dev/test_cmds.rs index b6a5eb8b3ee..f8fc6b1d279 100644 --- a/test-utils/src/dev/test_cmds.rs +++ b/test-utils/src/dev/test_cmds.rs @@ -39,7 +39,7 @@ pub fn path_to_executable(cmd_name: &str) -> PathBuf { #[track_caller] pub fn assert_exit_code(exit_status: ExitStatus, code: u32, stderr_text: &str) { if let ExitStatus::Exited(exit_code) = exit_status { - assert_eq!(exit_code, code as u32); + assert_eq!(exit_code, code); } else { panic!( "expected normal process exit with code {}, got {:?}\n\nprocess stderr:{}", diff --git a/wicketd/src/artifacts.rs b/wicketd/src/artifacts.rs index ae9e0e064dc..68618952632 100644 --- a/wicketd/src/artifacts.rs +++ b/wicketd/src/artifacts.rs @@ -71,7 +71,7 @@ impl ArtifactGetter for WicketdArtifactStore { ); }) .ok()?; - let mut bytes = BytesMut::with_capacity(size as usize); + let mut bytes = BytesMut::with_capacity(size); bytes.put_bytes(0, size); return Some(Body::from(bytes.freeze())); } From 0d019c2df9f032f4e15a972029958aee4d54350e Mon Sep 17 00:00:00 2001 From: Sean Klein Date: Fri, 20 Jan 2023 00:43:58 -0500 Subject: [PATCH 2/2] fmt --- oximeter/oximeter/src/histogram.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/oximeter/oximeter/src/histogram.rs b/oximeter/oximeter/src/histogram.rs index 12794aa07d6..e68a94605df 100644 --- a/oximeter/oximeter/src/histogram.rs +++ b/oximeter/oximeter/src/histogram.rs @@ -511,9 +511,7 @@ where { let edges = [ vec![::zero()], - (start_decade..end_decade) - .flat_map(|x| x.span_decade()) - .collect(), + (start_decade..end_decade).flat_map(|x| x.span_decade()).collect(), ] .concat(); Histogram::new(&edges)