Skip to content

Commit 9c32cf6

Browse files
committed
update rust toolchain to latest nightly
Signed-off-by: Gavin Inglis <[email protected]>
1 parent be232aa commit 9c32cf6

File tree

10 files changed

+21
-24
lines changed

10 files changed

+21
-24
lines changed

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# particular date of the nightly compiler, but we want builds to be reproducable, so we lock to a
33
# specific, recent instance of nightly.
44
[toolchain]
5-
channel = "nightly-2024-07-11"
5+
channel = "nightly-2025-02-24"
66
profile = "default"

tools/buildsys/src/cache.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ impl LookasideCache {
159159
let name = parsed
160160
.path_segments()
161161
.context(error::ExternalFileNameSnafu { path: url })?
162-
.last()
162+
.next_back()
163163
.context(error::ExternalFileNameSnafu { path: url })?;
164164
Ok(name.into())
165165
}

tools/buildsys/src/gomod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ fn extract_file_name(url: &str) -> Result<PathBuf> {
162162
let name = parsed
163163
.path_segments()
164164
.context(error::InputFileBadSnafu { path: url })?
165-
.last()
165+
.next_back()
166166
.context(error::InputFileBadSnafu { path: url })?;
167167
Ok(name.into())
168168
}

tools/oci-cli-wrapper/src/lib.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
//!
44
//! Current two tools are supported:
55
//! * crane, gcrane, krane
6-
//! Crane provides a more direct interaction with the container registry,
7-
//! allowing us to query image information in the registry without having to pull the full image to
8-
//! disk. It also does not require a daemon to operate and has optimizations for pulling large images to disk
6+
//! Crane provides a more direct interaction with the container registry,
7+
//! allowing us to query image information in the registry without having to pull the full image to
8+
//! disk. It also does not require a daemon to operate and has optimizations for pulling large images to disk
99
//! * docker
10-
//! Docker can perform all interactions we need with several caveats that make it less efficient than
11-
//! crane. The image needs to be pulled locally in order for docker to inspect the manifest and extract
12-
//! metadata. In addition, in order to operate with OCI image format, the containerd-snapshotter
13-
//! feature has to be enabled in the docker daemon
10+
//! Docker can perform all interactions we need with several caveats that make it less efficient than
11+
//! crane. The image needs to be pulled locally in order for docker to inspect the manifest and extract
12+
//! metadata. In addition, in order to operate with OCI image format, the containerd-snapshotter
13+
//! feature has to be enabled in the docker daemon
1414
use std::fmt::{Display, Formatter};
1515
use std::{collections::HashMap, path::Path};
1616

tools/testsys/src/aws_resources.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ pub(crate) struct AmiImage {
114114
}
115115

116116
/// Create a CRD to launch Bottlerocket instances on an EKS or ECS cluster.
117-
pub(crate) async fn ec2_crd<'a>(
118-
bottlerocket_input: BottlerocketInput<'a>,
117+
pub(crate) async fn ec2_crd(
118+
bottlerocket_input: BottlerocketInput<'_>,
119119
cluster_type: ClusterType,
120120
region: &str,
121121
) -> Result<Resource> {
@@ -231,8 +231,8 @@ pub(crate) async fn ec2_crd<'a>(
231231
}
232232

233233
/// Create a CRD to launch Bottlerocket instances on an EKS or ECS cluster.
234-
pub(crate) async fn ec2_karpenter_crd<'a>(
235-
bottlerocket_input: BottlerocketInput<'a>,
234+
pub(crate) async fn ec2_karpenter_crd(
235+
bottlerocket_input: BottlerocketInput<'_>,
236236
region: &str,
237237
) -> Result<Resource> {
238238
let cluster_name = bottlerocket_input

tools/testsys/src/crds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub struct CrdInput<'a> {
3636
pub images: TestsysImages,
3737
}
3838

39-
impl<'a> CrdInput<'a> {
39+
impl CrdInput<'_> {
4040
/// Retrieve the TUF repo information from `Infra.toml`
4141
pub fn tuf_repo_config(&self) -> Option<TufRepoConfig> {
4242
if let (Some(metadata_base_url), Some(targets_url)) = (

tools/update-metadata/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ impl Update {
311311
.waves
312312
.range((Included(0), Excluded(seed)))
313313
.map(|(k, v)| (*k, *v))
314-
.last();
314+
.next_back();
315315
let end_wave = self
316316
.waves
317317
.range((Included(seed), Included(MAX_SEED)))

twoliter/src/project/lock/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/// Covers the functionality and implementation of Twoliter.lock which is generated using
2-
/// `twoliter update`. It acts similarly to Cargo.lock as a flattened out representation of all kit
3-
/// and sdk image dependencies with associated digests so twoliter can validate that contents of a kit
4-
/// do not mutate unexpectedly.
1+
//! Covers the functionality and implementation of Twoliter.lock which is generated using
2+
//! `twoliter update`. It acts similarly to Cargo.lock as a flattened out representation of all kit
3+
//! and sdk image dependencies with associated digests so twoliter can validate that contents of a kit
4+
//! do not mutate unexpectedly.
55
66
/// Contains operations for working with an OCI Archive
77
mod archive;

twoliter/src/project/lock/verification.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@ impl LockfileVerifier for Lock {
101101
}
102102
}
103103

104-
/// A `LockfileVerifier` can return a set of `VerifyTag` structs, claiming that those artifacts
105-
/// have been resolved and verified against the lockfile.
106-
107104
/// Writes marker files indicating which artifacts have been resolved and verified against the lock
108105
#[derive(Debug)]
109106
pub(crate) struct VerificationTagger {

twoliter/src/project/vendor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ impl OverriddenVendor {
9898
.unwrap_or(&self.original_vendor.registry)
9999
}
100100

101-
pub(crate) fn repo_for<'a, V: VendedArtifact>(&'a self, image: &'a V) -> &str {
101+
pub(crate) fn repo_for<'a, V: VendedArtifact>(&'a self, image: &'a V) -> &'a str {
102102
self.override_
103103
.name
104104
.as_deref()

0 commit comments

Comments
 (0)