Skip to content

Subtree update of rust-analyzer#117701

Merged
bors merged 245 commits into
rust-lang:masterfrom
lnicola:sync-from-ra
Nov 14, 2023
Merged

Subtree update of rust-analyzer#117701
bors merged 245 commits into
rust-lang:masterfrom
lnicola:sync-from-ra

Conversation

@lnicola

@lnicola lnicola commented Nov 8, 2023

Copy link
Copy Markdown
Member

RalfJung and others added 30 commits August 21, 2023 10:41
@RalfJung
extend check.overrideCommand and buildScripts.overrideCommand docs re…
940d87b 
…garding invocation strategy and location
@RalfJung
projects/workspaces
2de62be
@vxpm
full function signatures option
23ffda1
@vxpm
better handling of spaces & newlines
6afa5b0
@vxpm
fix & run tests
6b487ed
@rmehri01
feat: initial version of bool_to_enum assist
d7a8e80
@rmehri01
fix: add generated doctest
59738d5
@rmehri01
fix: remove trailing whitespace
83196fd
@rmehri01
fix: initializing struct multiple times
91ac1d6
@rmehri01
fix: only trigger assist on Name
455dacf
@rmehri01
style: rename some locals
136a9db
@rmehri01
feat: support cross module imports
2e13aed
@rmehri01
fix: add checks for overwriting incorrect ancestor
7ba2e13
@alibektas
Deunwrap inline call
5683df2
@alibektas
Deunwrap inline call v2
68d24b6
@alibektas
v3
38491fc
@alibektas
Deunwrap convert_comment_block
9c62571
@alibektas
replace for loops with sth more idiomatic
b316bcc
@alibektas
v2
a66dbd1
@alibektas
v3
2fdf7e4
@rmehri01
feat: add support for other ADT types and destructuring patterns
25b1b3e
@alibektas
Make assist lazy again
0863024
@alibektas
Make assist lazy again
893e191
@alibektas
Deunwrap add_missing_match_arms
145a101
@dfireBird
remove as _ on auto importing on trait that is aliased with _
d794865
@dfireBird
add tests for insert use with renamed imports
df1239b 
Tested for two cases:
1. Simple Use
2. Complex Use
@davidbarsky
fix: ensure rustfmt runs when configured with ./
2974416
@shogo-nakano-desu
refactor: fix clippy lints
ebbbaaa
@shogo-nakano-desu
refactor: remove TODO with no explanation
0bb2298
@shogo-nakano-desu
refactor: fix clippy lint
96c3332
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 14, 2023
@bors
Auto merge of rust-lang#117701 - lnicola:sync-from-ra, r=<try>
88062bf 
Subtree update of `rust-analyzer`

r? `@HKalbasi`
@bors

bors commented Nov 14, 2023

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions
Build commit: 88062bf (88062bf31620eb17643d7d270a3a8c75803750d6)

@onur-ozkan

onur-ozkan commented Nov 14, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

You have to set DIST_TRY_BUILD to 0 in order to build rust-analyzer in try builds. Otherwise it will be skipped like in the build above.

@hkalbasi

hkalbasi commented Nov 14, 2023

Copy link
Copy Markdown
Member

Doesn't work on my machine

Running cargo +nightly build --features in-rust-tree in the src/tools/rust-analyzer works on my machine on the current branch. What error do you get?

@lnicola

lnicola commented Nov 14, 2023

Copy link
Copy Markdown
Member Author

What error do you get?

It's probably unrelated, something about a missing LLVM library.

Do I set DIST_TRY_BUILD=0 in src/ci/github-actions/ci.yml? I'm inclined to r+ it directly.

@lnicola

lnicola commented Nov 14, 2023

Copy link
Copy Markdown
Member Author

@bors retry

@bors

bors commented Nov 14, 2023

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 6ad73f5 with merge f3770ce...

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 14, 2023
@bors
Auto merge of rust-lang#117701 - lnicola:sync-from-ra, r=<try>
f3770ce 
Subtree update of `rust-analyzer`

r? `@HKalbasi`
@lnicola

lnicola commented Nov 14, 2023

Copy link
Copy Markdown
Member Author

@bors cancel

@lnicola

lnicola commented Nov 14, 2023

Copy link
Copy Markdown
Member Author

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 14, 2023
@lnicola

lnicola commented Nov 14, 2023

Copy link
Copy Markdown
Member Author

@bors r=onur-ozkan,HKalbasi

@bors

bors commented Nov 14, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 6ad73f5 has been approved by onur-ozkan,HKalbasi

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 14, 2023
@lnicola

lnicola commented Nov 14, 2023

Copy link
Copy Markdown
Member Author

@bors try-

@bors

bors commented Nov 14, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6ad73f5 with merge 49b27f4...

@onur-ozkan

onur-ozkan commented Nov 14, 2023

Copy link
Copy Markdown
Contributor

Do I set DIST_TRY_BUILD=0 in src/ci/github-actions/ci.yml? I'm inclined to r+ it directly.

You triggered the try build, but try build doesn't check tools with DIST_TRY_BUILD=1 which is defined in the actions file.

@bors

bors commented Nov 14, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: onur-ozkan,HKalbasi
Pushing 49b27f4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 14, 2023
@bors bors merged commit 49b27f4 into rust-lang:master Nov 14, 2023
@rustbot rustbot added this to the 1.76.0 milestone Nov 14, 2023
@lnicola lnicola deleted the sync-from-ra branch November 14, 2023 20:40
@rust-timer

rust-timer commented Nov 14, 2023

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (49b27f4): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Warning ⚠: The following benchmark(s) failed to build:

  • cargo-0.60.0

cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 3.2% [3.1%, 3.3%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 3.2% [3.1%, 3.3%] 2

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 1.2% [1.2%, 1.2%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.3% [-2.7%, -2.0%] 2
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 2.6% [2.1%, 3.2%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.1% [-1.2%, -1.1%] 2
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.8% [-1.2%, 3.2%] 4

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 676.64s -> 673.687s (-0.44%)
Artifact size: 311.08 MiB -> 311.12 MiB (0.01%)

@rustbot rustbot added the perf-regression Performance regression. label Nov 14, 2023
This was referenced Nov 15, 2023
Merged
Closed
@Mark-Simulacrum Mark-Simulacrum removed the perf-regression Performance regression. label Nov 21, 2023
@Mark-Simulacrum

Mark-Simulacrum commented Nov 21, 2023

Copy link
Copy Markdown
Member

Dropping regression label, appears to be noise in the Cargo benchmark (immediately recovered on next commit).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hkalbasi hkalbasi hkalbasi approved these changes

+1 more reviewer

@onur-ozkan onur-ozkan onur-ozkan left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@onur-ozkan onur-ozkan

@hkalbasi hkalbasi

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.76.0

Development

Successfully merging this pull request may close these issues.