Merge pull request #16586 from hvitved/rust-bump

Python: Use Rust 1.74
github · May 24, 2024 · 5fa1b57 · 5fa1b57
2 parents 95473c0 + 386bc1e
commit 5fa1b57
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/python/extractor/tsg-python/Cargo.Bazel.lock b/python/extractor/tsg-python/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "35a1ce4b6c4f997c496c11d3a8fcfaadc5833dfd41bebb022941687d73dde159",
+  "checksum": "14572337bc5747880ff328af42451cce3549f743dc79eac7314f3b3f55b74d25",
   "crates": {
     "ahash 0.4.7": {
       "name": "ahash",
@@ -1755,7 +1755,7 @@
           ],
           "selects": {}
         },
-        "edition": "2018",
+        "edition": "2021",
         "version": "0.1.0"
       },
       "license": null,
@@ -1986,7 +1986,6 @@
         "crate_features": {
           "common": [
             "consoleapi",
-            "errhandlingapi",
             "minwinbase",
             "minwindef",
             "processenv",

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 <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 # When changing/updating these, the `Cargo.Bazel.lock` file has to be regenerated.
 # Run `CARGO_BAZEL_REPIN=true CARGO_BAZEL_REPIN_ONLY=py_deps ./tools/bazel sync --only=py_deps`

diff --git a/python/extractor/tsg-python/rust-toolchain.toml b/python/extractor/tsg-python/rust-toolchain.toml
@@ -2,6 +2,6 @@
 # extractor. It is set to the lowest version of Rust we want to support.
 
 [toolchain]
-channel = "1.68"
+channel = "1.74"
 profile = "minimal"
 components = [ "rustfmt" ]
diff --git a/ruby/extractor/Cargo.lock b/ruby/extractor/Cargo.lock
diff --git a/ruby/extractor/Cargo.toml b/ruby/extractor/Cargo.toml
@@ -34,7 +34,7 @@ lazy_static = "1.4.0"
 # of lock-file update time, but `rules_rust` pins generates a bazel rule that unconditionally downloads `main`, which
 # breaks build hermeticity. So, rev-pinning it is.
 # See also https://github.com/bazelbuild/rules_rust/issues/2502.
-codeql-extractor = { git = "https://github.com/github/codeql.git", rev = "a523be4d0a1e2420a1884f7c4f8754a7c4fb7e21" }
+codeql-extractor = { git = "https://github.com/github/codeql.git", rev = "0dbce3d077f6f31a8d660aea104ee31cacf6bacd" }
 
 [patch.crates-io]
 tree-sitter = {git = "https://github.com/redsun82/tree-sitter.git", rev = "1f5c1112ceaa8fc6aff61d1852690407670d2a96"}
diff --git a/ruby/extractor/cargo-bazel-lock.json b/ruby/extractor/cargo-bazel-lock.json