Skip to content

Commit 916e9ce

Browse files
borsbors
committed
Auto merge of rust-lang#132030 - matthiaskrgr:rollup-1g6quh0, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - rust-lang#131918 (coverage: Make counter creation handle node/edge counters more uniformly) - rust-lang#132021 (nuttx.md: typo) - rust-lang#132029 (Subtree update of `rust-analyzer`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f225713 + 6e7fcb2 commit 916e9ce

File tree

65 files changed

+7209
-3031
lines changed

Some content is hidden

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

65 files changed

+7209
-3031
lines changed

‎compiler/rustc_mir_transform/src/coverage/counters.rs

+107-117
Large diffs are not rendered by default.

‎src/doc/rustc/src/platform-support/nuttx.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The following target names are defined:
3535

3636
## Building the target
3737

38-
The target can be built by enabled in the `rustc` build:
38+
The target can be built by enabling it in the `rustc` build:
3939

4040
```toml
4141
[build]

‎src/tools/rust-analyzer/.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ max_line_length = 100
1313
[*.md]
1414
indent_size = 2
1515

16-
[*.{yml, yaml}]
16+
[*.{yml,yaml}]
1717
indent_size = 2

‎src/tools/rust-analyzer/.github/workflows/ci.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ jobs:
104104
if: matrix.os == 'ubuntu-latest'
105105
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats .
106106

107-
- name: Run analysis-stats on rust std library
107+
- name: Run analysis-stats on the rust standard libraries
108108
if: matrix.os == 'ubuntu-latest'
109109
env:
110-
RUSTC_BOOTSTRAP: 1
111-
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats --with-deps $(rustc --print sysroot)/lib/rustlib/src/rust/library/std
110+
RUSTC_BOOTSTRAP: 1
111+
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats --with-deps --no-sysroot --no-test $(rustc --print sysroot)/lib/rustlib/src/rust/library/
112112

113113
- name: clippy
114114
if: matrix.os == 'windows-latest'

‎src/tools/rust-analyzer/Cargo.lock

+46-40
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ dependencies = [
7373
"intern",
7474
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
7575
"lz4_flex",
76-
"rustc-hash",
76+
"rustc-hash 2.0.0",
7777
"salsa",
7878
"semver",
7979
"span",
@@ -161,7 +161,7 @@ dependencies = [
161161
"expect-test",
162162
"intern",
163163
"oorandom",
164-
"rustc-hash",
164+
"rustc-hash 2.0.0",
165165
"syntax",
166166
"syntax-bridge",
167167
"tt",
@@ -216,7 +216,7 @@ dependencies = [
216216
"chalk-derive",
217217
"chalk-ir",
218218
"chalk-solve",
219-
"rustc-hash",
219+
"rustc-hash 1.1.0",
220220
"tracing",
221221
]
222222

@@ -232,7 +232,7 @@ dependencies = [
232232
"indexmap",
233233
"itertools",
234234
"petgraph",
235-
"rustc-hash",
235+
"rustc-hash 1.1.0",
236236
"tracing",
237237
]
238238

@@ -513,7 +513,7 @@ dependencies = [
513513
"hir-ty",
514514
"intern",
515515
"itertools",
516-
"rustc-hash",
516+
"rustc-hash 2.0.0",
517517
"smallvec",
518518
"span",
519519
"stdx",
@@ -547,7 +547,7 @@ dependencies = [
547547
"mbe",
548548
"ra-ap-rustc_abi",
549549
"ra-ap-rustc_parse_format",
550-
"rustc-hash",
550+
"rustc-hash 2.0.0",
551551
"rustc_apfloat",
552552
"smallvec",
553553
"span",
@@ -577,7 +577,7 @@ dependencies = [
577577
"limit",
578578
"mbe",
579579
"parser",
580-
"rustc-hash",
580+
"rustc-hash 2.0.0",
581581
"smallvec",
582582
"span",
583583
"stdx",
@@ -616,7 +616,7 @@ dependencies = [
616616
"ra-ap-rustc_abi",
617617
"ra-ap-rustc_index",
618618
"ra-ap-rustc_pattern_analysis",
619-
"rustc-hash",
619+
"rustc-hash 2.0.0",
620620
"rustc_apfloat",
621621
"scoped-tls",
622622
"smallvec",
@@ -731,13 +731,13 @@ dependencies = [
731731
"indexmap",
732732
"itertools",
733733
"limit",
734-
"line-index 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
734+
"line-index 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
735735
"memchr",
736736
"nohash-hasher",
737737
"parser",
738738
"profile",
739739
"rayon",
740-
"rustc-hash",
740+
"rustc-hash 2.0.0",
741741
"span",
742742
"stdx",
743743
"syntax",
@@ -834,7 +834,7 @@ version = "0.0.0"
834834
dependencies = [
835835
"dashmap",
836836
"hashbrown",
837-
"rustc-hash",
837+
"rustc-hash 2.0.0",
838838
"sptr",
839839
"triomphe",
840840
]
@@ -939,7 +939,7 @@ version = "0.0.0"
939939

940940
[[package]]
941941
name = "line-index"
942-
version = "0.1.1"
942+
version = "0.1.2"
943943
dependencies = [
944944
"nohash-hasher",
945945
"oorandom",
@@ -948,9 +948,9 @@ dependencies = [
948948

949949
[[package]]
950950
name = "line-index"
951-
version = "0.1.1"
951+
version = "0.1.2"
952952
source = "registry+https://github.com/rust-lang/crates.io-index"
953-
checksum = "67d61795376ae2683928c218fda7d7d7db136fd38c06b7552904667f0d55580a"
953+
checksum = "3e27e0ed5a392a7f5ba0b3808a2afccff16c64933312c84b57618b49d1209bd2"
954954
dependencies = [
955955
"nohash-hasher",
956956
"text-size",
@@ -1051,7 +1051,7 @@ dependencies = [
10511051
"intern",
10521052
"parser",
10531053
"ra-ap-rustc_lexer",
1054-
"rustc-hash",
1054+
"rustc-hash 2.0.0",
10551055
"smallvec",
10561056
"span",
10571057
"stdx",
@@ -1345,7 +1345,7 @@ dependencies = [
13451345
"indexmap",
13461346
"intern",
13471347
"paths",
1348-
"rustc-hash",
1348+
"rustc-hash 2.0.0",
13491349
"serde",
13501350
"serde_json",
13511351
"span",
@@ -1435,7 +1435,7 @@ dependencies = [
14351435
"itertools",
14361436
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
14371437
"paths",
1438-
"rustc-hash",
1438+
"rustc-hash 2.0.0",
14391439
"semver",
14401440
"serde",
14411441
"serde_json",
@@ -1497,9 +1497,9 @@ dependencies = [
14971497

14981498
[[package]]
14991499
name = "ra-ap-rustc_abi"
1500-
version = "0.71.0"
1500+
version = "0.73.0"
15011501
source = "registry+https://github.com/rust-lang/crates.io-index"
1502-
checksum = "c6999d098000b98415939f13158dac78cb3eeeb7b0c073847f3e4b623866e27c"
1502+
checksum = "879ece0781e3c1cb670b9f29775c81a43a16db789d1296fad6bc5c74065b2fac"
15031503
dependencies = [
15041504
"bitflags 2.6.0",
15051505
"ra-ap-rustc_index",
@@ -1508,9 +1508,9 @@ dependencies = [
15081508

15091509
[[package]]
15101510
name = "ra-ap-rustc_index"
1511-
version = "0.71.0"
1511+
version = "0.73.0"
15121512
source = "registry+https://github.com/rust-lang/crates.io-index"
1513-
checksum = "ae9fb312d942817dab10790881f555928c1f6a11a85186e8e573ad4a86c7d3be"
1513+
checksum = "6910087ff89bb9f3db114bfcd86b5139042731fe7278d3ff4ceaa69a140154a7"
15141514
dependencies = [
15151515
"arrayvec",
15161516
"ra-ap-rustc_index_macros",
@@ -1519,9 +1519,9 @@ dependencies = [
15191519

15201520
[[package]]
15211521
name = "ra-ap-rustc_index_macros"
1522-
version = "0.71.0"
1522+
version = "0.73.0"
15231523
source = "registry+https://github.com/rust-lang/crates.io-index"
1524-
checksum = "766e3990eb1066a06deefc561b5a01b32ca5c9211feea31cbf4ed50611519872"
1524+
checksum = "3b6f7bd12b678fbb37444ba77f3b0cfc13b7394a6dc7b0c799491fc9df0a9997"
15251525
dependencies = [
15261526
"proc-macro2",
15271527
"quote",
@@ -1530,32 +1530,32 @@ dependencies = [
15301530

15311531
[[package]]
15321532
name = "ra-ap-rustc_lexer"
1533-
version = "0.71.0"
1533+
version = "0.73.0"
15341534
source = "registry+https://github.com/rust-lang/crates.io-index"
1535-
checksum = "f4afa98eb7889c137d5a3f1cd189089e16da04d1e4837d358a67aa3dab10ffbe"
1535+
checksum = "119bc05b5b6bc3e7f5b67ce8b8080e185da94bd83c447f91b6b3f3ecf60cbab1"
15361536
dependencies = [
15371537
"unicode-properties",
15381538
"unicode-xid",
15391539
]
15401540

15411541
[[package]]
15421542
name = "ra-ap-rustc_parse_format"
1543-
version = "0.71.0"
1543+
version = "0.73.0"
15441544
source = "registry+https://github.com/rust-lang/crates.io-index"
1545-
checksum = "d9234c96ffb0565286790407fb7eb7f55ebf69267de4db382fdec0a17f14b0e2"
1545+
checksum = "70ed6150ae71d905c064dc88d7824ebb0fa81083f45d7477cba7b57176f2f635"
15461546
dependencies = [
15471547
"ra-ap-rustc_index",
15481548
"ra-ap-rustc_lexer",
15491549
]
15501550

15511551
[[package]]
15521552
name = "ra-ap-rustc_pattern_analysis"
1553-
version = "0.71.0"
1553+
version = "0.73.0"
15541554
source = "registry+https://github.com/rust-lang/crates.io-index"
1555-
checksum = "273d5f72926a58c7eea27aebc898d1d5b32d23d2342f692a94a2cf8746aa4a2f"
1555+
checksum = "6e830862a0ec85fce211d34735315686bb8d6a12d418d6d735fb534aa1cd3293"
15561556
dependencies = [
15571557
"ra-ap-rustc_index",
1558-
"rustc-hash",
1558+
"rustc-hash 2.0.0",
15591559
"rustc_apfloat",
15601560
"smallvec",
15611561
"tracing",
@@ -1640,7 +1640,7 @@ dependencies = [
16401640
"countme",
16411641
"hashbrown",
16421642
"memoffset",
1643-
"rustc-hash",
1643+
"rustc-hash 1.1.0",
16441644
"text-size",
16451645
]
16461646

@@ -1680,7 +1680,7 @@ dependencies = [
16801680
"profile",
16811681
"project-model",
16821682
"rayon",
1683-
"rustc-hash",
1683+
"rustc-hash 2.0.0",
16841684
"scip",
16851685
"semver",
16861686
"serde",
@@ -1717,6 +1717,12 @@ version = "1.1.0"
17171717
source = "registry+https://github.com/rust-lang/crates.io-index"
17181718
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
17191719

1720+
[[package]]
1721+
name = "rustc-hash"
1722+
version = "2.0.0"
1723+
source = "registry+https://github.com/rust-lang/crates.io-index"
1724+
checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
1725+
17201726
[[package]]
17211727
name = "rustc_apfloat"
17221728
version = "0.2.1+llvm-462a31f5a5ab"
@@ -1746,7 +1752,7 @@ dependencies = [
17461752
"oorandom",
17471753
"parking_lot",
17481754
"rand",
1749-
"rustc-hash",
1755+
"rustc-hash 2.0.0",
17501756
"salsa-macros",
17511757
"smallvec",
17521758
"tracing",
@@ -1898,7 +1904,7 @@ version = "0.0.0"
18981904
dependencies = [
18991905
"hashbrown",
19001906
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1901-
"rustc-hash",
1907+
"rustc-hash 2.0.0",
19021908
"salsa",
19031909
"stdx",
19041910
"syntax",
@@ -1967,7 +1973,7 @@ dependencies = [
19671973
"ra-ap-rustc_lexer",
19681974
"rayon",
19691975
"rowan",
1970-
"rustc-hash",
1976+
"rustc-hash 2.0.0",
19711977
"rustc_apfloat",
19721978
"smol_str",
19731979
"stdx",
@@ -1983,7 +1989,7 @@ version = "0.0.0"
19831989
dependencies = [
19841990
"intern",
19851991
"parser",
1986-
"rustc-hash",
1992+
"rustc-hash 2.0.0",
19871993
"span",
19881994
"stdx",
19891995
"syntax",
@@ -2000,7 +2006,7 @@ dependencies = [
20002006
"cfg",
20012007
"hir-expand",
20022008
"intern",
2003-
"rustc-hash",
2009+
"rustc-hash 2.0.0",
20042010
"span",
20052011
"stdx",
20062012
"test-utils",
@@ -2014,7 +2020,7 @@ dependencies = [
20142020
"dissimilar",
20152021
"paths",
20162022
"profile",
2017-
"rustc-hash",
2023+
"rustc-hash 2.0.0",
20182024
"stdx",
20192025
"text-size",
20202026
"tracing",
@@ -2361,7 +2367,7 @@ dependencies = [
23612367
"indexmap",
23622368
"nohash-hasher",
23632369
"paths",
2364-
"rustc-hash",
2370+
"rustc-hash 2.0.0",
23652371
"stdx",
23662372
"tracing",
23672373
]
@@ -2374,7 +2380,7 @@ dependencies = [
23742380
"notify",
23752381
"paths",
23762382
"rayon",
2377-
"rustc-hash",
2383+
"rustc-hash 2.0.0",
23782384
"stdx",
23792385
"tracing",
23802386
"vfs",

‎src/tools/rust-analyzer/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,18 @@ tt = { path = "./crates/tt", version = "0.0.0" }
8585
vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
8686
vfs = { path = "./crates/vfs", version = "0.0.0" }
8787

88-
ra-ap-rustc_lexer = { version = "0.71.0", default-features = false }
89-
ra-ap-rustc_parse_format = { version = "0.71.0", default-features = false }
90-
ra-ap-rustc_index = { version = "0.71.0", default-features = false }
91-
ra-ap-rustc_abi = { version = "0.71.0", default-features = false }
92-
ra-ap-rustc_pattern_analysis = { version = "0.71.0", default-features = false }
88+
ra-ap-rustc_lexer = { version = "0.73", default-features = false }
89+
ra-ap-rustc_parse_format = { version = "0.73", default-features = false }
90+
ra-ap-rustc_index = { version = "0.73", default-features = false }
91+
ra-ap-rustc_abi = { version = "0.73", default-features = false }
92+
ra-ap-rustc_pattern_analysis = { version = "0.73", default-features = false }
9393

9494
# local crates that aren't published to crates.io. These should not have versions.
9595
test-fixture = { path = "./crates/test-fixture" }
9696
test-utils = { path = "./crates/test-utils" }
9797

9898
# In-tree crates that are published separately and follow semver. See lib/README.md
99-
line-index = { version = "0.1.1" }
99+
line-index = { version = "0.1.2" }
100100
la-arena = { version = "0.3.1" }
101101
lsp-server = { version = "0.7.6" }
102102

@@ -136,7 +136,7 @@ process-wrap = { version = "8.0.2", features = ["std"] }
136136
pulldown-cmark-to-cmark = "10.0.4"
137137
pulldown-cmark = { version = "0.9.0", default-features = false }
138138
rayon = "1.8.0"
139-
rustc-hash = "1.1.0"
139+
rustc-hash = "2.0.0"
140140
semver = "1.0.14"
141141
serde = { version = "1.0.192", features = ["derive"] }
142142
serde_json = "1.0.108"

0 commit comments

Comments
 (0)