Merge pull request #4096 from rust-lang/rust-1.82-manual-regen

Rust 1.82: also update all cases of manual regeneration
rust-lang · Nov 6, 2024 · 978e994 · 978e994
2 parents f4b2254 + 7ee012f
commit 978e994
Show file tree

Hide file tree

Showing 37 changed files with 295 additions and 232 deletions.
diff --git a/ci/dictionary.txt b/ci/dictionary.txt
@@ -61,6 +61,7 @@ BTreeSet
 BufRead
 BufReader
 BuildHasher
+byteorder
 Cacher
 cacher
 Cagain
@@ -104,6 +105,7 @@ CustomSmartPointer
 CustomSmartPointers
 data's
 DataStruct
+dbea
 deallocate
 deallocated
 deallocating
@@ -566,6 +568,7 @@ Uncomment
 uncommenting
 unevaluated
 unhandled
+unicode
 Uninstalling
 uninstall
 unittests
@@ -598,6 +601,7 @@ Vlissides
 vscode
 vtable
 waitlist
+wasi
 wasn
 weakt
 WeatherForecast
@@ -616,4 +620,5 @@ WriteMessage
 xcode
 xpression
 yyyy
+zerocopy
 ZipImpl
diff --git a/listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.lock b/listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.lock
diff --git a/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.lock b/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.lock
diff --git a/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.toml b/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.toml
@@ -3,6 +3,4 @@ name = "guessing_game"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
diff --git a/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/output.txt b/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/output.txt
@@ -1,5 +1,4 @@
-$ cargo run
    Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
-    Finished `dev` profile [unoptimized + debuginfo] target(s) in 1.50s
-     Running `target/debug/guessing_game`
+    Finished `dev` profile [unoptimized + debuginfo] target(s) in 4.80s
+     Running `file:///projects/guessing_game/target/debug/guessing_game`
 Hello, world!
diff --git a/listings/ch11-writing-automated-tests/listing-11-01/Cargo.lock b/listings/ch11-writing-automated-tests/listing-11-01/Cargo.lock
diff --git a/listings/ch11-writing-automated-tests/listing-11-01/Cargo.toml b/listings/ch11-writing-automated-tests/listing-11-01/Cargo.toml
@@ -3,6 +3,4 @@ name = "adder"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
diff --git a/listings/ch11-writing-automated-tests/listing-11-01/output.txt b/listings/ch11-writing-automated-tests/listing-11-01/output.txt
@@ -1,7 +1,7 @@
 $ cargo test
    Compiling adder v0.1.0 (file:///projects/adder)
     Finished `test` profile [unoptimized + debuginfo] target(s) in 0.57s
-     Running unittests src/lib.rs (target/debug/deps/adder-92948b65e88960b4)
+     Running unittests src/lib.rs (file:///projects/adder/target/debug/deps/adder-7acb243c25ffd9dc)
 
 running 1 test
 test tests::it_works ... ok
@@ -13,4 +13,3 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini
 running 0 tests
 
 test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
-
diff --git a/listings/ch11-writing-automated-tests/listing-11-01/src/lib.rs b/listings/ch11-writing-automated-tests/listing-11-01/src/lib.rs
@@ -1,4 +1,4 @@
-pub fn add(left: usize, right: usize) -> usize {
+pub fn add(left: u64, right: u64) -> u64 {
     left + right
 }
 

diff --git a/listings/ch14-more-about-cargo/listing-14-07/add/Cargo.toml b/listings/ch14-more-about-cargo/listing-14-07/add/Cargo.toml
@@ -1,6 +1,3 @@
 [workspace]
-
-members = [
-    "adder",
-    "add_one",
-]
+resolver = "2"
+members = ["adder", "add_one"]
diff --git a/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.lock b/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.lock
diff --git a/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.toml b/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.toml
diff --git a/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/Cargo.toml b/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/Cargo.toml
diff --git a/...ings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/src/main.rs b/...ings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/src/main.rs
diff --git a/listings/ch14-more-about-cargo/no-listing-01-workspace/add/Cargo.toml b/listings/ch14-more-about-cargo/no-listing-01-workspace/add/Cargo.toml
@@ -0,0 +1,2 @@
+[workspace]
+resolver = "2"
diff --git a/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.toml b/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.toml
@@ -1,6 +1,3 @@
 [workspace]
-
-members = [
-    "adder",
-    "add_one",
-]
+resolver = "2"
+members = ["adder", "add_one"]
diff --git a/...ngs/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.toml b/...ngs/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.toml
@@ -1,6 +1,3 @@
 [workspace]
-
-members = [
-    "adder",
-    "add_one",
-]
+resolver = "2"
+members = ["adder", "add_one"]
diff --git a/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.toml b/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.toml
@@ -1,6 +1,3 @@
 [workspace]
-
-members = [
-    "adder",
-    "add_one",
-]
+resolver = "2"
+members = ["adder", "add_one"]
diff --git a/listings/ch14-more-about-cargo/output-only-01-adder-crate/add/Cargo.toml b/listings/ch14-more-about-cargo/output-only-01-adder-crate/add/Cargo.toml
@@ -1,5 +1,3 @@
 [workspace]
-
-members = [
-    "adder",
-]
+resolver = "2"
+members = ["adder"]
diff --git a/listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.toml b/listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.toml
@@ -1,6 +1,3 @@
 [workspace]
-
-members = [
-    "adder",
-    "add_one",
-]
+resolver = "2"
+members = [ "add_one","adder"]
diff --git a/listings/ch14-more-about-cargo/output-only-02-add-one/add/add_one/Cargo.toml b/listings/ch14-more-about-cargo/output-only-02-add-one/add/add_one/Cargo.toml
@@ -3,6 +3,4 @@ name = "add_one"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
diff --git a/listings/ch14-more-about-cargo/output-only-02-add-one/add/add_one/src/lib.rs b/listings/ch14-more-about-cargo/output-only-02-add-one/add/add_one/src/lib.rs
@@ -1,4 +1,4 @@
-pub fn add(left: usize, right: usize) -> usize {
+pub fn add(left: u64, right: u64) -> u64 {
     left + right
 }
 

diff --git a/listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.toml b/listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.toml
@@ -1,6 +1,3 @@
 [workspace]
-
-members = [
-    "adder",
-    "add_one",
-]
+resolver = "2"
+members = ["adder", "add_one"]
diff --git a/packages/tools/src/bin/lfp.rs b/packages/tools/src/bin/lfp.rs
@@ -106,6 +106,8 @@ fn is_line_of_interest(line: &str) -> bool {
     line.split_whitespace().any(|sub_string| {
         sub_string.contains("file://")
             && !sub_string.contains("file:///projects/")
+            && !sub_string.contains("file:///home/.cargo")
+            && !sub_string.contains("file:///home/.rustup")
     })
 }