Skip to content

Bump rust toolchain to nightly-2023-01-19 #2187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/buildomat/jobs/build-and-test-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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*",
Expand Down Expand Up @@ -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
Expand All @@ -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

#
Expand Down
6 changes: 3 additions & 3 deletions .github/buildomat/jobs/build-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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*",
Expand Down Expand Up @@ -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
Expand All @@ -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

#
Expand Down
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/build-end-to-end-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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",
#: ]
Expand Down
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 1 addition & 4 deletions oximeter/oximeter/src/histogram.rs
Original file line number Diff line number Diff line change
Expand Up @@ -511,10 +511,7 @@ where
{
let edges = [
vec![<T as num_traits::Zero>::zero()],
(start_decade..end_decade)
.into_iter()
.flat_map(|x| x.span_decade())
.collect(),
(start_decade..end_decade).flat_map(|x| x.span_decade()).collect(),
]
.concat();
Histogram::new(&edges)
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion sled-agent/src/serial.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion test-utils/src/dev/test_cmds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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:{}",
Expand Down
2 changes: 1 addition & 1 deletion wicketd/src/artifacts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
Expand Down