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

update rust_analyzer_settings.json #115836

Merged
merged 2 commits into from
Sep 16, 2023
Merged

update rust_analyzer_settings.json #115836

merged 2 commits into from
Sep 16, 2023

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Sep 14, 2023 •
edited
Loading

This works around rust-lang/rust-analyzer#15595, and avoids relying on the unspecified working directory of this command.

@rustbot
Copy link
Collaborator

rustbot commented Sep 14, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 14, 2023
@RalfJung RalfJung mentioned this pull request Sep 14, 2023
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Sep 14, 2023
@lqd
Copy link
Member

lqd commented Sep 14, 2023

There was also #115818

@RalfJung
Copy link
Member Author

Ah, looks like we raced. I took the opportunity to also change procMacro.server, but I'm fine either way -- no strong preference for which PR to land.

@RalfJung RalfJung mentioned this pull request Sep 14, 2023
Closed
@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Sep 15, 2023

📌 Commit 9af39a6 has been approved by compiler-errors

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 Sep 15, 2023
@bors
Copy link
Contributor

bors commented Sep 16, 2023

⌛ Testing commit 9af39a6 with merge 96f3a66...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 16, 2023
@bors
Auto merge of rust-lang#115836 - RalfJung:rust_analyzer_settings.json…
96f3a66 
…, r=compiler-errors

update rust_analyzer_settings.json

This works around rust-lang/rust-analyzer#15595, and avoids relying on the unspecified working directory of this command.
@bors
Copy link
Contributor

bors commented Sep 16, 2023

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 96f3a66 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 16, 2023
@bors
Copy link
Contributor

bors commented Sep 16, 2023

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (96f3a66): 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)		 -3.0% [-3.3%, -2.8%] 2
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: 632.885s -> 631.43s (-0.23%)
Artifact size: 318.13 MiB -> 318.10 MiB (-0.01%)

@compiler-errors
Copy link
Member

@bors retry

@RalfJung
Copy link
Member Author

@bors rollup+

@RalfJung
Copy link
Member Author

@bors rollup

@matthiaskrgr matthiaskrgr mentioned this pull request Sep 16, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 16, 2023
@bors
Auto merge of rust-lang#115900 - matthiaskrgr:rollup-3ba15da, r=matth…
7d9bce3 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#115247 (Document std limitations before/after main)
 - rust-lang#115329 (fix std::primitive doc: homogenous -> homogeneous)
 - rust-lang#115487 (Improve documentation on when signes are printed by default)
 - rust-lang#115560 (Update doc for `alloc::format!` and `core::concat!`)
 - rust-lang#115836 (update rust_analyzer_settings.json)
 - rust-lang#115884 (make ty::Const debug printing less verbose)
 - rust-lang#115890 (Migrate GUI colors test to original CSS color format)
 - rust-lang#115895 (Improve Vec(Deque)::truncate documentation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit edea0d5 into rust-lang:master Sep 16, 2023
11 of 12 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 16, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 16, 2023
@rust-timer
Unrolled build for rust-lang#115836
e0b5514 
Rollup merge of rust-lang#115836 - RalfJung:rust_analyzer_settings.json, r=compiler-errors

update rust_analyzer_settings.json

This works around rust-lang/rust-analyzer#15595, and avoids relying on the unspecified working directory of this command.
@RalfJung RalfJung mentioned this pull request Sep 17, 2023
Open
@RalfJung RalfJung deleted the rust_analyzer_settings.json branch September 19, 2023 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Veykril Veykril Veykril left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

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

Successfully merging this pull request may close these issues.
9 participants
@RalfJung @rustbot @rust-log-analyzer @lqd @compiler-errors @bors @rust-timer @Veykril @Mark-Simulacrum