Skip to content

Commit f5d93be

Browse files
committed
Auto merge of #124202 - lnicola:sync-from-ra, r=lnicola
Subtree update of `rust-analyzer` r? `@ghost`
2 parents b085d5f + c8c635a commit f5d93be

File tree

237 files changed

+6206
-3270
lines changed

Some content is hidden

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

237 files changed

+6206
-3270
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Otherwise please try to provide information which will help us to fix the issue
2222

2323
**rustc version**: (eg. output of `rustc -V`)
2424

25+
**editor or extension**: (eg. VSCode, Vim, Emacs, etc. For VSCode users, specify your extension version; for users of other editors, provide the distribution if applicable)
26+
2527
**relevant settings**: (eg. client settings, or environment variables like `CARGO`, `RUSTC`, `RUSTUP_HOME` or `CARGO_HOME`)
2628

2729
**repository link (if public, optional)**: (eg. [rust-analyzer](https://github.com/rust-lang/rust-analyzer))

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
run: cargo build --quiet ${{ env.USE_SYSROOT_ABI }}
9292

9393
- name: Test
94-
if: matrix.os == 'ubuntu-latest' || github.event_name == 'push'
94+
if: matrix.os == 'ubuntu-latest' || matrix.os == 'windows-latest' || github.event_name == 'push'
9595
run: cargo test ${{ env.USE_SYSROOT_ABI }} -- --nocapture --quiet
9696

9797
- name: Switch to stable toolchain

.github/workflows/metrics.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
key: ${{ runner.os }}-target-${{ github.sha }}
5959

6060
- name: Upload build metrics
61-
uses: actions/upload-artifact@v3
61+
uses: actions/upload-artifact@v4
6262
with:
6363
name: build-${{ github.sha }}
6464
path: target/build.json
@@ -95,7 +95,7 @@ jobs:
9595
run: cargo xtask metrics "${{ matrix.names }}"
9696

9797
- name: Upload metrics
98-
uses: actions/upload-artifact@v3
98+
uses: actions/upload-artifact@v4
9999
with:
100100
name: ${{ matrix.names }}-${{ github.sha }}
101101
path: target/${{ matrix.names }}.json
@@ -109,32 +109,32 @@ jobs:
109109
uses: actions/checkout@v4
110110

111111
- name: Download build metrics
112-
uses: actions/download-artifact@v3
112+
uses: actions/download-artifact@v4
113113
with:
114114
name: build-${{ github.sha }}
115115

116116
- name: Download self metrics
117-
uses: actions/download-artifact@v3
117+
uses: actions/download-artifact@v4
118118
with:
119119
name: self-${{ github.sha }}
120120

121121
- name: Download ripgrep-13.0.0 metrics
122-
uses: actions/download-artifact@v3
122+
uses: actions/download-artifact@v4
123123
with:
124124
name: ripgrep-13.0.0-${{ github.sha }}
125125

126126
- name: Download webrender-2022 metrics
127-
uses: actions/download-artifact@v3
127+
uses: actions/download-artifact@v4
128128
with:
129129
name: webrender-2022-${{ github.sha }}
130130

131131
- name: Download diesel-1.4.8 metrics
132-
uses: actions/download-artifact@v3
132+
uses: actions/download-artifact@v4
133133
with:
134134
name: diesel-1.4.8-${{ github.sha }}
135135

136136
- name: Download hyper-0.14.18 metrics
137-
uses: actions/download-artifact@v3
137+
uses: actions/download-artifact@v4
138138
with:
139139
name: hyper-0.14.18-${{ github.sha }}
140140

CONTRIBUTING.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Contributing to rust-analyzer
2+
3+
Thank you for your interest in contributing to rust-analyzer! There are many ways to contribute
4+
and we appreciate all of them.
5+
6+
To get a quick overview of the crates and structure of the project take a look at the
7+
[./docs/dev](./docs/dev) folder.
8+
9+
If you have any questions please ask them in the [rust-analyzer zulip stream](
10+
https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer) or if unsure where
11+
to start out when working on a concrete issue drop a comment on the related issue for mentoring
12+
instructions (general discussions are recommended to happen on zulip though).
13+
14+
## Fixing a bug or improving a feature
15+
16+
Generally it's fine to just work on these kinds of things and put a pull-request out for it. If there
17+
is an issue accompanying it make sure to link it in the pull request description so it can be closed
18+
afterwards or linked for context.
19+
20+
If you want to find something to fix or work on keep a look out for the `C-bug` and `C-enhancement`
21+
labels.
22+
23+
## Implementing a new feature
24+
25+
It's advised to first open an issue for any kind of new feature so the team can tell upfront whether
26+
the feature is desirable or not before any implementation work happens. We want to minimize the
27+
possibility of someone putting a lot of work into a feature that is then going to waste as we deem
28+
it out of scope (be it due to generally not fitting in with rust-analyzer, or just not having the
29+
maintenance capacity). If there already is a feature issue open but it is not clear whether it is
30+
considered accepted feel free to just drop a comment and ask!

Cargo.lock

Lines changed: 66 additions & 9 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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ smol_str.opt-level = 3
2222
text-size.opt-level = 3
2323
# This speeds up `cargo xtask dist`.
2424
miniz_oxide.opt-level = 3
25+
salsa.opt-level = 3
2526

2627
[profile.release]
2728
incremental = true
@@ -106,10 +107,10 @@ arrayvec = "0.7.4"
106107
bitflags = "2.4.1"
107108
cargo_metadata = "0.18.1"
108109
camino = "1.1.6"
109-
chalk-solve = { version = "0.96.0", default-features = false }
110-
chalk-ir = "0.96.0"
111-
chalk-recursive = { version = "0.96.0", default-features = false }
112-
chalk-derive = "0.96.0"
110+
chalk-solve = { version = "0.97.0", default-features = false }
111+
chalk-ir = "0.97.0"
112+
chalk-recursive = { version = "0.97.0", default-features = false }
113+
chalk-derive = "0.97.0"
113114
command-group = "2.0.1"
114115
crossbeam-channel = "0.5.8"
115116
dissimilar = "1.0.7"
@@ -188,6 +189,8 @@ enum_variant_names = "allow"
188189
new_ret_no_self = "allow"
189190
# Has a bunch of false positives
190191
useless_asref = "allow"
192+
# Has false positives
193+
assigning_clones = "allow"
191194

192195
## Following lints should be tackled at some point
193196
too_many_arguments = "allow"

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ https://rust-analyzer.github.io/manual.html#installation
1313

1414
## Documentation
1515

16-
If you want to **contribute** to rust-analyzer or are just curious about how
17-
things work under the hood, check the [./docs/dev](./docs/dev) folder.
16+
If you want to **contribute** to rust-analyzer check out the [CONTRIBUTING.md](./CONTRIBUTING.md) or
17+
if you are just curious about how things work under the hood, check the [./docs/dev](./docs/dev)
18+
folder.
1819

1920
If you want to **use** rust-analyzer's language server with your editor of
2021
choice, check [the manual](https://rust-analyzer.github.io/manual.html) folder.

0 commit comments

Comments
 (0)