Update some tests for 2024 stabilization

rust-lang · Nov 24, 2024 · d1c8e2b · d1c8e2b
1 parent 029bfc9
commit d1c8e2b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/cargo/util/toml/embedded.rs b/src/cargo/util/toml/embedded.rs
@@ -567,7 +567,7 @@ autoexamples = false
 autolib = false
 autotests = false
 build = false
-edition = "2021"
+edition = "2024"
 name = "test-"
 
 [profile.release]
@@ -605,7 +605,7 @@ autoexamples = false
 autolib = false
 autotests = false
 build = false
-edition = "2021"
+edition = "2024"
 name = "test-"
 
 [profile.release]

diff --git a/...estsuite/cargo_new/inherit_workspace_package_table_with_edition/out/crates/foo/Cargo.toml b/...estsuite/cargo_new/inherit_workspace_package_table_with_edition/out/crates/foo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "foo"
-edition = "2024"
+edition = "2021"
 authors.workspace = true
 description.workspace = true
 homepage.workspace = true

diff --git a/tests/testsuite/edition.rs b/tests/testsuite/edition.rs
@@ -135,7 +135,7 @@ fn unset_edition_with_unset_rust_version() {
 
     p.cargo("check -v")
         .with_stderr_data(str![[r#"
-[WARNING] no edition set: defaulting to the 2015 edition while the latest is 2021
+[WARNING] no edition set: defaulting to the 2015 edition while the latest is 2024
 [CHECKING] foo v0.1.0 ([ROOT]/foo)
 [RUNNING] `rustc [..] --edition=2015 [..]`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s

diff --git a/tests/testsuite/new.rs b/tests/testsuite/new.rs
@@ -393,7 +393,7 @@ fn new_with_edition_2018() {
 fn new_default_edition() {
     cargo_process("new foo").run();
     let manifest = fs::read_to_string(paths::root().join("foo/Cargo.toml")).unwrap();
-    assert!(manifest.contains("edition = \"2021\""));
+    assert!(manifest.contains("edition = \"2024\""));
 }
 
 #[cargo_test]

diff --git a/tests/testsuite/publish.rs b/tests/testsuite/publish.rs
@@ -160,7 +160,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for
 [PACKAGING] foo v0.0.1 ([ROOT]/foo)
 [PACKAGED] 4 files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
 [VERIFYING] foo v0.0.1 ([ROOT]/foo)
-[WARNING] no edition set: defaulting to the 2015 edition while the latest is 2021
+[WARNING] no edition set: defaulting to the 2015 edition while the latest is 2024
 [COMPILING] foo v0.0.1 ([ROOT]/foo/target/package/foo-0.0.1)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 [UPLOADING] foo v0.0.1 ([ROOT]/foo)