Rust: update rust-analyzer

github · Jan 8, 2025 · c7a9889 · c7a9889
1 parent bca5f4b
commit c7a9889
Show file tree

Hide file tree

Showing 45 changed files with 740 additions and 588 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -65,26 +65,91 @@ rust_host_tools.host_tools(
 # deps for python extractor
 # keep in sync by running `misc/bazel/3rdparty/update_cargo_deps.sh`
 py_deps = use_extension("//misc/bazel/3rdparty:py_deps_extension.bzl", "p")
-use_repo(py_deps, "vendor__anyhow-1.0.44", "vendor__cc-1.0.70", "vendor__clap-2.33.3", "vendor__regex-1.5.5", "vendor__smallvec-1.6.1", "vendor__string-interner-0.12.2", "vendor__thiserror-1.0.29", "vendor__tree-sitter-0.20.4", "vendor__tree-sitter-graph-0.7.0")
+use_repo(
+    py_deps,
+    "vendor__anyhow-1.0.44",
+    "vendor__cc-1.0.70",
+    "vendor__clap-2.33.3",
+    "vendor__regex-1.5.5",
+    "vendor__smallvec-1.6.1",
+    "vendor__string-interner-0.12.2",
+    "vendor__thiserror-1.0.29",
+    "vendor__tree-sitter-0.20.4",
+    "vendor__tree-sitter-graph-0.7.0",
+)
 
 # deps for ruby+rust
 # keep in sync by running `misc/bazel/3rdparty/update_cargo_deps.sh`
 tree_sitter_extractors_deps = use_extension("//misc/bazel/3rdparty:tree_sitter_extractors_extension.bzl", "r")
-use_repo(tree_sitter_extractors_deps, "vendor__anyhow-1.0.95", "vendor__argfile-0.2.1", "vendor__chrono-0.4.39", "vendor__clap-4.5.24", "vendor__dunce-1.0.5", "vendor__either-1.13.0", "vendor__encoding-0.2.33", "vendor__figment-0.10.19", "vendor__flate2-1.0.35", "vendor__glob-0.3.2", "vendor__globset-0.4.15", "vendor__itertools-0.14.0", "vendor__lazy_static-1.5.0", "vendor__log-0.4.22", "vendor__num-traits-0.2.19", "vendor__num_cpus-1.16.0", "vendor__proc-macro2-1.0.92", "vendor__quote-1.0.38", "vendor__ra_ap_base_db-0.0.248", "vendor__ra_ap_cfg-0.0.248", "vendor__ra_ap_hir-0.0.248", "vendor__ra_ap_hir_def-0.0.248", "vendor__ra_ap_hir_expand-0.0.248", "vendor__ra_ap_ide_db-0.0.248", "vendor__ra_ap_intern-0.0.248", "vendor__ra_ap_load-cargo-0.0.248", "vendor__ra_ap_parser-0.0.248", "vendor__ra_ap_paths-0.0.248", "vendor__ra_ap_project_model-0.0.248", "vendor__ra_ap_span-0.0.248", "vendor__ra_ap_stdx-0.0.248", "vendor__ra_ap_syntax-0.0.248", "vendor__ra_ap_vfs-0.0.248", "vendor__rand-0.8.5", "vendor__rayon-1.10.0", "vendor__regex-1.11.1", "vendor__serde-1.0.217", "vendor__serde_json-1.0.135", "vendor__serde_with-3.12.0", "vendor__stderrlog-0.6.0", "vendor__syn-2.0.95", "vendor__tracing-0.1.41", "vendor__tracing-subscriber-0.3.19", "vendor__tree-sitter-0.24.5", "vendor__tree-sitter-embedded-template-0.23.2", "vendor__tree-sitter-json-0.24.8", "vendor__tree-sitter-ql-0.23.1", "vendor__tree-sitter-ruby-0.23.1", "vendor__triomphe-0.1.14", "vendor__ungrammar-1.16.1")
+use_repo(
+    tree_sitter_extractors_deps,
+    "vendor__anyhow-1.0.95",
+    "vendor__argfile-0.2.1",
+    "vendor__chrono-0.4.39",
+    "vendor__clap-4.5.24",
+    "vendor__dunce-1.0.5",
+    "vendor__either-1.13.0",
+    "vendor__encoding-0.2.33",
+    "vendor__figment-0.10.19",
+    "vendor__flate2-1.0.35",
+    "vendor__glob-0.3.2",
+    "vendor__globset-0.4.15",
+    "vendor__itertools-0.14.0",
+    "vendor__lazy_static-1.5.0",
+    "vendor__log-0.4.22",
+    "vendor__num-traits-0.2.19",
+    "vendor__num_cpus-1.16.0",
+    "vendor__proc-macro2-1.0.92",
+    "vendor__quote-1.0.38",
+    "vendor__ra_ap_base_db-0.0.256",
+    "vendor__ra_ap_cfg-0.0.256",
+    "vendor__ra_ap_hir-0.0.256",
+    "vendor__ra_ap_hir_def-0.0.256",
+    "vendor__ra_ap_hir_expand-0.0.256",
+    "vendor__ra_ap_ide_db-0.0.256",
+    "vendor__ra_ap_intern-0.0.256",
+    "vendor__ra_ap_load-cargo-0.0.256",
+    "vendor__ra_ap_parser-0.0.256",
+    "vendor__ra_ap_paths-0.0.256",
+    "vendor__ra_ap_project_model-0.0.256",
+    "vendor__ra_ap_span-0.0.256",
+    "vendor__ra_ap_stdx-0.0.256",
+    "vendor__ra_ap_syntax-0.0.256",
+    "vendor__ra_ap_vfs-0.0.256",
+    "vendor__rand-0.8.5",
+    "vendor__rayon-1.10.0",
+    "vendor__regex-1.11.1",
+    "vendor__serde-1.0.217",
+    "vendor__serde_json-1.0.135",
+    "vendor__serde_with-3.12.0",
+    "vendor__stderrlog-0.6.0",
+    "vendor__syn-2.0.95",
+    "vendor__tracing-0.1.41",
+    "vendor__tracing-subscriber-0.3.19",
+    "vendor__tree-sitter-0.24.5",
+    "vendor__tree-sitter-embedded-template-0.23.2",
+    "vendor__tree-sitter-json-0.24.8",
+    "vendor__tree-sitter-ql-0.23.1",
+    "vendor__tree-sitter-ruby-0.23.1",
+    "vendor__triomphe-0.1.14",
+    "vendor__ungrammar-1.16.1",
+)
 
 http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 # rust-analyzer sources needed by the rust ast-generator (see `rust/ast-generator/README.md`)
+RUST_ANALYZER_SRC_TAG = "2025-01-07"
+
 http_archive(
     name = "rust-analyzer-src",
     build_file = "//rust/ast-generator:BUILD.rust-analyzer-src.bazel",
-    integrity = "sha256-jl4KJmZku+ilMLnuX2NU+qa1v10IauSiDiz23sZo360=",
+    integrity = "sha256-eo8mIaUafZL8LOM65bDIIIXw1rNQ/P/x5RK/XUtgo5g=",
     patch_args = ["-p1"],
     patches = [
         "//rust/ast-generator:patches/rust-analyzer.patch",
     ],
-    strip_prefix = "rust-analyzer-2024-12-16",
-    url = "https://github.com/rust-lang/rust-analyzer/archive/refs/tags/2024-12-16.tar.gz",
+    strip_prefix = "rust-analyzer-%s" % RUST_ANALYZER_SRC_TAG,
+    url = "https://github.com/rust-lang/rust-analyzer/archive/refs/tags/%s.tar.gz" % RUST_ANALYZER_SRC_TAG,
 )
 
 dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")

diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
diff --git a/...s_deps/BUILD.ra-ap-rustc_abi-0.80.0.bazel → ...s_deps/BUILD.ra-ap-rustc_abi-0.87.0.bazel b/...s_deps/BUILD.ra-ap-rustc_abi-0.80.0.bazel → ...s_deps/BUILD.ra-ap-rustc_abi-0.87.0.bazel
diff --git a/...deps/BUILD.ra-ap-rustc_index-0.80.0.bazel → ...deps/BUILD.ra-ap-rustc_index-0.87.0.bazel b/...deps/BUILD.ra-ap-rustc_index-0.80.0.bazel → ...deps/BUILD.ra-ap-rustc_index-0.87.0.bazel
diff --git a/...ILD.ra-ap-rustc_index_macros-0.80.0.bazel → ...ILD.ra-ap-rustc_index_macros-0.87.0.bazel b/...ILD.ra-ap-rustc_index_macros-0.80.0.bazel → ...ILD.ra-ap-rustc_index_macros-0.87.0.bazel
diff --git a/...deps/BUILD.ra-ap-rustc_lexer-0.80.0.bazel → ...deps/BUILD.ra-ap-rustc_lexer-0.87.0.bazel b/...deps/BUILD.ra-ap-rustc_lexer-0.80.0.bazel → ...deps/BUILD.ra-ap-rustc_lexer-0.87.0.bazel
diff --git a/...ILD.ra-ap-rustc_parse_format-0.80.0.bazel → ...ILD.ra-ap-rustc_parse_format-0.87.0.bazel b/...ILD.ra-ap-rustc_parse_format-0.80.0.bazel → ...ILD.ra-ap-rustc_parse_format-0.87.0.bazel
diff --git a/...ra-ap-rustc_pattern_analysis-0.80.0.bazel → ...ra-ap-rustc_pattern_analysis-0.87.0.bazel b/...ra-ap-rustc_pattern_analysis-0.80.0.bazel → ...ra-ap-rustc_pattern_analysis-0.87.0.bazel
diff --git a/...rs_deps/BUILD.ra_ap_base_db-0.0.248.bazel → ...rs_deps/BUILD.ra_ap_base_db-0.0.256.bazel b/...rs_deps/BUILD.ra_ap_base_db-0.0.248.bazel → ...rs_deps/BUILD.ra_ap_base_db-0.0.256.bazel
diff --git a/...actors_deps/BUILD.ra_ap_cfg-0.0.248.bazel → ...actors_deps/BUILD.ra_ap_cfg-0.0.256.bazel b/...actors_deps/BUILD.ra_ap_cfg-0.0.248.bazel → ...actors_deps/BUILD.ra_ap_cfg-0.0.256.bazel