Skip to content

Update IDEs to use rustfmt 2024, fix Zed settings #141062

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
Merged
merged 1 commit into from
May 23, 2025
Merged

Update IDEs to use rustfmt 2024, fix Zed settings #141062

merged 1 commit into from
May 23, 2025
+10 −6

Conversation

ChaiTRex
Copy link
Contributor

@ChaiTRex ChaiTRex commented May 16, 2025 •
edited
Loading

Update IDEs to use rustfmt 2024, fix Zed settings

  • Update IDE rust-analyzer settings to use 2024 rather than 2021.
  • Fix Zed settings by removing ${workspaceFolder}/ from paths.

@rustbot
Copy link
Collaborator

rustbot commented May 16, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 May 16, 2025
@ChaiTRex
Copy link
Contributor Author

Found a bug in the Zed IDE settings that prevents autoformatting. Will push in a few moments.

@ChaiTRex
Update IDEs to use rustfmt 2024, fix Zed settings
a6bf524 
- Update IDE `rust-analyzer` settings to use 2024 rather than 2021.
- Fix Zed settings by removing `${workspaceFolder}/` from paths.
@ChaiTRex ChaiTRex changed the title Update IDE rust-analyzer settings to rustfmt 2024 Update IDEs to use rustfmt 2024, fix Zed settings May 16, 2025
@ChaiTRex
Copy link
Contributor Author

OK, fixed.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 23, 2025

📌 Commit a6bf524 has been approved by Mark-Simulacrum

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 May 23, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 23, 2025
@matthiaskrgr
Rollup merge of rust-lang#141062 - ChaiTRex:ide_fmt_2024, r=Mark-Simu…
040d806 
…lacrum

Update IDEs to use rustfmt 2024, fix Zed settings

Update IDEs to use rustfmt 2024, fix Zed settings

- Update IDE `rust-analyzer` settings to use 2024 rather than 2021.
- Fix Zed settings by removing `${workspaceFolder}/` from paths.
@matthiaskrgr matthiaskrgr mentioned this pull request May 23, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 23, 2025
@bors
Auto merge of rust-lang#141420 - matthiaskrgr:rollup-ftvwt8j, r=matth…
3b566b5 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#136400 (Improve handling of rustdoc lints when used with raw doc fragments.)
 - rust-lang#140967 (Async drop poll shim for error dropee generates noop body)
 - rust-lang#141019 (Update std doctests for android)
 - rust-lang#141062 (Update IDEs to use rustfmt 2024, fix Zed settings)
 - rust-lang#141109 (discuss deadlocks in the std::io::pipe() example)
 - rust-lang#141126 (rustdoc JSON: Don't apply `#[repr]` privacy heuristics)
 - rust-lang#141376 (Rename `kw::Empty` as `sym::empty`.)
 - rust-lang#141383 (Miri subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
@Kobzol
Copy link
Contributor

Kobzol commented May 23, 2025

@bors p=101

Congratulations, this PR won the lottery and it will jump ahead in the queue to try auto builds running on rust-lang/rust (we're migrating off the rust-lang-ci/rust repository).

@Kobzol
Copy link
Contributor

Kobzol commented May 23, 2025

@bors r=Mark-Simulacrum

Trying to get homu to refresh this PR.

@bors
Copy link
Collaborator

bors commented May 23, 2025

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented May 23, 2025

📌 Commit a6bf524 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented May 23, 2025

⌛ Testing commit a6bf524 with merge 163cb4e...

@bors
Copy link
Collaborator

bors commented May 23, 2025

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 163cb4e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 23, 2025
@bors bors merged commit 163cb4e into rust-lang:master May 23, 2025
7 checks passed
@rustbot rustbot added this to the 1.89.0 milestone May 23, 2025
@github-actions GitHub Actions
Copy link

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 52bf0cf (parent) -> 163cb4e (this PR)

Test differences

No test diffs found

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 163cb4ea3f0ae3bc7921cc259a08a7bf92e73ee6 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-apple-1: 6400.5s -> 10951.4s (71.1%)
  2. dist-aarch64-linux: 7825.4s -> 5615.4s (-28.2%)
  3. dist-apple-various: 7002.1s -> 5421.2s (-22.6%)
  4. dist-aarch64-apple: 5338.5s -> 6107.0s (14.4%)
  5. dist-aarch64-msvc: 9669.4s -> 8661.0s (-10.4%)
  6. dist-x86_64-apple: 9675.2s -> 8739.4s (-9.7%)
  7. i686-gnu-nopt-1: 8337.2s -> 9113.2s (9.3%)
  8. mingw-check: 1240.0s -> 1349.7s (8.8%)
  9. x86_64-rust-for-linux: 2772.6s -> 2531.8s (-8.7%)
  10. x86_64-gnu-llvm-19-3: 6873.7s -> 7386.2s (7.5%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (163cb4e): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary 2.4%, secondary -4.5%)

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)		 4.4% [1.9%, 6.8%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.5% [-1.5%, -1.5%] 1
Improvements ✅
(secondary)		 -4.5% [-7.0%, -2.0%] 2
All ❌✅ (primary) 2.4% [-1.5%, 6.8%] 3

Cycles

Results (secondary 2.2%)

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)		 2.2% [2.1%, 2.4%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 777.568s -> 776.992s (-0.07%)
Artifact size: 365.56 MiB -> 365.49 MiB (-0.02%)

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

Successfully merging this pull request may close these issues.
6 participants
@ChaiTRex @rustbot @Mark-Simulacrum @bors @Kobzol @rust-timer