Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Subtree update of rust-analyzer #134170

Merged
merged 152 commits into from
Dec 11, 2024
Merged

Subtree update of rust-analyzer #134170

merged 152 commits into from
Dec 11, 2024

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Dec 11, 2024

r? @ghost

ChayimFriedman2 and others added 30 commits November 25, 2024 14:52
@ChayimFriedman2
Fix a bug when synthetic AST node were searched in the AST ID map and…
95bf875 
… caused panics
@ShoyuVanilla
Migrate add_turbo_fish to SyntaxEditor
f091ec6
Add macro expansion test for raw variable names
c876903
@alibektas
Revert rust-lang#18197
4866fb4 
Our first attempt to make flycheck only check the current crate
if the crate is one of bin/bench/test targets had caused
`check_workspace` to be ignored, which should have been a config
with higher precedence all along. This commit revert rust-lang#18197 and closes rust-lang#18562
@alibektas
Remove target.is_some() to handle it later inside ra::flycheck
c33c951
@lnicola
Preparing for merge from rust-lang/rust
f3d83ba
@lnicola
Merge from rust-lang/rust
ad6e993
@lnicola
Merge pull request rust-lang#18567 from lnicola/sync-from-rust
0d2b785 
minor: fix proc macro test
@compiler-errors
Remove redundant associated type bounds from dyn
fb662a2
@lnicola
Merge pull request rust-lang#18577 from compiler-errors/redundant-dyn…
b747197 
…-atb

Remove redundant associated type bounds from `dyn TypeFolder`
@Veykril
Fix debug configuration querying not inheriting environment
5a52142
@Veykril
Merge pull request rust-lang#18586 from Veykril/push-kolxkxyntxtt
0946570 
fix: Fix debug configuration querying not inheriting environment
@Veykril
fix: Fix syntax fixup inserting unnecessary semicolons
03ae70d
@Veykril
Merge pull request rust-lang#18587 from Veykril/push-urrlrursyrws
54a1a96 
fix: Fix syntax fixup inserting unnecessary semicolons
@Veykril
Merge pull request rust-lang#18561 from markmurphydev/macro_name_raw_…
86387c8 
…variable

Add macro expansion test for raw variable names
@SomeoneToIgnore
Advertise completions and inlay hints resolve server capabilities bas…
aede6e1 
…ed on the client capabilities.
@Veykril
Merge pull request rust-lang#18589 from SomeoneToIgnore/proper-resolv…
f555fc4 
…e-advertisement

Advertise completions and inlay hints resolve server capabilities based on the client capabilities
@darichey
Only show status bar item in relevant files
97feb03
@Veykril
Merge pull request rust-lang#18592 from darichey/status-bar-visibility
f4c968a 
vscode: Only show status bar item in relevant files
@Veykril
Merge pull request rust-lang#18555 from ChayimFriedman2/issue-17321
fef7ca0 
fix: Fix a bug when synthetic AST node were searched in the AST ID map and caused panics
@ChayimFriedman2
Support AsyncFnX traits
879312e 
Only in calls, because to support them in bounds we need support from Chalk. However we don't yet report error from bounds anyway, so this is less severe.

The returned future is shown in its name within inlay hints instead of as a nicer `impl Future`, but that can wait for another PR.
@tareknaser
internal: Make exclude characters for typing assists configurable, de…
b94c535 
…fault to None

Signed-off-by: Tarek <tareknaser360@gmail.com>
@tareknaser
chore: deprecate typing.autoClosingAngleBrackets configuration
68cd579 
Signed-off-by: Tarek <tareknaser360@gmail.com>
Remove references to platform-intrinsic ABI
337725d
@ChayimFriedman2
Fixed another bug with glob imports
bc00304 
When a glob import overriding the visibility of a previous glob import was not properly resolved when the items are only available in the next fixpoint iteration.

The bug was hidden until rust-lang#18390.
@ChayimFriedman2
Improve soundness a bit by making TaggedArcPtr::try_as_arc_owned() …
0d328a8 
…unsafe

