Switch to 2024 edition

David Tolnay · facebook-github-bot · commit 1cb9b1b2ebae · 2025-05-08T09:03:21.000-07:00
Reviewed By: JakobDegen

Differential Revision: D74375799

fbshipit-source-id: 53490c5c162c0631ae097c3a4a23669ee791f70e
diff --git a/allocative/allocative/Cargo.toml b/allocative/allocative/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Meta"]
 description = "Inspect rust object tree and output it as flamegraph"
 documentation = "https://docs.rs/allocative"
-edition = "2021"
+edition = "2024"
 license = { workspace = true }
 name = "allocative"
 repository = "https://github.com/facebookexperimental/allocative"
diff --git a/allocative/allocative_derive/Cargo.toml b/allocative/allocative_derive/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Meta"]
 description = "Implementation of derive(Allocative) for allocative crate"
 documentation = "https://docs.rs/allocative"
-edition = "2021"
+edition = "2024"
 license = { workspace = true }
 name = "allocative_derive"
 repository = "https://github.com/facebookexperimental/allocative"
diff --git a/gazebo/cmp_any/Cargo.toml b/gazebo/cmp_any/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Facebook"]
 categories = ["rust-patterns"]
 description = "Comparison for &dyn types"
 documentation = "https://docs.rs/cmp_any"
-edition = "2021"
+edition = "2024"
 license = { workspace = true }
 name = "cmp_any"
 repository = "https://github.com/facebookincubator/gazebo"
diff --git a/gazebo/display_container/Cargo.toml b/gazebo/display_container/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Facebook"]
 categories = ["rust-patterns"]
 description = "Utilities to implement Display"
 documentation = "https://docs.rs/display_container"
-edition = "2021"
+edition = "2024"
 license = { workspace = true }
 name = "display_container"
 repository = "https://github.com/facebookincubator/gazebo"
diff --git a/gazebo/dupe/Cargo.toml b/gazebo/dupe/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Facebook"]
 categories = ["rust-patterns"]
 description = "Marker for types which are cheap to clone"
 documentation = "https://docs.rs/dupe"
-edition = "2021"
+edition = "2024"
 license = { workspace = true }
 name = "dupe"
 repository = "https://github.com/facebookincubator/gazebo"
diff --git a/gazebo/dupe_derive/Cargo.toml b/gazebo/dupe_derive/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Facebook"]
 categories = ["rust-patterns"]
 description = "Derive Dupe"
 documentation = "https://docs.rs/dupe"
-edition = "2021"
+edition = "2024"
 license = { workspace = true }
 name = "dupe_derive"
 repository = "https://github.com/facebookincubator/gazebo"
diff --git a/gazebo/dupe_derive/src/clone.rs b/gazebo/dupe_derive/src/clone.rs
@@ -19,7 +19,7 @@ pub fn derive_clone_(input: proc_macro::TokenStream) -> proc_macro::TokenStream
 
     let name = &input.ident;
     let body = duplicate_impl(&input.data, &quote! { ::std::clone::Clone::clone });
-    let r#gen = quote! {
+    let generated = quote! {
         // Clippy wants us to use Copy if we can - we prefer to be agnostic.
         // Add unknown_lints temporarily.
         #[allow(unknown_lints)]
@@ -30,5 +30,5 @@ pub fn derive_clone_(input: proc_macro::TokenStream) -> proc_macro::TokenStream
             }
         }
     };
-    r#gen.into()
+    generated.into()
 }
diff --git a/gazebo/dupe_derive/src/copy.rs b/gazebo/dupe_derive/src/copy.rs
@@ -16,9 +16,9 @@ pub fn derive_copy_(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
 
     let name = &input.ident;
-    let r#gen = quote! {
+    let generated = quote! {
         impl #impl_generics ::std::marker::Copy for #name #ty_generics #where_clause {
         }
     };
-    r#gen.into()
+    generated.into()
 }
