Replace some `guess_head_span` with `def_span` #98519

TaKO8Ki · 2022-06-26T03:29:17Z

This patch fixes a part of #97417.
r? @cjgillot

cjgillot · 2022-06-26T11:21:40Z

Thanks @TaKO8Ki.
FYI #93967 attempts to make def_span return something similar to the head_span you computed.
I think that the removal of calls to guess_head_span that you did will still be valid, with a direct call to def_span instead of an additional head_span field. What do you think?

TaKO8Ki · 2022-06-26T11:41:11Z

@cjgillot I agree with you. I will replace head_span() with def_span() after #93967 is merged.

compiler/rustc_hir/src/intravisit.rs

compiler/rustc_trait_selection/src/traits/specialize/mod.rs

compiler/rustc_typeck/src/astconv/mod.rs

compiler/rustc_typeck/src/check/compare_method.rs

TaKO8Ki · 2022-07-04T05:29:05Z

@rustbot ready

cjgillot

Thanks @TaKO8Ki. This looks good.
A few nits then r=me.

compiler/rustc_trait_selection/src/traits/specialize/mod.rs

compiler/rustc_typeck/src/check/method/suggest.rs

compiler/rustc_typeck/src/coherence/mod.rs

cjgillot · 2022-07-04T06:59:36Z

src/test/ui/lint/lint-missing-doc.stderr