Since the `ManuallyDrop` it returns can be safely used to consume the `Arc`, which is can cause UB if done incorrectly. See rust-lang#18499.
@ChayimFriedman2
Fix shadowing of record enum variant in patterns
45f0e81
@lnicola
Merge pull request rust-lang#18606 from ChayimFriedman2/improve-sound…
01870ba 
…ness-just-a-bit

minor: Improve soundness a bit by making `TaggedArcPtr::try_as_arc_owned()` unsafe
@lnicola
Merge pull request rust-lang#18607 from ChayimFriedman2/pattern-recor…
941616e 
…d-no-record

fix: Fix shadowing of record enum variant in patterns
@lnicola
Merge pull request rust-lang#18595 from markmurphydev/remove_platform…
272aeca 
…_intrinsic

Remove references to platform-intrinsic ABI
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 11, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 11, 2024

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

@lnicola
Copy link
Member Author

lnicola commented Dec 11, 2024

@bors r+ p=1 subtree sync

@bors
Copy link
Contributor

bors commented Dec 11, 2024

📌 Commit a18e38e has been approved by lnicola

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 11, 2024
@bors
Copy link
Contributor

bors commented Dec 11, 2024

⌛ Testing commit a18e38e with merge 3feef04...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2024
@bors
Auto merge of rust-lang#134170 - lnicola:sync-from-ra, r=lnicola
3feef04 
Subtree update of `rust-analyzer`

r? `@ghost`
@rust-log-analyzer
Copy link
Collaborator

The job i686-mingw failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
   Compiling rustc_driver v0.0.0 (C:\a\rust\rust\compiler\rustc_driver)
[RUSTC-TIMING] rustc_driver test:false 27.865
error: linking with `i686-w64-mingw32-gcc` failed: exit code: 1
  |
  = note: "i686-w64-mingw32-gcc" "-fno-use-linker-plugin" "-Wl,--dynamicbase" "-Wl,--disable-auto-image-base" "-Wl,--large-address-aware" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage1\\lib\\rustlib\\i686-pc-windows-gnu\\lib\\rsbegin.o" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\symbols.o" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage1-rustc\\i686-pc-windows-gnu\\release\\deps\\rustc_main-659084248a5844d9.rustc_main.1eb8528bcf7a842a-cgu.0.rcgu.o" "-Wl,-Bdynamic" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage1-rustc\\i686-pc-windows-gnu\\release\\deps\\rustc_driver-feab0383960d185a.dll" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage1\\lib\\rustlib\\i686-pc-windows-gnu\\lib\\std-85e8e1afc0a1e2c0.dll" "-Wl,-Bstatic" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage1\\lib\\rustlib\\i686-pc-windows-gnu\\lib\\libcompiler_builtins-d77c9d76f065957b.rlib" "-Wl,-Bdynamic" "-lpsapi" "-lshell32" "-lole32" "-luuid" "-ladvapi32" "-lws2_32" "-lntdll" "-lkernel32" "-ladvapi32" "-lole32" "-loleaut32" "-ladvapi32" "-lcfgmgr32" "-lgdi32" "-lkernel32" "-lmsimg32" "-lopengl32" "-luser32" "-lwinspool" "-lbcrypt" "-ladvapi32" "-lkernel32" "-lkernel32" "-ladvapi32" "-lntdll" "-luserenv" "-lws2_32" "-ldbghelp" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\advapi32.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-errorhandling-l1-1-3.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-file-fromapp-l1-1-0.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-handle-l1-1-0.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-ioring-l1-1-0.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-memory-l1-1-3.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-memory-l1-1-4.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-memory-l1-1-5.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-memory-l1-1-6.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-memory-l1-1-7.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-memory-l1-1-8.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-synch-l1-2-0.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-sysinfo-l1-2-0.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-sysinfo-l1-2-3.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-sysinfo-l1-2-4.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-sysinfo-l1-2-6.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-util-l1-1-1.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-winrt-error-l1-1-0.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-winrt-l1-1-0.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-core-wow64-l1-1-1.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\api-ms-win-security-base-l1-2-2.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\avrt.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\bcp47mrm.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\bcryptprimitives.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\clfsw32.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\dbghelp.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\elscore.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\gdi32.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\icu.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\imagehlp.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\kernel32.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\ktmw32.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\netapi32.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\normaliz.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\ntdll.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\ntdllk.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\ole32.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\oleacc.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\oleaut32.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\propsys.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\psapi.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\rtworkq.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\txfw32.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\user32.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\usp10.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\version.dll_imports_indirect.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMCJzev\\wofutil.dll_imports_indirect.lib" "-lgcc_s" "-lmsvcrt" "-lmingwex" "-lmingw32" "-lgcc" "-lmsvcrt" "-lmingwex" "-luser32" "-lkernel32" "-Wl,--nxcompat" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage1-rustc\\i686-pc-windows-gnu\\release\\build\\stacker-d3f5f2020a9db92d\\out" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage1-rustc\\i686-pc-windows-gnu\\release\\build\\psm-a8e1851838120981\\out" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage1-rustc\\i686-pc-windows-gnu\\release\\build\\blake3-0d7379973d66d445\\out" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage1-rustc\\i686-pc-windows-gnu\\release\\build\\rustc_llvm-9c1d12dc9076cada\\out" "-L" "C:/a/rust/rust/build/i686-pc-windows-gnu/llvm/lib" "-L" "C:/a/rust/rust/mingw32/bin/../lib/gcc/i686-w64-mingw32/14.1.0" "-o" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage1-rustc\\i686-pc-windows-gnu\\release\\deps\\rustc_main-659084248a5844d9.exe" "-Wl,--gc-sections" "-no-pie" "-Wl,-O1" "-nodefaultlibs" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage1\\lib\\rustlib\\i686-pc-windows-gnu\\lib\\rsend.o"
  = note: C:/a/rust/rust/mingw32/bin/../lib/gcc/i686-w64-mingw32/14.1.0/../../../../i686-w64-mingw32/bin/ld.exe: cannot open output file C:\a\rust\rust\build\i686-pc-windows-gnu\stage1-rustc\i686-pc-windows-gnu\release\deps\rustc_main-659084248a5844d9.exe: Invalid argument␍
          collect2.exe: error: ld returned 1 exit status

