Skip to content

Subtree update of rust-analyzer #125272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 138 commits into from
May 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
29d28f8
Make `cargo run` always available for binaries
joshka Mar 29, 2024
3a4a69a
Add config hover_show_adtFieldsOrVariants to handle hovering limitati…
roife Apr 6, 2024
3994fcb
Update tests and docs for hover_show_adtFieldsOrVariants
roife Apr 6, 2024
2b38652
fix: the fields or variants of ADT was not restricted by limitations …
roife Apr 6, 2024
a113612
fix: adjust the limitation for ADTs' fields to 5
roife Apr 7, 2024
a8e50cf
Handle panicking like rustc CTFE does
Noratrieb Mar 24, 2024
b6751b7
Fix missing function body in minicore
Veykril Mar 25, 2024
4a33c5f
Fixup some issues with minicore
Veykril Mar 26, 2024
ca53651
Fix #[rustc_const_panic_str] functions not actually being hooked
Veykril Apr 18, 2024
2efaa44
Implement BeginPanic for mir eval
Veykril Apr 19, 2024
c1a4ba5
fix: add a separate setting for enum variants
roife Apr 19, 2024
0e9d845
Add hovering limitations support for variants
roife Apr 19, 2024
f7f02c0
fix: remove space within `{}` when no fields in struct
roife Apr 20, 2024
570c725
try to generate more meaningful names
leviska Apr 20, 2024
846f804
add test with multiple names
leviska Apr 20, 2024
04de0ff
Peek for panic message in test output
Veykril Apr 19, 2024
8f21381
Use josh for subtree syncs
lnicola Apr 7, 2024
7c39263
Allow rust files to be used linkedProjects
Veykril Apr 21, 2024
3c0f2db
Auto merge of #17118 - Veykril:linked-rust-files, r=Veykril
bors Apr 21, 2024
92ace4b
Extract common fields out of ProjectWorkspace variants
Veykril Apr 21, 2024
0a29e6f
Support flychecking for cargo scripts
Veykril Apr 21, 2024
23f19a2
Auto merge of #17119 - Veykril:linked-rust-files, r=Veykril
bors Apr 21, 2024
7a3ad03
Auto merge of #17115 - leviska:json_is_not_rust_better_names, r=Veykril
bors Apr 21, 2024
8ea8c74
Auto merge of #16938 - Nilstrieb:dont-panic-tests, r=Veykril
bors Apr 21, 2024
a200391
Auto merge of #17025 - lnicola:josh, r=lnicola
bors Apr 21, 2024
2d4723b
chore: add some `tracing` to project loading
davidbarsky Apr 18, 2024
afa2a89
Auto merge of #17102 - davidbarsky:david/add-some-tracing-to-project-…
bors Apr 22, 2024
9e212e0
different error code based on variant
Apr 23, 2024
5a315da
Auto merge of #17131 - bzy-debug:issue-17107, r=lnicola
bors Apr 24, 2024
410f71f
fix: move no_std check out of loop
joshka Apr 24, 2024
ec1a29b
Drop unknown lifetimes when rendering generic args
Veykril Apr 24, 2024
1709e37
Auto merge of #16972 - joshka:cargo-run-runnable, r=Veykril
bors Apr 25, 2024
10e82da
Add inlay hints lifetime arg tests
Veykril Apr 24, 2024
d00de38
Auto merge of #17021 - roife:add-hover-limits-for-adts, r=Veykril
bors Apr 25, 2024
a2259bb
Auto merge of #17134 - Veykril:lt-err-display, r=Veykril
bors Apr 25, 2024
7dd3a16
fix: Fix expression scopes not being calculated for inline consts
Veykril Apr 25, 2024
b2c3774
Auto merge of #17135 - Veykril:inline-const-scope, r=Veykril
bors Apr 25, 2024
3bc103a
Show workspace info in the status bar
Veykril Apr 26, 2024
cb12dbb
Auto merge of #17143 - Veykril:status-info, r=Veykril
bors Apr 26, 2024
0daa891
manual: remove suggestion of rust-project.json example
cbiffle Apr 26, 2024
2b6f198
fix: Fix source roots not always being created when necessary
Veykril Apr 26, 2024
0d33960
Auto merge of #17145 - Veykril:fix-missing-source-root, r=Veykril
bors Apr 26, 2024
0274d34
add no-new-root check to josh pull
RalfJung Apr 27, 2024
70fb039
empty rust-version file, since no pull has happened yet
RalfJung Apr 27, 2024
94c5034
Auto merge of #17150 - RalfJung:josh-pull, r=lnicola
bors Apr 27, 2024
d37c4b7
fix: Fix attributes on generic parameters colliding in item tree
Veykril Apr 27, 2024
b81f1f6
Auto merge of #17151 - Veykril:fix-cfg-trait-params, r=Veykril
bors Apr 27, 2024
efb390b
fix: Fix doc comment desugaring for proc-macros
Veykril Apr 27, 2024
960598b
Auto merge of #17153 - Veykril:doc-comment-desugaring, r=Veykril
bors Apr 27, 2024
001c387
Don't retry position relient requests and version resolve data
Veykril Apr 28, 2024
e379766
Work around completion retrying not fixing up offsets
Veykril Apr 28, 2024
495afd1
Retry inlay hint requests
Veykril Apr 28, 2024
3e3faf0
Auto merge of #17157 - Veykril:retry, r=Veykril
bors Apr 29, 2024
f7de094
Auto merge of #17144 - cbiffle:patch-1, r=Veykril
bors Apr 29, 2024
14ef636
implement creating generics for impl traits in associated types
dfireBird Apr 29, 2024
8f3eecc
discard when the path is invalid utf8 symbol.
l1nxy Apr 30, 2024
e2b1c55
Make generate function assist generate a function as a constructor if…
Kohei316 Apr 17, 2024
27fa563
Auto merge of #17161 - l1nxy:discard-invalid-path, r=Veykril
bors Apr 30, 2024
4ce1c6c
Auto merge of #17138 - Kohei316:generate-function-assist-for-new, r=V…
bors Apr 30, 2024
b1ed492
Use `RefCell::take`
Veykril Apr 30, 2024
b5a0f7e
Auto merge of #17160 - dfireBird:fix_impl_trait, r=Veykril
bors Apr 30, 2024
76fd22e
docs: Fix typo in VS Code setting description
Wilfred Apr 26, 2024
9a498e0
Auto merge of #17147 - Wilfred:fix_typo, r=Veykril
bors Apr 30, 2024
65b201a
fix: Tracing span names should match function names
Wilfred Apr 27, 2024
d70c876
Auto merge of #17148 - Wilfred:span_names, r=Veykril
bors Apr 30, 2024
60cac54
Update rust-analyzer to use windows-sys crate
kennykerr May 1, 2024
9ce7ab6
Auto merge of #17168 - kennykerr:rust-analyzer-windows-sys, r=lnicola
bors May 1, 2024
f4b4a12
fix: Correctly handle `no_core`/`no_std` for preludes
Veykril May 2, 2024
675197a
Auto merge of #17172 - Veykril:prelude, r=Veykril
bors May 2, 2024
f190ce6
fix: Fix implicit ty args being lowered where they shouldn't
Veykril May 2, 2024
c5eaf59
Auto merge of #17175 - Veykril:fix-implicit-ty-args, r=Veykril
bors May 2, 2024
fdf757e
Fix impl trait params not being counted properly
Veykril May 2, 2024
b05f906
Auto merge of #17176 - Veykril:fix-implicit-ty-args, r=Veykril
bors May 2, 2024
d09331c
Fix Run lens showing when lenses are disabled
hermannm May 2, 2024
1e7c467
Auto merge of #17177 - hermannm:fix-run-lens-config, r=Veykril
bors May 3, 2024
1f199fe
Bump peaceiris/actions-gh-pages
lnicola May 3, 2024
fb23055
Auto merge of #17180 - lnicola:bump-gh-pages, r=lnicola
bors May 3, 2024
85bcced
fix: keep parentheses when the precedence of inner expr is lower than…
roife May 5, 2024
26456e6
use the repository field to link to the repository
szabgab May 5, 2024
723467b
tests: update test in assist apply_demorgan
roife May 5, 2024
4de215a
fix lifetime bound var index in dyn trait
dfireBird May 5, 2024
c50b357
Auto merge of #17190 - dfireBird:dyn_trait_with_lifetimes_in_rpit, r=…
bors May 5, 2024
88a0df9
Fix source_range for INT_NUMBER in completion
roife May 6, 2024
58d58af
Implement unsafe attribute parsing
Veykril May 6, 2024
1e2738b
Collapse term search exprs before Cartesian product to avoid OOM
kilpkonn May 6, 2024
9785dcc
Add time based fuel to term search
kilpkonn May 6, 2024
24ef42a
Auto merge of #17192 - roife:fix-issue-17179, r=lnicola
bors May 7, 2024
f9f1d31
Use unit of work as fuel instead of time
kilpkonn May 7, 2024
8ef19e7
Make term search fuel configurable
kilpkonn May 8, 2024
8ca1146
fix: Report all LSP protocol errors with invalid_data
Wilfred May 8, 2024
a3ed9fe
fix: Report both IO errors and main_loop errors
Wilfred May 8, 2024
85b17d4
Auto merge of #17207 - Wilfred:serde_invalid_data, r=lnicola
bors May 9, 2024
48bcef3
Auto merge of #17208 - Wilfred:log_error_from_threads, r=Veykril
bors May 9, 2024
fafcc77
fix: extract mod to file should respect path attribute
Young-Flash May 9, 2024
de58ddf
test: add test case extract_with_specified_path_attr
Young-Flash May 12, 2024
6a3556b
Auto merge of #17195 - Veykril:unsafe-attr, r=Veykril
bors May 13, 2024
9e20f4b
Auto merge of #17187 - roife:fix-issue-17185, r=Veykril
bors May 13, 2024
03f935d
Auto merge of #17188 - szabgab:patch-1, r=Veykril
bors May 13, 2024
a739739
Fix literal hovers being confusing and wrong for floats
Veykril May 13, 2024
197856d
Auto merge of #17203 - kilpkonn:collapse_terms, r=Veykril
bors May 13, 2024
60ed071
Render literal escaping errors in hovers
Veykril May 13, 2024
3e510eb
Don't render multi-line literal values
Veykril May 13, 2024
6e0c33d
Auto merge of #17220 - Veykril:hov-lit, r=Veykril
bors May 13, 2024
490994f
Push macro-parsing error calculation out of fundamental queries
Veykril May 13, 2024
f1aa040
`parse_macro_expansion_error` almost never contains values so `Option…
Veykril May 13, 2024
d891ec6
Auto merge of #17221 - Veykril:lazier-validation, r=Veykril
bors May 13, 2024
fc71d49
Bump Cargo.lock
Veykril May 14, 2024
5fa2b06
Expand macro recursively expands both fp-like and attribute macros in…
Veykril May 14, 2024
b0ecc29
Auto merge of #17224 - Veykril:lock-bump, r=Veykril
bors May 14, 2024
13770a2
Track hashes for file contents
Veykril May 14, 2024
24cd443
Auto merge of #17225 - Veykril:expand-macro-interlocked, r=Veykril
bors May 14, 2024
32827d2
Hash file contents to verify whether file actually changed
Veykril May 14, 2024
e32a0a6
internal: Sort computed runnables
Veykril May 14, 2024
d580944
Auto merge of #17228 - Veykril:stable-runnables-order, r=Veykril
bors May 14, 2024
473b262
Auto merge of #17227 - Veykril:build-deps-changed-hashes, r=Veykril
bors May 14, 2024
652426c
Auto merge of #17216 - Young-Flash:mod_with_path, r=Veykril
bors May 14, 2024
dd0ea02
fix: Don't emit --keep-going for custom build script commands
Veykril May 14, 2024
f915c94
Auto merge of #17232 - Veykril:build-scripts-keep-going, r=Veykril
bors May 14, 2024
4b2998d
Use Swatinem/rust-cache for metrics CI
Veykril May 15, 2024
2e0f2a2
Bump Swatinem/rust-cache
Veykril May 15, 2024
d587884
Auto merge of #17235 - Veykril:metrics-caching, r=Veykril
bors May 15, 2024
9db0b65
Fix metrics workflow not actually updating the toolchain
Veykril May 15, 2024
3864080
Auto merge of #17238 - Veykril:metrics-caching, r=Veykril
bors May 15, 2024
b5fbde7
Key ignoring the job-id in metrics cache
Veykril May 15, 2024
98d768b
Auto merge of #17239 - Veykril:metrics-caching, r=Veykril
bors May 15, 2024
2dca543
Use actions/cache again in metrics CI
Veykril May 15, 2024
f019659
Auto merge of #17240 - Veykril:metrics-caching-fix, r=Veykril
bors May 15, 2024
15983f4
Fix typos
blyxyas May 15, 2024
65dbe8e
Auto merge of #17241 - blyxyas:fix-typos, r=lnicola
bors May 15, 2024
b7e194e
internal: Add StaticLifetime to hir API
Veykril May 16, 2024
5706217
Auto merge of #17243 - Veykril:static-lt-hir, r=Veykril
bors May 16, 2024
9099862
Correct Neovim 0.10 inlay hints config example
adaszko May 17, 2024
143661a
Auto merge of #17250 - adaszko:patch-1, r=lnicola
bors May 18, 2024
2018426
Preparing for merge from rust-lang/rust
lnicola May 19, 2024
6ead205
Merge from rust-lang/rust
lnicola May 19, 2024
c944b01
Bump rustc crates
lnicola May 19, 2024
9f4b651
Auto merge of #17259 - lnicola:sync-from-rust, r=lnicola
bors May 19, 2024
0f4d94a
Add option-ext to RA license exception list
lnicola May 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/tools/rust-analyzer/.git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,10 @@

# prettier format
f247090558c9ba3c551566eae5882b7ca865225f

# subtree syncs
932d85b52946d917deab2c23ead552f7f713b828
3e358a6827d83e8d6473913a5e304734aadfed04
9d2cb42a413e51deb50b36794a2e1605381878fc
f532576ac53ddcc666bc8d59e0b6437065e2f599
c48062fe2ab9a2d913d1985a6b0aec4bf936bfc1
6 changes: 3 additions & 3 deletions src/tools/rust-analyzer/.github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ jobs:
- name: Install Rust toolchain
run: |
rustup update --no-self-update ${{ env.RUST_CHANNEL }}
rustup component add --toolchain ${{ env.RUST_CHANNEL }} rustfmt rust-src
rustup default ${{ env.RUST_CHANNEL }}
rustup component add --toolchain ${{ env.RUST_CHANNEL }} rustfmt rust-src
# https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/rust.json
- name: Install Rust Problem Matcher
if: matrix.os == 'ubuntu-latest'
run: echo "::add-matcher::.github/rust.json"

- name: Cache Dependencies
uses: Swatinem/rust-cache@640a22190e7a783d4c409684cea558f081f92012
uses: Swatinem/rust-cache@9bdad043e88c75890e36ad3bbc8d27f0090dd609
with:
key: ${{ env.RUST_CHANNEL }}

Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
rustup target add ${{ env.targets }} ${{ env.targets_ide }}

- name: Cache Dependencies
uses: Swatinem/rust-cache@640a22190e7a783d4c409684cea558f081f92012
uses: Swatinem/rust-cache@9bdad043e88c75890e36ad3bbc8d27f0090dd609

- name: Check
run: |
Expand Down
39 changes: 11 additions & 28 deletions src/tools/rust-analyzer/.github/workflows/metrics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,21 @@ env:
RUSTUP_MAX_RETRIES: 10

jobs:
setup_cargo:
build_metrics:
if: github.repository == 'rust-lang/rust-analyzer'
runs-on: ubuntu-latest

steps:
- name: Install Rust toolchain
run: |
rustup update --no-self-update stable
rustup component add rustfmt rust-src
rustup default stable
- name: Cache cargo
uses: actions/cache@v4
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
key: ${{ runner.os }}-cargo-${{ github.sha }}
rustup component add --toolchain stable rust-src

build_metrics:
runs-on: ubuntu-latest
needs: setup_cargo

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Restore cargo cache
- name: Cache cargo
uses: actions/cache@v4
with:
path: |
Expand Down Expand Up @@ -69,22 +56,18 @@ jobs:
matrix:
names: [self, ripgrep-13.0.0, webrender-2022, diesel-1.4.8, hyper-0.14.18]
runs-on: ubuntu-latest
needs: [setup_cargo, build_metrics]
needs: build_metrics

steps:
- name: Install Rust toolchain
run: |
rustup update --no-self-update stable
rustup default stable
rustup component add --toolchain stable rust-src

- name: Checkout repository
uses: actions/checkout@v4

- name: Restore cargo cache
uses: actions/cache@v4
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
key: ${{ runner.os }}-cargo-${{ github.sha }}

- name: Restore target cache
uses: actions/cache@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rust-analyzer/.github/workflows/rustdoc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: cargo doc --all --no-deps

- name: Deploy Docs
uses: peaceiris/actions-gh-pages@364c31d33bb99327c77b3a5438a83a357a6729ad # v3.4.0
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: gh-pages
Expand Down
Loading
Loading