diff --git a/gazebo/dupe_derive/src/dupe.rs b/gazebo/dupe_derive/src/dupe.rs
@@ -57,7 +57,7 @@ fn derive_dupe_explicit(
         name.span(),
     );
 
-    let r#gen = quote! {
+    let generated = quote! {
         impl #impl_generics dupe::Dupe for #name #ty_generics #where_clause {
         }
 
@@ -68,7 +68,7 @@ fn derive_dupe_explicit(
         }
     };
 
-    r#gen.into()
+    generated.into()
 }
 
 fn check_each_field_dupe<'a>(tys: impl IntoIterator<Item = &'a Type>) -> TokenStream {
diff --git a/gazebo/gazebo/Cargo.toml b/gazebo/gazebo/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Facebook"]
 categories = ["rust-patterns"]
 description = "A collection of well-tested utilities"
 documentation = "https://docs.rs/gazebo"
-edition = "2021"
+edition = "2024"
 license = { workspace = true }
 name = "gazebo"
 repository = "https://github.com/facebookincubator/gazebo"
diff --git a/gazebo/gazebo_derive/Cargo.toml b/gazebo/gazebo_derive/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Facebook"]
 categories = ["rust-patterns"]
 description = "Derive macros for the Gazebo library"
 documentation = "https://docs.rs/gazebo_derive"
-edition = "2021"
+edition = "2024"
 license = { workspace = true }
 name = "gazebo_derive"
 repository = "https://github.com/facebookincubator/gazebo"
diff --git a/gazebo/strong_hash/Cargo.toml b/gazebo/strong_hash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "Hash trait similar to std::hash::Hash but for strong/cryptographic hashes"
-edition = "2021"
+edition = "2024"
 license = { workspace = true }
 name = "strong_hash"
 repository = { workspace = true }
diff --git a/gazebo/strong_hash_derive/Cargo.toml b/gazebo/strong_hash_derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "Proc macro for strong_hash crate"
-edition = "2021"
+edition = "2024"
 license = { workspace = true }
 name = "strong_hash_derive"
 repository = { workspace = true }
diff --git a/gazebo/strong_hash_tests/Cargo.toml b/gazebo/strong_hash_tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "Tests for strong_hash crate"
-edition = "2021"
+edition = "2024"
 license = { workspace = true }
 name = "strong_hash_tests"
 repository = { workspace = true }
diff --git a/starlark/Cargo.toml b/starlark/Cargo.toml
@@ -8,7 +8,7 @@ build = "build.rs"
 categories = ["parser-implementations", "development-tools"]
 description = "An implementation of the Starlark language in Rust."
 documentation = "https://docs.rs/starlark"
-edition = "2021"
+edition = "2024"
 keywords = ["starlark", "skylark", "bazel", "language", "interpreter"]
 license = "Apache-2.0"
 name = "starlark"
diff --git a/starlark/fuzz/Cargo.toml b/starlark/fuzz/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-edition = "2021"
+edition = "2024"
 name = "starlark-fuzz"
 publish = false
 version = "0.0.0"
diff --git a/starlark/src/values/types/structs/refs.rs b/starlark/src/values/types/structs/refs.rs
@@ -79,7 +79,7 @@ impl<'f> FrozenStructRef<'f> {
     /// Iterate over struct fields.
     pub fn iter(
         &self,
-    ) -> impl ExactSizeIterator<Item = (FrozenStringValue, FrozenValue)> + 'f + use<'f> {
+    ) -> impl ExactSizeIterator<Item = (FrozenStringValue, FrozenValue)> + use<'f> {
         self.0.iter_frozen()
     }
 
diff --git a/starlark_bin/Cargo.toml b/starlark_bin/Cargo.toml
@@ -6,7 +6,7 @@ authors = [
 categories = ["parser-implementations", "development-tools"]
 description = "starlark binary"
 documentation = "https://docs.rs/starlark"
-edition = "2021"
+edition = "2024"
 keywords = ["starlark", "skylark", "language", "interpreter"]
 license = "Apache-2.0"
 name = "starlark_bin"
diff --git a/starlark_derive/Cargo.toml b/starlark_derive/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Facebook"]
 description = "Derive helpers for the starlark package."
 documentation = "https://docs.rs/starlark_derive"
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 name = "starlark_derive"
 repository = "https://github.com/facebook/starlark-rust"
diff --git a/starlark_js_example/Cargo.toml b/starlark_js_example/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "Example of running starlark-rust interpreter in browser"
-edition = "2021"
+edition = "2024"
 name = "starlark_js_example"
 publish = false
 version = "0.0.0"
diff --git a/starlark_lsp/Cargo.toml b/starlark_lsp/Cargo.toml
@@ -6,7 +6,7 @@ authors = [
 categories = ["parser-implementations", "development-tools"]
 description = "LSP bindings for starlark"
 documentation = "https://docs.rs/starlark"
-edition = "2021"
+edition = "2024"
 keywords = ["starlark", "skylark", "language", "interpreter"]
 license = "Apache-2.0"
 name = "starlark_lsp"
diff --git a/starlark_map/Cargo.toml b/starlark_map/Cargo.toml
@@ -4,7 +4,7 @@ authors = [
 ]
 description = "Map implementation with starlark-rust specific optimizations"
 documentation = "https://docs.rs/starlark_map"
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 name = "starlark_map"
 repository = "https://github.com/facebook/starlark-rust"
diff --git a/starlark_syntax/Cargo.toml b/starlark_syntax/Cargo.toml
@@ -6,7 +6,7 @@ authors = [
 categories = ["parser-implementations", "development-tools"]
 description = "Starlark language AST"
 documentation = "https://docs.rs/starlark"
-edition = "2021"
+edition = "2024"
 keywords = ["starlark", "skylark", "bazel", "language", "interpreter"]
 license = "Apache-2.0"
 name = "starlark_syntax"

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ pub fn derive_clone_(input: proc_macro::TokenStream) -> proc_macro::TokenStream`
`19`	`19`
`20`	`20`	`let name = &input.ident;`
`21`	`21`	`let body = duplicate_impl(&input.data, &quote! { ::std::clone::Clone::clone });`
`22`		`- let r#gen = quote! {`
	`22`	`+ let generated = quote! {`
`23`	`23`	`// Clippy wants us to use Copy if we can - we prefer to be agnostic.`
`24`	`24`	`// Add unknown_lints temporarily.`
`25`	`25`	`#[allow(unknown_lints)]`
`@@ -30,5 +30,5 @@ pub fn derive_clone_(input: proc_macro::TokenStream) -> proc_macro::TokenStream`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`};`
`33`		`- r#gen.into()`
	`33`	`+ generated.into()`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ pub fn derive_copy_(input: proc_macro::TokenStream) -> proc_macro::TokenStream {`
`16`	`16`	`let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();`
`17`	`17`
`18`	`18`	`let name = &input.ident;`
`19`		`- let r#gen = quote! {`
	`19`	`+ let generated = quote! {`
`20`	`20`	`impl #impl_generics ::std::marker::Copy for #name #ty_generics #where_clause {`
`21`	`21`	`}`
`22`	`22`	`};`
`23`		`- r#gen.into()`
	`23`	`+ generated.into()`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ fn derive_dupe_explicit(`
`57`	`57`	`name.span(),`
`58`	`58`	`);`
`59`	`59`
`60`		`- let r#gen = quote! {`
	`60`	`+ let generated = quote! {`
`61`	`61`	`impl #impl_generics dupe::Dupe for #name #ty_generics #where_clause {`
`62`	`62`	`}`
`63`	`63`
`@@ -68,7 +68,7 @@ fn derive_dupe_explicit(`
`68`	`68`	`}`
`69`	`69`	`};`
`70`	`70`
`71`		`- r#gen.into()`
	`71`	`+ generated.into()`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`fn check_each_field_dupe<'a>(tys: impl IntoIterator<Item = &'a Type>) -> TokenStream {`