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 #119542

Merged
merged 150 commits into from
Jan 4, 2024
Merged

Subtree update of rust-analyzer #119542

merged 150 commits into from
Jan 4, 2024

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Jan 3, 2024

r? ghost

ClSlaid and others added 30 commits December 4, 2023 21:08
@ClSlaid
feat: add proc-macro rebuild on save option
b21d68c 
Signed-off-by: ClSlaid <cailue@bupt.edu.cn>
@ClSlaid
patch: only rerun build scripts when saved.
ad27b6e 
Signed-off-by: 蔡略 <cailue@bupt.edu.cn>
@dfireBird
Make callable fields not complete in method access no parens case
7089eb8
@davidbarsky
fix: Correct references from rust-analyzer.cargo.check to `rust-ana…
f556c79 
…lyzer.check`
@roife
fix: fix 'introduce_named_generic' for impl inside types
63d2f35
@riverbl
Don't trim trailing whitespace from doc comments
99b30ba 
Don't trim trailing whitespace from doc comments as multiple trailing spaces indicates a hard line break in Markdown.
@DropDemBits
Migrate extract_variable to mutable ast
1e1761e
@DropDemBits
Migrate generate_function to mutable ast
3162699
@DropDemBits
Migrate replace_is_method_with_if_let_method to mutable ast
c486637
@DropDemBits
Update various_resolve_strategies test
1506435 
The weird disjoint `Indel`s are likely an artifact of the tree diffing
algorithm we use.
@GuillaumeGomez
Update rust-analyzer to support new injected_env_var function
6adb21a
@LuisFerLCC
VSCode rust-panic problem matcher
7251b86
@LuisFerLCC
Formatting
0542723
@roife
fix: rewrite code_action generate_delegate_trait
59aa791
@roife
fix: testcases in generate_delegate_trait
5070534
@roife
fix: self type replacement in inline-function
3449222
@roife
fix: self type replacement with macros
38b5dcb
@unexge
Complete exported macros in #[macro_use($0)]
b986d8a
@unexge
Add missing docs string
0e49024
@unexge
Go to definition for macros in #[macro_use(...)]
3b8801c
@bors
Auto merge of rust-lang#118830 - GuillaumeGomez:env-tracked_env, r=Ni…
cac74d9 
…lstrieb

Add support for `--env` on `tracked_env::var`

Follow-up of rust-lang#118368.
Part of Part of rust-lang#80792.

It adds support of the `--env` option for proc-macros through `tracked_env::var`.

r? `@Nilstrieb`
@jimmyhmiller
Make functions in impl have a container name
b67b352 
fixes rust-lang#16015
@lnicola
Merge commit '21b06c1beb9bb59369ffd652f5d617bcf6952e05' into sync-fro…
e37cf75 
…m-ra
@Veykril
internal: Move proc-macro knowledge out of base-db
3562030
@lnicola
Merge branch 'master' into sync-from-rust
e628f17
@bors
Auto merge of rust-lang#16144 - lnicola:sync-from-rust, r=lnicola
9a82f8c 
internal: sync from downstream
@bors
Auto merge of rust-lang#16143 - Veykril:base-db-no-proc-macros, r=lni…
cfc959d 
…cola

internal: Move proc-macro knowledge out of base-db into hir-expand

It does not make much sense to me to have that live in base-db, additionally, it kind of conflicts with moving span things out into a separate crate
@Veykril
internal: Split out a span crate
66e29be
@Veykril
Move the SpanMap definition into the span crate
ec61623
@bors
Auto merge of rust-lang#16145 - Veykril:span-crate, r=Veykril
0380869 
internal: Split out a span crate

Allows getting rid of some of the dependency injection generics that my rewrite introduced
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jan 3, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jan 3, 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 Jan 3, 2024

@bors r+ p=5 late subtree sync

@bors
Copy link
Contributor

bors commented Jan 3, 2024

📌 Commit b91d1c0 has been approved by lnicola

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 3, 2024

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Jan 3, 2024
@lnicola lnicola mentioned this pull request Jan 3, 2024
Closed
@bors
Copy link
Contributor

bors commented Jan 3, 2024

⌛ Testing commit b91d1c0 with merge af04450...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 3, 2024
@bors
Auto merge of rust-lang#119542 - lnicola:sync-from-ra2, r=lnicola
af04450 
Subtree update of `rust-analyzer`

r? ghost
@bors
Copy link
Contributor

bors commented Jan 4, 2024

💥 Test timed out

@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 Jan 4, 2024
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@lnicola
Copy link
Member Author

lnicola commented Jan 4, 2024

@bors retry apple runner quit

@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 Jan 4, 2024
@bors
Copy link
Contributor

bors commented Jan 4, 2024

⌛ Testing commit b91d1c0 with merge 090d5ea...

@bors
Copy link
Contributor

bors commented Jan 4, 2024

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 090d5ea to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 4, 2024
@bors bors merged commit 090d5ea into rust-lang:master Jan 4, 2024
12 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Jan 4, 2024
@lnicola lnicola deleted the sync-from-ra2 branch January 4, 2024 09:21
@bors bors mentioned this pull request Jan 4, 2024
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (090d5ea): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.7% [-0.7%, -0.7%] 1
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)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.4% [-3.4%, -3.4%] 1
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 672.621s -> 670.05s (-0.38%)
Artifact size: 311.84 MiB -> 311.83 MiB (-0.00%)

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
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.77.0
Development

Successfully merging this pull request may close these issues.