Skip to content

Commit 9f433d2

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

Some content is hidden

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

63 files changed

+7101
-2913
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
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

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
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'

Cargo.lock

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

Cargo.toml

Lines changed: 7 additions & 7 deletions
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)