Skip to content

Subtree update of rust-analyzer #118817

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 116 commits into from
Dec 12, 2023
Merged

Subtree update of rust-analyzer #118817

merged 116 commits into from
Dec 12, 2023

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Dec 11, 2023

r? @ghost

minestarks and others added 30 commits November 14, 2023 14:39
…bug`.

Because the corresponding `Level` is `DelayedBug` and `span_delayed_bug`
follows the pattern used everywhere else: `span_err`, `span_warning`,
etc.
@Urgau
Copy link
Member

Urgau commented Dec 11, 2023

The job x86_64-gnu-llvm-16 failed! Check out the build log: (web) (plain)

This failure is unrelated to this PR, #118835 will fix it.

@bors
Copy link
Collaborator

bors commented Dec 11, 2023

⌛ Testing commit 3565cec with merge 830316b...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2023
Subtree update of `rust-analyzer`

r? `@ghost`
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Dec 11, 2023

💔 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, 2023
@onur-ozkan
Copy link
Member

onur-ozkan commented Dec 11, 2023

Need (Some(Mode::ToolStd), "rust_analyzer", None) too for

fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
let path = builder.ensure(ToolBuild {
compiler: self.compiler,
target: self.target,
tool: "rust-analyzer-proc-macro-srv",
mode: Mode::ToolStd,
path: "src/tools/rust-analyzer/crates/proc-macro-srv-cli",
extra_features: vec!["sysroot-abi".to_owned()],
is_optional_tool: false,
source_type: SourceType::InTree,
allow_features: RustAnalyzer::ALLOW_FEATURES,
})?;

Update:

RustAnalyzerProcMacroSrv is compiled which then uses rust_analyzer cfg. Adding (Some(Mode::Rustc), "rust_analyzer", None) should fix that.

This seems to be not needed actually. I was wrong. (Some(Mode::ToolStd), "rust_analyzer", None) fixes dist too.

So, we need

    (Some(Mode::ToolRustc), "rust_analyzer", None),
    (Some(Mode::ToolStd), "rust_analyzer", None),

in EXTRA_CHECK_CFGS

@lnicola lnicola force-pushed the sync-from-ra branch 2 times, most recently from 04bc530 to 0cc7233 Compare December 12, 2023 06:07
@lnicola
Copy link
Member Author

lnicola commented Dec 12, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 12, 2023

📌 Commit 0cc7233 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 12, 2023
@rust-log-analyzer

This comment has been minimized.

@lnicola
Copy link
Member Author

lnicola commented Dec 12, 2023

@bors r-

@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 12, 2023
@bors
Copy link
Collaborator

bors commented Dec 12, 2023

📌 Commit ce8d5fb 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 12, 2023
@bors
Copy link
Collaborator

bors commented Dec 12, 2023

⌛ Testing commit ce8d5fb with merge 5b8bc56...

@bors
Copy link
Collaborator

bors commented Dec 12, 2023

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 5b8bc56 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 12, 2023
@bors bors merged commit 5b8bc56 into rust-lang:master Dec 12, 2023
@rustbot rustbot added this to the 1.76.0 milestone Dec 12, 2023
@lnicola lnicola deleted the sync-from-ra branch December 12, 2023 10:22
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (5b8bc56): 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)
4.2% [4.2%, 4.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 672.818s -> 673.595s (0.12%)
Artifact size: 312.29 MiB -> 312.31 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.