Use statement span for statement scope

Aaron1011 · Aaron1011 · commit daa5a9bb3002 · 2021-08-12T19:42:18.000-05:00
diff --git a/compiler/rustc_middle/src/hir/map/mod.rs b/compiler/rustc_middle/src/hir/map/mod.rs
@@ -818,6 +818,22 @@ impl<'hir> Map<'hir> {
         self.tcx.hir_attrs(id.owner).get(id.local_id)
     }
 
+    pub fn stmt_span(&self, hir_id: HirId) -> Span {
+        match self.find(hir_id).unwrap() {
+            Node::Local(_) | Node::Item(_) | Node::Expr(_) => {
+                if let Some(Node::Block(block)) = self.find(self.get_parent_node(hir_id)) {
+                    for stmt in block.stmts {
+                        if stmt.kind.hir_id() == hir_id {
+                            return stmt.span;
+                        }
+                    }
+                }
+            }
+            _ => {}
+        }
+        self.span(hir_id)
+    }
+
     /// Gets the span of the definition of the specified HIR node.
     /// This is used by `tcx.get_span`
     pub fn span(&self, hir_id: HirId) -> Span {
diff --git a/compiler/rustc_middle/src/middle/region.rs b/compiler/rustc_middle/src/middle/region.rs
@@ -175,7 +175,12 @@ impl Scope {
             Some(hir_id) => hir_id,
             None => return DUMMY_SP,
         };
-        let span = tcx.hir().span(hir_id);
+        let span = if self.for_stmt {
+            tcx.hir().stmt_span(hir_id)
+        } else {
+            tcx.hir().span(hir_id)
+        };
+
         if let ScopeData::Remainder(first_statement_index) = self.data {
             if let Node::Block(ref blk) = tcx.hir().get(hir_id) {
                 // Want span for scope starting after the
diff --git a/src/test/ui/async-await/issue-70935-complex-spans.stderr b/src/test/ui/async-await/issue-70935-complex-spans.stderr
@@ -13,10 +13,10 @@ LL | |             foo(tx.clone());
 LL | |         }).await;
    | |________________^ first, await occurs here, with the value maybe used later...
 note: the value is later dropped here
-  --> $DIR/issue-70935-complex-spans.rs:15:16
+  --> $DIR/issue-70935-complex-spans.rs:15:17
    |
 LL |         }).await;
-   |                ^
+   |                 ^
 note: this has type `[closure@$DIR/issue-70935-complex-spans.rs:13:13: 15:10]` which is not `Send`
   --> $DIR/issue-70935-complex-spans.rs:13:13
    |
diff --git a/src/test/ui/async-await/issues/issue-65436-raw-ptr-not-send.stderr b/src/test/ui/async-await/issues/issue-65436-raw-ptr-not-send.stderr
@@ -14,10 +14,10 @@ note: future is not `Send` as this value is used across an await
 LL |         bar(Foo(std::ptr::null())).await;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ first, await occurs here, with `std::ptr::null()` maybe used later...
 note: `std::ptr::null()` is later dropped here
-  --> $DIR/issue-65436-raw-ptr-not-send.rs:14:40
+  --> $DIR/issue-65436-raw-ptr-not-send.rs:14:41
    |
 LL |         bar(Foo(std::ptr::null())).await;
-   |                 ----------------       ^
+   |                 ----------------        ^
    |                 |
    |                 has type `*const u8` which is not `Send`
 help: consider moving this into a `let` binding to create a shorter lived borrow
diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr
@@ -2,7 +2,7 @@ error[E0716]: temporary value dropped while borrowed
   --> $DIR/borrowck-borrowed-uniq-rvalue.rs:10:28
    |
 LL |     buggy_map.insert(42, &*Box::new(1));
-   |                            ^^^^^^^^^^^- temporary value is freed at the end of this statement
+   |                            ^^^^^^^^^^^ - temporary value is freed at the end of this statement
    |                            |
    |                            creates a temporary which is freed while still in use
 ...
diff --git a/src/test/ui/borrowck/issue-17545.stderr b/src/test/ui/borrowck/issue-17545.stderr
@@ -7,9 +7,8 @@ LL | /     bar.call((
 LL | |         &id(()),
    | |          ^^^^^^ creates a temporary which is freed while still in use
 LL | |     ));
-   | |      -
-   | |      |
-   | |______temporary value is freed at the end of this statement
+   | |      -- temporary value is freed at the end of this statement
+   | |______|
    |        argument requires that borrow lasts for `'a`
 
 error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-47646.stderr b/src/test/ui/issues/issue-47646.stderr
@@ -11,7 +11,7 @@ LL |             println!("{:?}", heap);
    |                              ^^^^ immutable borrow occurs here
 ...
 LL |     };