@@ -79,8 +79,10 @@ LL | pub enum PubBaz {
 error: missing documentation for a variant
  --> $DIR/lint-missing-doc.rs:119:5
   |
-LL |     PubBazA {
-   |     ^^^^^^^
+LL | /     PubBazA {


This is a regression. It can easily be cured by modifying tcx.hir().opt_span. If you want to do it, this can wait a follow-up PR.

I fixed it.

compiler/rustc_middle/src/hir/map/mod.rs

rustbot · 2022-07-06T01:48:51Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

TaKO8Ki · 2022-07-06T02:35:17Z

@cjgillot I fixed clippy tests. Could you review again?

TaKO8Ki · 2022-07-06T02:37:28Z

@rustbot ready

Dylan-DPC · 2022-07-06T05:38:38Z

@bors r=cjgillot

bors · 2022-07-06T05:38:39Z

📌 Commit bd3bb338b6bcad885d50e14ef02412c24c32bc4a has been approved by cjgillot

bors · 2022-07-06T09:06:23Z

☔ The latest upstream changes (presumably #98206) made this pull request unmergeable. Please resolve the merge conflicts.

TaKO8Ki · 2022-07-06T10:15:36Z

@Dylan-DPC Could you approve again?

cjgillot · 2022-07-06T10:16:37Z

@bors r+

bors · 2022-07-06T10:16:38Z

📌 Commit b730bc9 has been approved by cjgillot

…laumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#96935 (Allow arithmetic and certain bitwise ops on AtomicPtr) - rust-lang#98519 (Replace some `guess_head_span` with `def_span`) - rust-lang#98911 (rustdoc: filter '_ lifetimes from ty::Generics) - rust-lang#98939 (rustdoc: Add more semantic information to impl IDs) - rust-lang#98971 (Fix typo in file descriptor docs) - rust-lang#98983 (docs: Add overview of `rustc_middle::mir::TerminatorKind`) - rust-lang#98984 (Remove erroneous doc comment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…ee1-dead Remove `guess_head_span` follow-up to rust-lang#98519

rust-highfive assigned cjgillot Jun 26, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 26, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 26, 2022

TaKO8Ki force-pushed the add-head-span-field-to-item-and-impl-item branch from 51d1fef to 28bdcf4 Compare June 26, 2022 03:43

This comment has been minimized.

# to view

TaKO8Ki changed the title ~~Add a head_span field to Item, ImplItem and TraitItem~~ [WIP] Add a head_span field to Item, ImplItem and TraitItem Jun 26, 2022

TaKO8Ki changed the title ~~[WIP] Add a head_span field to Item, ImplItem and TraitItem~~ Add a head_span field to Item, ImplItem and TraitItem Jun 26, 2022

TaKO8Ki force-pushed the add-head-span-field-to-item-and-impl-item branch from 319e296 to 0d70331 Compare June 26, 2022 05:53

TaKO8Ki force-pushed the add-head-span-field-to-item-and-impl-item branch from 0d70331 to 1a4ebb7 Compare July 3, 2022 03:28

TaKO8Ki changed the title ~~Add a head_span field to Item, ImplItem and TraitItem~~ Replace some guess_head_span with def_span Jul 3, 2022

cjgillot reviewed Jul 3, 2022

View reviewed changes

cjgillot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 3, 2022

TaKO8Ki force-pushed the add-head-span-field-to-item-and-impl-item branch from 1a4ebb7 to 7973d5b Compare July 4, 2022 02:10

TaKO8Ki changed the title ~~Replace some guess_head_span with def_span~~ Replace guess_head_span with def_span Jul 4, 2022

TaKO8Ki mentioned this pull request Jul 4, 2022

Remove some usages of guess_head_span #98869

Merged

TaKO8Ki changed the title ~~Replace guess_head_span with def_span~~ Replace some guess_head_span with def_span Jul 4, 2022

TaKO8Ki requested a review from cjgillot July 4, 2022 02:32

This comment has been minimized.

# to view

TaKO8Ki force-pushed the add-head-span-field-to-item-and-impl-item branch from 7973d5b to 2c4bdc2 Compare July 4, 2022 03:04

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 4, 2022

cjgillot approved these changes Jul 4, 2022

View reviewed changes

TaKO8Ki force-pushed the add-head-span-field-to-item-and-impl-item branch from 2c4bdc2 to b9d4b13 Compare July 4, 2022 08:25

TaKO8Ki requested a review from cjgillot July 4, 2022 08:30

cjgillot reviewed Jul 4, 2022

View reviewed changes

compiler/rustc_middle/src/hir/map/mod.rs Outdated Show resolved Hide resolved

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 6, 2022

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 6, 2022

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 Jul 6, 2022

TaKO8Ki added 4 commits July 6, 2022 19:09

replace guess_head_span with def_span

83dea35

add Node::Variant to Map::opt_span

3d1b679

use named_span in case of tuple variant

0541b4e

fix miri-opt tests

b730bc9

TaKO8Ki force-pushed the add-head-span-field-to-item-and-impl-item branch from 6bab09c to b730bc9 Compare July 6, 2022 10:14

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 Jul 6, 2022

RalfJung mentioned this pull request Jul 6, 2022

Rollup of 5 pull requests #98970

Merged

GuillaumeGomez mentioned this pull request Jul 6, 2022

Rollup of 7 pull requests #98987

Merged

bors merged commit d712f67 into rust-lang:master Jul 6, 2022

rustbot added this to the 1.64.0 milestone Jul 6, 2022

TaKO8Ki deleted the add-head-span-field-to-item-and-impl-item branch July 7, 2022 00:37

TaKO8Ki mentioned this pull request Jul 31, 2022

Remove guess_head_span #99994

Merged

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 2, 2022

Rollup merge of rust-lang#99994 - TaKO8Ki:remove-guess-head-span, r=f…

17f76a1

…ee1-dead Remove `guess_head_span` follow-up to rust-lang#98519

Replace some guess_head_span with def_span #98519

Replace some guess_head_span with def_span #98519

Uh oh!

Conversation

TaKO8Ki commented Jun 26, 2022

Uh oh!

This comment has been minimized.

This comment has been minimized.

cjgillot commented Jun 26, 2022

Uh oh!

TaKO8Ki commented Jun 26, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

TaKO8Ki commented Jul 4, 2022

Uh oh!

cjgillot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cjgillot Jul 4, 2022

Choose a reason for hiding this comment

Uh oh!

TaKO8Ki Jul 4, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rustbot commented Jul 6, 2022

Uh oh!

TaKO8Ki commented Jul 6, 2022

Uh oh!

TaKO8Ki commented Jul 6, 2022

Uh oh!

Dylan-DPC commented Jul 6, 2022

Uh oh!

bors commented Jul 6, 2022

Uh oh!

bors commented Jul 6, 2022

Uh oh!

TaKO8Ki commented Jul 6, 2022

Uh oh!

cjgillot commented Jul 6, 2022

Uh oh!

bors commented Jul 6, 2022

Uh oh!

Uh oh!

Replace some `guess_head_span` with `def_span` #98519

Replace some `guess_head_span` with `def_span` #98519