Skip to content

Commit 967d91c

Browse files
committed
update rust toolchain to latest nightly
Update rust toolchain to the latest nightly release. Address lints and license clarifications as a result. Signed-off-by: Gavin Inglis <[email protected]>
1 parent 3cf1f2e commit 967d91c

File tree

12 files changed

+42
-30
lines changed

12 files changed

+42
-30
lines changed

clarify.toml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ license-files = [
55
{ path = "COPYING", hash = 0x278afbcf },
66
{ path = "LICENSE-APACHE", hash = 0x24b54f4b },
77
{ path = "LICENSE-MIT", hash = 0x462dee44 },
8-
{ path = "src/unicode/data/LICENSE-UNICODE", hash = 0x70f7339 },
8+
{ path = "src/unicode/data/LICENSE-UNICODE", hash = 0x70f7339 },
99
]
1010

1111
[clarify.petgraph]
@@ -27,6 +27,23 @@ license-files = [
2727
{ path = "src/unicode_tables/LICENSE-UNICODE", hash = 0xa7f28b93 },
2828
]
2929

30+
[clarify.rust-fuzzy-search]
31+
expression = "MIT OR Apache-2.0"
32+
license-files = [
33+
{ path = "LICENSE-APACHE", hash = 0xbde481e5 },
34+
{ path = "LICENSE-MIT", hash = 0xb5a90d39 },
35+
]
36+
skip-files = [
37+
# these licenses apply to documentation
38+
"target/doc/FiraSans-LICENSE.txt",
39+
"target/doc/COPYRIGHT.txt",
40+
"target/doc/LICENSE-APACHE.txt",
41+
"target/doc/LICENSE-MIT.txt",
42+
"target/doc/SourceCodePro-LICENSE.txt",
43+
"target/doc/SourceSerif4-LICENSE.md",
44+
]
45+
46+
3047
[clarify.typenum]
3148
expression = "MIT OR Apache-2.0"
3249
license-files = [

deny.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ skip = [
7878
{ name = "tabled", version = "0.15.0" },
7979
# multiple deps are using an older version of tabled_derive
8080
{ name = "tabled_derive", version = "0.7.0" },
81-
# multiple deps are using an older version of zerocopy
82-
{ name = "zerocopy", version = "0.7.35" },
8381
]
8482

8583
skip-tree = [
@@ -90,9 +88,9 @@ skip-tree = [
9088
{ name = "windows-sys" },
9189
]
9290

93-
[bans.workspace-dependencies]
94-
duplicates = "deny"
95-
include-path-dependencies = true
91+
[bans.workspace-dependencies]
92+
duplicates = "deny"
93+
include-path-dependencies = true
9694
unused = "deny"
9795

9896
[sources]

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-28"
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;

0 commit comments

Comments
 (0)