Skip to content

Commit 928c66a

Browse files
authored
Merge pull request #18443 from github/redsun82/cargo-upgrade
Rust: update rust-analyzer
2 parents 12048ae + 6ded99c commit 928c66a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+745
-607
lines changed

Cargo.lock

Lines changed: 73 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MODULE.bazel

Lines changed: 71 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,26 +65,92 @@ rust_host_tools.host_tools(
6565
# deps for python extractor
6666
# keep in sync by running `misc/bazel/3rdparty/update_cargo_deps.sh`
6767
py_deps = use_extension("//misc/bazel/3rdparty:py_deps_extension.bzl", "p")
68-
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")
68+
use_repo(
69+
py_deps,
70+
"vendor__anyhow-1.0.44",
71+
"vendor__cc-1.0.70",
72+
"vendor__clap-2.33.3",
73+
"vendor__regex-1.5.5",
74+
"vendor__smallvec-1.6.1",
75+
"vendor__string-interner-0.12.2",
76+
"vendor__thiserror-1.0.29",
77+
"vendor__tree-sitter-0.20.4",
78+
"vendor__tree-sitter-graph-0.7.0",
79+
)
6980

7081
# deps for ruby+rust
7182
# keep in sync by running `misc/bazel/3rdparty/update_cargo_deps.sh`
7283
tree_sitter_extractors_deps = use_extension("//misc/bazel/3rdparty:tree_sitter_extractors_extension.bzl", "r")
73-
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__mustache-0.9.0", "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.6", "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")
84+
use_repo(
85+
tree_sitter_extractors_deps,
86+
"vendor__anyhow-1.0.95",
87+
"vendor__argfile-0.2.1",
88+
"vendor__chrono-0.4.39",
89+
"vendor__clap-4.5.24",
90+
"vendor__dunce-1.0.5",
91+
"vendor__either-1.13.0",
92+
"vendor__encoding-0.2.33",
93+
"vendor__figment-0.10.19",
94+
"vendor__flate2-1.0.35",
95+
"vendor__glob-0.3.2",
96+
"vendor__globset-0.4.15",
97+
"vendor__itertools-0.14.0",
98+
"vendor__lazy_static-1.5.0",
99+
"vendor__log-0.4.22",
100+
"vendor__mustache-0.9.0",
101+
"vendor__num-traits-0.2.19",
102+
"vendor__num_cpus-1.16.0",
103+
"vendor__proc-macro2-1.0.92",
104+
"vendor__quote-1.0.38",
105+
"vendor__ra_ap_base_db-0.0.257",
106+
"vendor__ra_ap_cfg-0.0.257",
107+
"vendor__ra_ap_hir-0.0.257",
108+
"vendor__ra_ap_hir_def-0.0.257",
109+
"vendor__ra_ap_hir_expand-0.0.257",
110+
"vendor__ra_ap_ide_db-0.0.257",
111+
"vendor__ra_ap_intern-0.0.257",
112+
"vendor__ra_ap_load-cargo-0.0.257",
113+
"vendor__ra_ap_parser-0.0.257",
114+
"vendor__ra_ap_paths-0.0.257",
115+
"vendor__ra_ap_project_model-0.0.257",
116+
"vendor__ra_ap_span-0.0.257",
117+
"vendor__ra_ap_stdx-0.0.257",
118+
"vendor__ra_ap_syntax-0.0.257",
119+
"vendor__ra_ap_vfs-0.0.257",
120+
"vendor__rand-0.8.5",
121+
"vendor__rayon-1.10.0",
122+
"vendor__regex-1.11.1",
123+
"vendor__serde-1.0.217",
124+
"vendor__serde_json-1.0.135",
125+
"vendor__serde_with-3.12.0",
126+
"vendor__stderrlog-0.6.0",
127+
"vendor__syn-2.0.95",
128+
"vendor__tracing-0.1.41",
129+
"vendor__tracing-subscriber-0.3.19",
130+
"vendor__tree-sitter-0.24.6",
131+
"vendor__tree-sitter-embedded-template-0.23.2",
132+
"vendor__tree-sitter-json-0.24.8",
133+
"vendor__tree-sitter-ql-0.23.1",
134+
"vendor__tree-sitter-ruby-0.23.1",
135+
"vendor__triomphe-0.1.14",
136+
"vendor__ungrammar-1.16.1",
137+
)
74138

75139
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
76140

77141
# rust-analyzer sources needed by the rust ast-generator (see `rust/ast-generator/README.md`)
142+
RUST_ANALYZER_SRC_TAG = "2025-01-07"
143+
78144
http_archive(
79145
name = "rust-analyzer-src",
80146
build_file = "//rust/ast-generator:BUILD.rust-analyzer-src.bazel",
81-
integrity = "sha256-jl4KJmZku+ilMLnuX2NU+qa1v10IauSiDiz23sZo360=",
147+
integrity = "sha256-eo8mIaUafZL8LOM65bDIIIXw1rNQ/P/x5RK/XUtgo5g=",
82148
patch_args = ["-p1"],
83149
patches = [
84150
"//rust/ast-generator:patches/rust-analyzer.patch",
85151
],
86-
strip_prefix = "rust-analyzer-2024-12-16",
87-
url = "https://github.com/rust-lang/rust-analyzer/archive/refs/tags/2024-12-16.tar.gz",
152+
strip_prefix = "rust-analyzer-%s" % RUST_ANALYZER_SRC_TAG,
153+
url = "https://github.com/rust-lang/rust-analyzer/archive/refs/tags/%s.tar.gz" % RUST_ANALYZER_SRC_TAG,
88154
)
89155

90156
dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")

misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.80.0.bazel renamed to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.87.0.bazel

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.80.0.bazel renamed to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.87.0.bazel

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.80.0.bazel renamed to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.87.0.bazel

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.80.0.bazel renamed to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.87.0.bazel

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.80.0.bazel renamed to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.87.0.bazel

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.80.0.bazel renamed to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.87.0.bazel

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.248.bazel renamed to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.257.bazel

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)