From e21f0d018ed82868b5ee342769f2bffdac295490 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Mon, 2 Sep 2024 14:52:00 -0700 Subject: [PATCH 1/2] Fix elided lifetime --- src/cargo/core/workspace.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs index e187b7ca326..28897365b89 100644 --- a/src/cargo/core/workspace.rs +++ b/src/cargo/core/workspace.rs @@ -577,7 +577,7 @@ impl<'gctx> Workspace<'gctx> { } /// Returns an iterator over default packages in this workspace - pub fn default_members<'a>(&'a self) -> impl Iterator { + pub fn default_members<'a>(&'a self) -> impl Iterator { let packages = &self.packages; self.default_members .iter() From 2597cdf7708f57e02f29c7568198c94831408db4 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Mon, 2 Sep 2024 15:18:01 -0700 Subject: [PATCH 2/2] Fix implicit_features_edition_2024 matching rust version This test should not be matching the exact Rust version. --- tests/testsuite/lints/implicit_features.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testsuite/lints/implicit_features.rs b/tests/testsuite/lints/implicit_features.rs index 6a98a24d6d8..95cd747d4c5 100644 --- a/tests/testsuite/lints/implicit_features.rs +++ b/tests/testsuite/lints/implicit_features.rs @@ -127,7 +127,7 @@ unused_optional_dependency = "allow" .masquerade_as_nightly_cargo(&["cargo-lints", "edition2024"]) .with_stderr_data(str![[r#" [UPDATING] `dummy-registry` index -[LOCKING] 1 package to latest Rust 1.82.0-nightly compatible version +[LOCKING] 1 package to latest Rust 1.[..] compatible version [CHECKING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s