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.

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

Make diangostic item naming consistent #89479

Merged
merged 1 commit into from
Oct 3, 2021
Merged

Conversation

camsteffen
Copy link
Contributor

Right now there is about a 50/50 split of naming diagnostic items as vec_type vs Vec. So it is hard to guess a diagnostic item name with confidence. I know it's not great to change these retroactively, but I think it will be much easier to maintain consistency after consistency is established.

@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 3, 2021
@Mark-Simulacrum
Copy link
Member

This seems "ok", I guess. I think it probably affects clippy most (though it looks like you're on the clippy team) but I'll r? @Manishearth

@bors rollup=never (could have perf effects due to changes in the symbol interning map)

@Manishearth
Copy link
Member

I'm happy with such a change on the clippy side, but I'll review when I get the chance

@Manishearth
Copy link
Member

@bors r+ p=1

we should do an early sync after this, perhaps

@bors
Copy link
Contributor

bors commented Oct 3, 2021

📌 Commit eec856b has been approved by Manishearth

@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 Oct 3, 2021
@bors
Copy link
Contributor

bors commented Oct 3, 2021

⌛ Testing commit eec856b with merge 77f1e50...

@bors
Copy link
Contributor

bors commented Oct 3, 2021

☀️ Test successful - checks-actions
Approved by: Manishearth
Pushing 77f1e50 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 3, 2021
@bors bors merged commit 77f1e50 into rust-lang:master Oct 3, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 3, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (77f1e50): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@camsteffen camsteffen deleted the diag-naming branch October 3, 2021 13:46
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 11, 2021
Fix ICE when compiling nightly std/rustc on beta compiler

Fix rust-lang#89775

rust-lang#89479 renames a lot of diagnostic items, but it happens that the beta compiler assumes that there must be DefId with `rustc_diagnostic_item = "send_trait"`, causing an ICE when compiling stage 0 std or stage 1 compiler. So gate it with `cfg(bootstrap)`.

The unwrap is also removed, so that existence of the diagnostic item is not required. I ripgreped the code base and this seems the only place where `unwrap` is called on the return value of `get_diagnostic_item`.
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants