Skip to content

Commit 28f822f

Browse files
committed
Format and bump rustc crates
1 parent 48f9a7c commit 28f822f

File tree

4 files changed

+30
-32
lines changed

4 files changed

+30
-32
lines changed

src/tools/rust-analyzer/Cargo.lock

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@ dependencies = [
15021502
"edition",
15031503
"expect-test",
15041504
"ra-ap-rustc_lexer",
1505-
"rustc-literal-escaper 0.0.4",
1505+
"rustc-literal-escaper",
15061506
"stdx",
15071507
"tracing",
15081508
]
@@ -1753,9 +1753,9 @@ dependencies = [
17531753

17541754
[[package]]
17551755
name = "ra-ap-rustc_abi"
1756-
version = "0.116.0"
1756+
version = "0.121.0"
17571757
source = "registry+https://github.com/rust-lang/crates.io-index"
1758-
checksum = "a967e3a9cd3e38b543f503978e0eccee461e3aea3f7b10e944959bff41dbe612"
1758+
checksum = "3ee51482d1c9d3e538acda8cce723db8eea1a81540544bf362bf4c3d841b2329"
17591759
dependencies = [
17601760
"bitflags 2.9.1",
17611761
"ra-ap-rustc_hashes",
@@ -1765,28 +1765,28 @@ dependencies = [
17651765

17661766
[[package]]
17671767
name = "ra-ap-rustc_hashes"
1768-
version = "0.116.0"
1768+
version = "0.121.0"
17691769
source = "registry+https://github.com/rust-lang/crates.io-index"
1770-
checksum = "1ea4c755ecbbffa5743c251344f484ebe571ec7bc5b36d80b2a8ae775d1a7a40"
1770+
checksum = "19c8f1e0c28e24e1b4c55dc08058c6c9829df2204497d4034259f491d348c204"
17711771
dependencies = [
17721772
"rustc-stable-hash",
17731773
]
17741774

17751775
[[package]]
17761776
name = "ra-ap-rustc_index"
1777-
version = "0.116.0"
1777+
version = "0.121.0"
17781778
source = "registry+https://github.com/rust-lang/crates.io-index"
1779-
checksum = "aca7ad7cf911538c619caa2162339fe98637e9e46f11bb0484ef96735df4d64a"
1779+
checksum = "5f33f429cec6b92fa2c7243883279fb29dd233fdc3e94099aff32aa91aa87f50"
17801780
dependencies = [
17811781
"ra-ap-rustc_index_macros",
17821782
"smallvec",
17831783
]
17841784

17851785
[[package]]
17861786
name = "ra-ap-rustc_index_macros"
1787-
version = "0.116.0"
1787+
version = "0.121.0"
17881788
source = "registry+https://github.com/rust-lang/crates.io-index"
1789-
checksum = "8767ba551c9355bc3031be072cc4bb0381106e5e7cd275e72b7a8c76051c4070"
1789+
checksum = "b9b55910dbe1fe7ef34bdc1d1bcb41e99b377eb680ea58a1218d95d6b4152257"
17901790
dependencies = [
17911791
"proc-macro2",
17921792
"quote",
@@ -1795,9 +1795,9 @@ dependencies = [
17951795

17961796
[[package]]
17971797
name = "ra-ap-rustc_lexer"
1798-
version = "0.116.0"
1798+
version = "0.121.0"
17991799
source = "registry+https://github.com/rust-lang/crates.io-index"
1800-
checksum = "6101374afb267e6c27e4e2eb0b1352e9f3504c1a8f716f619cd39244e2ed92ab"
1800+
checksum = "22944e31fb91e9b3e75bcbc91e37d958b8c0825a6160927f2856831d2ce83b36"
18011801
dependencies = [
18021802
"memchr",
18031803
"unicode-properties",
@@ -1806,19 +1806,19 @@ dependencies = [
18061806

18071807
[[package]]
18081808
name = "ra-ap-rustc_parse_format"
1809-
version = "0.116.0"
1809+
version = "0.121.0"
18101810
source = "registry+https://github.com/rust-lang/crates.io-index"
1811-
checksum = "ecd88a19f00da4f43e6727d5013444cbc399804b5046dfa2bbcd28ebed3970ce"
1811+
checksum = "81057891bc2063ad9e353f29462fbc47a0f5072560af34428ae9313aaa5e9d97"
18121812
dependencies = [
18131813
"ra-ap-rustc_lexer",
1814-
"rustc-literal-escaper 0.0.2",
1814+
"rustc-literal-escaper",
18151815
]
18161816

18171817
[[package]]
18181818
name = "ra-ap-rustc_pattern_analysis"
1819-
version = "0.116.0"
1819+
version = "0.121.0"
18201820
source = "registry+https://github.com/rust-lang/crates.io-index"
1821-
checksum = "bb332dd32d7850a799862533b1c021e6062558861a4ad57817bf522499fbb892"
1821+
checksum = "fe21a3542980d56d2435e96c2720773cac1c63fd4db666417e414729da192eb3"
18221822
dependencies = [
18231823
"ra-ap-rustc_index",
18241824
"rustc-hash 2.1.1",
@@ -1963,12 +1963,6 @@ version = "2.1.1"
19631963
source = "registry+https://github.com/rust-lang/crates.io-index"
19641964
checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
19651965

1966-
[[package]]
1967-
name = "rustc-literal-escaper"
1968-
version = "0.0.2"
1969-
source = "registry+https://github.com/rust-lang/crates.io-index"
1970-
checksum = "0041b6238913c41fe704213a4a9329e2f685a156d1781998128b4149c230ad04"
1971-
19721966
[[package]]
19731967
name = "rustc-literal-escaper"
19741968
version = "0.0.4"
@@ -2262,7 +2256,7 @@ dependencies = [
22622256
"rayon",
22632257
"rowan",
22642258
"rustc-hash 2.1.1",
2265-
"rustc-literal-escaper 0.0.4",
2259+
"rustc-literal-escaper",
22662260
"rustc_apfloat",
22672261
"smol_str",
22682262
"stdx",

src/tools/rust-analyzer/Cargo.toml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
8989
vfs = { path = "./crates/vfs", version = "0.0.0" }
9090
edition = { path = "./crates/edition", version = "0.0.0" }
9191

92-
ra-ap-rustc_lexer = { version = "0.116", default-features = false }
93-
ra-ap-rustc_parse_format = { version = "0.116", default-features = false }
94-
ra-ap-rustc_index = { version = "0.116", default-features = false }
95-
ra-ap-rustc_abi = { version = "0.116", default-features = false }
96-
ra-ap-rustc_pattern_analysis = { version = "0.116", default-features = false }
92+
ra-ap-rustc_lexer = { version = "0.121", default-features = false }
93+
ra-ap-rustc_parse_format = { version = "0.121", default-features = false }
94+
ra-ap-rustc_index = { version = "0.121", default-features = false }
95+
ra-ap-rustc_abi = { version = "0.121", default-features = false }
96+
ra-ap-rustc_pattern_analysis = { version = "0.121", default-features = false }
9797

9898
# local crates that aren't published to crates.io. These should not have versions.
9999

@@ -138,7 +138,11 @@ rayon = "1.10.0"
138138
rowan = "=0.15.15"
139139
# Ideally we'd not enable the macros feature but unfortunately the `tracked` attribute does not work
140140
# on impls without it
141-
salsa = { version = "0.23.0", default-features = true, features = ["rayon","salsa_unstable", "macros"] }
141+
salsa = { version = "0.23.0", default-features = true, features = [
142+
"rayon",
143+
"salsa_unstable",
144+
"macros",
145+
] }
142146
salsa-macros = "0.23.0"
143147
semver = "1.0.26"
144148
serde = { version = "1.0.219" }

src/tools/rust-analyzer/crates/hir-ty/src/layout/target.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use base_db::Crate;
44
use hir_def::layout::TargetDataLayout;
5-
use rustc_abi::{AlignFromBytesError, TargetDataLayoutErrors, AddressSpace};
5+
use rustc_abi::{AddressSpace, AlignFromBytesError, TargetDataLayoutErrors};
66
use triomphe::Arc;
77

88
use crate::db::HirDatabase;

src/tools/rust-analyzer/crates/parser/src/lexed_str.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
use std::ops;
1212

1313
use rustc_literal_escaper::{
14-
unescape_byte, unescape_byte_str, unescape_c_str, unescape_char, unescape_str, EscapeError,
15-
Mode,
14+
EscapeError, Mode, unescape_byte, unescape_byte_str, unescape_c_str, unescape_char,
15+
unescape_str,
1616
};
1717

1818
use crate::{

0 commit comments

Comments
 (0)