-   |     - ... and the mutable borrow might be used here, when that temporary is dropped and runs the destructor for type `(Option<PeekMut<'_, i32>>, ())`
+   |      - ... and the mutable borrow might be used here, when that temporary is dropped and runs the destructor for type `(Option<PeekMut<'_, i32>>, ())`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/nll/issue-54382-use-span-of-tail-of-block.stderr b/src/test/ui/nll/issue-54382-use-span-of-tail-of-block.stderr
@@ -8,10 +8,10 @@ LL |             D("other").next(&_thing1)
    |             a temporary with access to the borrow is created here ...
 ...
 LL |     }
-   |     -
-   |     |
-   |     `_thing1` dropped here while still borrowed
-   |     ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
+   |     - `_thing1` dropped here while still borrowed
+LL | 
+LL |     ;
+   |     - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
    |
 help: consider adding semicolon after the expression so its temporaries are dropped sooner, before the local variables declared by the block are dropped
    |
diff --git a/src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr b/src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr
@@ -7,10 +7,10 @@ LL |         D(&_thing1).end()
    |         | borrowed value does not live long enough
    |         a temporary with access to the borrow is created here ...
 LL |     }
-   |     -
-   |     |
-   |     `_thing1` dropped here while still borrowed
-   |     ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
+   |     - `_thing1` dropped here while still borrowed
+LL | 
+LL |     ;
+   |     - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
    |
 help: consider adding semicolon after the expression so its temporaries are dropped sooner, before the local variables declared by the block are dropped
    |
diff --git a/src/test/ui/nll/issue-54556-used-vs-unused-tails.stderr b/src/test/ui/nll/issue-54556-used-vs-unused-tails.stderr
@@ -2,10 +2,9 @@ error[E0597]: `_t1` does not live long enough
   --> $DIR/issue-54556-used-vs-unused-tails.rs:10:55
    |
 LL |     {              let mut _t1 = D(Box::new("t1")); D(&_t1).end()    } ; // suggest `;`
-   |                                                     --^^^^-          -
+   |                                                     --^^^^-          - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
    |                                                     | |              |
    |                                                     | |              `_t1` dropped here while still borrowed
-   |                                                     | |              ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
    |                                                     | borrowed value does not live long enough
    |                                                     a temporary with access to the borrow is created here ...
    |
@@ -18,7 +17,7 @@ error[E0597]: `_t1` does not live long enough
   --> $DIR/issue-54556-used-vs-unused-tails.rs:13:55
    |
 LL |     {            { let mut _t1 = D(Box::new("t1")); D(&_t1).end() }  } ; // suggest `;`
-   |                                                     --^^^^-       -  - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
+   |                                                     --^^^^-       -    - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
    |                                                     | |           |
    |                                                     | |           `_t1` dropped here while still borrowed
    |                                                     | borrowed value does not live long enough
@@ -33,10 +32,9 @@ error[E0597]: `_t1` does not live long enough
   --> $DIR/issue-54556-used-vs-unused-tails.rs:16:55
    |
 LL |     {            { let mut _t1 = D(Box::new("t1")); D(&_t1).end() }; }   // suggest `;`
-   |                                                     --^^^^-       -
+   |                                                     --^^^^-       -- ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
    |                                                     | |           |
    |                                                     | |           `_t1` dropped here while still borrowed
-   |                                                     | |           ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
    |                                                     | borrowed value does not live long enough
    |                                                     a temporary with access to the borrow is created here ...
    |
@@ -96,10 +94,9 @@ error[E0597]: `_t1` does not live long enough
   --> $DIR/issue-54556-used-vs-unused-tails.rs:30:55
    |
 LL |     _y =         { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } ; // `let x = ...; x`
-   |                                                     --^^^^-       -
+   |                                                     --^^^^-       - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
    |                                                     | |           |
    |                                                     | |           `_t1` dropped here while still borrowed
-   |                                                     | |           ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
    |                                                     | borrowed value does not live long enough
    |                                                     a temporary with access to the borrow is created here ...
    |
diff --git a/src/test/ui/regions/regions-var-type-out-of-scope.stderr b/src/test/ui/regions/regions-var-type-out-of-scope.stderr
@@ -2,9 +2,8 @@ error[E0716]: temporary value dropped while borrowed
   --> $DIR/regions-var-type-out-of-scope.rs:9:14
    |
 LL |         x = &id(3);
-   |              ^^^^-
-   |              |   |
-   |              |   temporary value is freed at the end of this statement
+   |              ^^^^^- temporary value is freed at the end of this statement
+   |              |
    |              creates a temporary which is freed while still in use
 LL |         assert_eq!(*x, 3);
    |         ------------------ borrow later used here