[RUSTC-TIMING] rustc_main test:false 3.876
error: could not compile `rustc-main` (bin "rustc-main") due to 1 previous error
Build completed unsuccessfully in 0:33:19

@bors
Copy link
Contributor

bors commented Dec 11, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 11, 2024
@lnicola
Copy link
Member Author

lnicola commented Dec 11, 2024

@bors retry spurious ld.exe failure?

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 11, 2024
@fmease fmease added the CI-spurious-fail-mingw CI spurious failure: target env mingw label Dec 11, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 11, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2024
@bors
Auto merge of rust-lang#134177 - matthiaskrgr:rollup-hgp8q60, r=matth…
21fe748 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#132975 (De-duplicate and improve definition of core::ffi::c_char)
 - rust-lang#133598 (Change `GetManyMutError` to match T-libs-api decision)
 - rust-lang#134148 (add comments in check_expr_field)
 - rust-lang#134163 (coverage: Rearrange the code for embedding per-function coverage metadata)
 - rust-lang#134165 (wasm(32|64): update alignment string)
 - rust-lang#134170 (Subtree update of `rust-analyzer`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 531e578 into rust-lang:master Dec 11, 2024
6 of 7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 11, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2024
@rust-timer
Unrolled build for rust-lang#134170
3e56e3c 
Rollup merge of rust-lang#134170 - lnicola:sync-from-ra, r=lnicola

Subtree update of `rust-analyzer`

r? `@ghost`
@bors
Copy link
Contributor

bors commented Dec 11, 2024

⌛ Testing commit a18e38e with merge 21fe748...

@lnicola lnicola deleted the sync-from-ra branch December 11, 2024 21:59
@tgross35 tgross35 mentioned this pull request Dec 12, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
CI-spurious-fail-mingw CI spurious failure: target env mingw S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.