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

Use field ident spans directly instead of the full field span in diagnostics on local fields #127431

Merged
merged 1 commit into from
Jul 8, 2024
Merged

Use field ident spans directly instead of the full field span in diagnostics on local fields #127431

merged 1 commit into from
Jul 8, 2024

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jul 6, 2024

This improves diagnostics and avoids having to store the DefIds of fields

@rustbot
Copy link
Collaborator

rustbot commented Jul 6, 2024

r? @michaelwoerister

rustbot has assigned @michaelwoerister.
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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 6, 2024
oli-obk
oli-obk commented Jul 6, 2024
View reviewed changes
compiler/rustc_resolve/src/lib.rs
match def_id.as_local() {
Some(def_id) => self.field_def_ids.get(&def_id).copied(),
None => Some(self.tcx.associated_item_def_ids(def_id)),
Some(def_id) => self.field_names.get(&def_id).cloned(),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of invoking queries at all the field_def_ids call sites, we now have a single clone here. This only ever happens in diagnostics code paths, so it's not perf critical anyway.

@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 7, 2024

📌 Commit 8c2ea71 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 Jul 7, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jul 8, 2024
@jieyouxu
Rollup merge of rust-lang#127431 - oli-obk:feed_item_attrs, r=compile…
4ece021 
…r-errors

Use field ident spans directly instead of the full field span in diagnostics on local fields

This improves diagnostics and avoids having to store the `DefId`s of fields
@jieyouxu jieyouxu mentioned this pull request Jul 8, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 8, 2024
@bors
Auto merge of rust-lang#127475 - jieyouxu:rollup-ayualfk, r=jieyouxu
3700bb5 
Rollup of 12 pull requests

Successful merges:

 - rust-lang#113128 (Support tail calls in mir via `TerminatorKind::TailCall`)
 - rust-lang#126841 ([`macro_metavar_expr_concat`] Add support for literals)
 - rust-lang#126881 (Make `NEVER_TYPE_FALLBACK_FLOWING_INTO_UNSAFE` a deny-by-default lint in edition 2024)
 - rust-lang#126921 (Give VaList its own home)
 - rust-lang#127276 (rustdoc: Remove OpaqueTy)
 - rust-lang#127367 (Run alloc sync tests)
 - rust-lang#127431 (Use field ident spans directly instead of the full field span in diagnostics on local fields)
 - rust-lang#127437 (Uplift trait ref is knowable into `rustc_next_trait_solver`)
 - rust-lang#127439 (Uplift elaboration into `rustc_type_ir`)
 - rust-lang#127451 (Improve `run-make/output-type-permutations` code and improve `filename_not_in_denylist` API)
 - rust-lang#127452 (Fix intrinsic const parameter counting with `effects`)
 - rust-lang#127459 (rustdoc-json: add type/trait alias tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@jieyouxu jieyouxu mentioned this pull request Jul 8, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 8, 2024
@bors
Auto merge of rust-lang#127476 - jieyouxu:rollup-16wyb0b, r=jieyouxu
7fdefb8 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#126841 ([`macro_metavar_expr_concat`] Add support for literals)
 - rust-lang#126881 (Make `NEVER_TYPE_FALLBACK_FLOWING_INTO_UNSAFE` a deny-by-default lint in edition 2024)
 - rust-lang#126921 (Give VaList its own home)
 - rust-lang#127367 (Run alloc sync tests)
 - rust-lang#127431 (Use field ident spans directly instead of the full field span in diagnostics on local fields)
 - rust-lang#127437 (Uplift trait ref is knowable into `rustc_next_trait_solver`)
 - rust-lang#127439 (Uplift elaboration into `rustc_type_ir`)
 - rust-lang#127451 (Improve `run-make/output-type-permutations` code and improve `filename_not_in_denylist` API)
 - rust-lang#127452 (Fix intrinsic const parameter counting with `effects`)
 - rust-lang#127459 (rustdoc-json: add type/trait alias tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bd4ab30 into rust-lang:master Jul 8, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 8, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 8, 2024
@rust-timer
Unrolled build for rust-lang#127431
d0cab42 
Rollup merge of rust-lang#127431 - oli-obk:feed_item_attrs, r=compiler-errors

Use field ident spans directly instead of the full field span in diagnostics on local fields

This improves diagnostics and avoids having to store the `DefId`s of fields
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jul 11, 2024
@bors
Auto merge of rust-lang#127476 - jieyouxu:rollup-16wyb0b, r=jieyouxu
e82cfdc 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#126841 ([`macro_metavar_expr_concat`] Add support for literals)
 - rust-lang#126881 (Make `NEVER_TYPE_FALLBACK_FLOWING_INTO_UNSAFE` a deny-by-default lint in edition 2024)
 - rust-lang#126921 (Give VaList its own home)
 - rust-lang#127367 (Run alloc sync tests)
 - rust-lang#127431 (Use field ident spans directly instead of the full field span in diagnostics on local fields)
 - rust-lang#127437 (Uplift trait ref is knowable into `rustc_next_trait_solver`)
 - rust-lang#127439 (Uplift elaboration into `rustc_type_ir`)
 - rust-lang#127451 (Improve `run-make/output-type-permutations` code and improve `filename_not_in_denylist` API)
 - rust-lang#127452 (Fix intrinsic const parameter counting with `effects`)
 - rust-lang#127459 (rustdoc-json: add type/trait alias tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@oli-obk oli-obk mentioned this pull request Jul 16, 2024
Merged
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 16, 2024
@tgross35
Rollup merge of rust-lang#127816 - oli-obk:misnomer, r=compiler-errors
7d534dd 
Update method name to reflect changes to its internals

forgot to do this in rust-lang#127431
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 16, 2024
@tgross35
Rollup merge of rust-lang#127816 - oli-obk:misnomer, r=compiler-errors
ed73eac 
Update method name to reflect changes to its internals

forgot to do this in rust-lang#127431
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 17, 2024
@rust-timer
Unrolled build for rust-lang#127816
5e03d00 
Rollup merge of rust-lang#127816 - oli-obk:misnomer, r=compiler-errors

Update method name to reflect changes to its internals

forgot to do this in rust-lang#127431
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors approved these changes

Assignees

@compiler-errors compiler-errors

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.
5 participants
@oli-obk @rustbot @compiler-errors @bors @michaelwoerister