diff --git a/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr b/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr
@@ -14,7 +14,7 @@ error[E0716]: temporary value dropped while borrowed
   --> $DIR/borrowck-let-suggestion-suffixes.rs:19:14
    |
 LL |     v3.push(&id('x'));           // statement 6
-   |              ^^^^^^^- temporary value is freed at the end of this statement
+   |              ^^^^^^^ - temporary value is freed at the end of this statement
    |              |
    |              creates a temporary which is freed while still in use
 ...
@@ -27,7 +27,7 @@ error[E0716]: temporary value dropped while borrowed
   --> $DIR/borrowck-let-suggestion-suffixes.rs:29:18
    |
 LL |         v4.push(&id('y'));
-   |                  ^^^^^^^- temporary value is freed at the end of this statement
+   |                  ^^^^^^^ - temporary value is freed at the end of this statement
    |                  |
    |                  creates a temporary which is freed while still in use
 ...
@@ -40,7 +40,7 @@ error[E0716]: temporary value dropped while borrowed
   --> $DIR/borrowck-let-suggestion-suffixes.rs:40:14
    |
 LL |     v5.push(&id('z'));
-   |              ^^^^^^^- temporary value is freed at the end of this statement
+   |              ^^^^^^^ - temporary value is freed at the end of this statement
    |              |
    |              creates a temporary which is freed while still in use
 ...
diff --git a/src/test/ui/static/static-reference-to-fn-2.stderr b/src/test/ui/static/static-reference-to-fn-2.stderr
@@ -4,9 +4,8 @@ error[E0716]: temporary value dropped while borrowed
 LL | fn state1(self_: &mut StateMachineIter) -> Option<&'static str> {
    |           ----- has type `&mut StateMachineIter<'1>`
 LL |     self_.statefn = &id(state2 as StateMachineFunc);
-   |     -----------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
-   |     |                |                            |
-   |     |                |                            temporary value is freed at the end of this statement
+   |     -----------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value is freed at the end of this statement
+   |     |                |
    |     |                creates a temporary which is freed while still in use
    |     assignment requires that borrow lasts for `'1`
 
@@ -16,9 +15,8 @@ error[E0716]: temporary value dropped while borrowed
 LL | fn state2(self_: &mut StateMachineIter) -> Option<(&'static str)> {
    |           ----- has type `&mut StateMachineIter<'1>`
 LL |     self_.statefn = &id(state3 as StateMachineFunc);
-   |     -----------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
-   |     |                |                            |
-   |     |                |                            temporary value is freed at the end of this statement
+   |     -----------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value is freed at the end of this statement
+   |     |                |
    |     |                creates a temporary which is freed while still in use
    |     assignment requires that borrow lasts for `'1`
 
@@ -28,9 +26,8 @@ error[E0716]: temporary value dropped while borrowed
 LL | fn state3(self_: &mut StateMachineIter) -> Option<(&'static str)> {
    |           ----- has type `&mut StateMachineIter<'1>`
 LL |     self_.statefn = &id(finished as StateMachineFunc);
-   |     -----------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
-   |     |                |                              |
-   |     |                |                              temporary value is freed at the end of this statement
+   |     -----------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value is freed at the end of this statement
+   |     |                |
    |     |                creates a temporary which is freed while still in use
    |     assignment requires that borrow lasts for `'1`
 

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ LL \| \| foo(tx.clone());`
`13`	`13`	`LL \| \| }).await;`
`14`	`14`	`\| \|________________^ first, await occurs here, with the value maybe used later...`
`15`	`15`	`note: the value is later dropped here`
`16`		`- --> $DIR/issue-70935-complex-spans.rs:15:16`
	`16`	`+ --> $DIR/issue-70935-complex-spans.rs:15:17`
`17`	`17`	`\|`
`18`	`18`	`LL \| }).await;`
`19`		`- \| ^`
	`19`	`+ \| ^`
`20`	`20`	note: this has type `[closure@$DIR/issue-70935-complex-spans.rs:13:13: 15:10]` which is not `Send`
`21`	`21`	`--> $DIR/issue-70935-complex-spans.rs:13:13`
`22`	`22`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0716]: temporary value dropped while borrowed`
`2`	`2`	`--> $DIR/borrowck-borrowed-uniq-rvalue.rs:10:28`
`3`	`3`	`\|`
`4`	`4`	`LL \| buggy_map.insert(42, &*Box::new(1));`
`5`		`- \| ^^^^^^^^^^^- temporary value is freed at the end of this statement`
	`5`	`+ \| ^^^^^^^^^^^ - temporary value is freed at the end of this statement`
`6`	`6`	`\| \|`
`7`	`7`	`\| creates a temporary which is freed while still in use`
`8`	`8`	`...`