Rust/Ruby/Python: update rustc and edition

Paolo Tranquilli · Paolo Tranquilli · commit eff87d24fa3d · 2025-02-25T13:15:19.000+01:00
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -35,9 +35,9 @@ bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True
 
 # Keep edition and version approximately in sync with internal repo.
 # the versions there are canonical, the versions here are used for CI in github/codeql, as well as for the vendoring of dependencies.
-RUST_EDITION = "2021"
+RUST_EDITION = "2024"
 
-RUST_VERSION = "1.82.0"
+RUST_VERSION = "1.85.0"
 
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(
diff --git a/python/extractor/tsg-python/Cargo.toml b/python/extractor/tsg-python/Cargo.toml
@@ -4,7 +4,7 @@
 name = "tsg-python"
 version = "0.1.0"
 authors = ["Taus Brock-Nannestad <tausbn@github.com>"]
-edition = "2021"
+edition = "2024"
 
 # When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
 [dependencies]
diff --git a/python/extractor/tsg-python/rust-toolchain.toml b/python/extractor/tsg-python/rust-toolchain.toml
diff --git a/python/extractor/tsg-python/tsp/Cargo.toml b/python/extractor/tsg-python/tsp/Cargo.toml
@@ -11,7 +11,7 @@ readme = "bindings/rust/README.md"
 keywords = ["incremental", "parsing", "python"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/tree-sitter/tree-sitter-python"
-edition = "2018"
+edition = "2024"
 
 build = "bindings/rust/build.rs"
 include = [
diff --git a/ruby/extractor/Cargo.toml b/ruby/extractor/Cargo.toml
@@ -3,7 +3,7 @@ name = "codeql-extractor-ruby"
 description = "CodeQL Ruby extractor"
 version = "0.1.0"
 authors = ["GitHub"]
-edition = "2021"
+edition = "2024"
 
 # When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
 [dependencies]
diff --git a/ruby/extractor/rust-toolchain.toml b/ruby/extractor/rust-toolchain.toml
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,8 @@
+# This file specifies the Rust version used to develop and test the
+# extractors written in rust. It is set to the lowest version of Rust
+# we want to support.
+
+[toolchain]
+channel = "1.85"
+profile = "minimal"
+components = [ "clippy", "rustfmt" ]
diff --git a/rust/ast-generator/Cargo.toml b/rust/ast-generator/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ast-generator"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
diff --git a/rust/autobuild/Cargo.toml b/rust/autobuild/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "codeql-autobuilder-rust"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
diff --git a/rust/extractor/Cargo.toml b/rust/extractor/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "codeql-rust"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
diff --git a/rust/extractor/macros/Cargo.toml b/rust/extractor/macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "rust-extractor-macros"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 
 [lib]
diff --git a/shared/tree-sitter-extractor/Cargo.toml b/shared/tree-sitter-extractor/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "codeql-extractor"
 version = "0.2.0"
-edition = "2021"
+edition = "2024"
 authors = ["GitHub"]
 
 # When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
diff --git a/shared/tree-sitter-extractor/rust-toolchain.toml b/shared/tree-sitter-extractor/rust-toolchain.toml
