From 4d66986e090abed11c1aae9602f23385f94154fa Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 16 Sep 2021 15:01:22 -0500
Subject: [PATCH] Use larger span for adjustments on method calls
Currently, we use a relatively 'small' span for THIR
expressions generated by an 'adjustment' (e.g. an autoderef,
autoborrow, unsizing). As a result, if a borrow generated
by an adustment ends up causing a borrowcheck error, for example:
```rust
let mut my_var = String::new();
let my_ref = &my_var
my_var.push('a');
my_ref;
```
then the span for the mutable borrow may end up referring
to only the base expression (e.g. `my_var`), rather than
the method call which triggered the mutable borrow
(e.g. `my_var.push('a')`)
Due to a quirk of the MIR borrowck implementation,
this doesn't always get exposed in migration mode,
but it does in many cases.
This commit makes THIR building consistently use 'larger'
spans for adjustment expressions
The intent of this change it make it clearer to users
when it's the specific way in which a variable is
used (for example, in a method call) that produdes
a borrowcheck error. For example, an error message
claiming that a 'mutable borrow occurs here' might
be confusing if it just points at a usage of a variable
(e.g. `my_var`), when no `&mut` is in sight. Pointing
at the entire expression should help to emphasize
that the method call itself is responsible for
the mutable borrow.
In several cases, this makes the `#![feature(nll)]` diagnostic
output match up exactly with the default (migration mode) output.
As a result, several `.nll.stderr` files end up getting removed
entirely.
---
compiler/rustc_mir_build/src/thir/cx/expr.rs | 19 +++++++-
compiler/rustc_mir_build/src/thir/cx/mod.rs | 10 ++++
...d[0].SimplifyCfg-elaborate-drops.after.mir | 6 +--
...motion_extern_static.BAR.PromoteTemps.diff | 20 ++++----
...d[0].SimplifyCfg-elaborate-drops.after.mir | 6 +--
...motion_extern_static.FOO.PromoteTemps.diff | 20 ++++----
..._line_doc_comment_2.DeduplicateBlocks.diff | 6 +--
...float_to_exponential_common.ConstProp.diff | 12 ++---
.../inline/inline_shims.clone.Inline.diff | 6 +--
.../inline_trait_method.test.Inline.after.mir | 6 +--
...67_inline_as_ref_as_mut.a.Inline.after.mir | 6 +--
...67_inline_as_ref_as_mut.b.Inline.after.mir | 6 +--
...67_inline_as_ref_as_mut.c.Inline.after.mir | 6 +--
...67_inline_as_ref_as_mut.d.Inline.after.mir | 6 +--
...er_slice_len.bound.LowerSliceLenCalls.diff | 6 +--
..._after_call.main.ElaborateDrops.before.mir | 6 +--
...receiver_ptr_mutability.main.mir_map.0.mir | 18 +++----
...main.SimplifyCfg-elaborate-drops.after.mir | 16 +++----
.../vec-mut-iter-borrow.stderr | 2 +-
src/test/ui/async-await/issue-61452.stderr | 2 +-
.../ui/async-await/issues/issue-61187.stderr | 2 +-
src/test/ui/binop/binop-move-semantics.stderr | 2 +-
.../ui/borrowck/borrow-tuple-fields.stderr | 12 ++---
src/test/ui/borrowck/borrowck-argument.stderr | 8 ++--
.../borrowck-auto-mut-ref-to-immut-var.stderr | 2 +-
...ck-borrow-immut-deref-of-box-as-mut.stderr | 2 +-
.../borrowck-borrow-mut-object-twice.stderr | 6 +--
...rrowck-borrow-overloaded-auto-deref.stderr | 14 +++---
.../borrowck-borrowed-uniq-rvalue.stderr | 2 +-
.../borrowck-closures-unique-imm.stderr | 2 +-
.../borrowck/borrowck-describe-lvalue.stderr | 12 ++---
.../borrowck-for-loop-head-linkage.nll.stderr | 27 -----------
.../borrowck-insert-during-each.stderr | 20 ++++----
.../ui/borrowck/borrowck-issue-2657-1.stderr | 2 +-
.../ui/borrowck/borrowck-lend-flow-if.stderr | 2 +-
.../ui/borrowck/borrowck-lend-flow.stderr | 2 +-
.../borrowck-loan-blocks-move-cc.stderr | 4 +-
.../borrowck/borrowck-loan-blocks-move.stderr | 2 +-
.../borrowck-loan-in-overloaded-op.stderr | 2 +-
.../borrowck-loan-rcvr-overloaded-op.stderr | 2 +-
.../ui/borrowck/borrowck-loan-rcvr.stderr | 18 +++----
...-move-from-subpath-of-borrowed-path.stderr | 2 +-
.../borrowck-move-mut-base-ptr.stderr | 2 +-
...k-move-out-of-overloaded-auto-deref.stderr | 2 +-
.../borrowck-mut-borrow-linear-errors.stderr | 10 ++--
...borrowck-mut-borrow-of-mut-base-ptr.stderr | 4 +-
.../borrowck-object-lifetime.nll.stderr | 23 ---------
.../borrowck/borrowck-object-lifetime.stderr | 8 ++--
...borrowck-overloaded-index-autoderef.stderr | 16 +++----
...rowck-report-with-custom-diagnostic.stderr | 6 +--
.../borrowck-swap-mut-base-ptr.stderr | 2 +-
.../borrowck-union-borrow-nested.stderr | 2 +-
.../ui/borrowck/borrowck-uniq-via-lend.stderr | 4 +-
.../borrowck-vec-pattern-loan-from-mut.stderr | 5 +-
.../borrowck-vec-pattern-nesting.stderr | 4 +-
.../borrowck/index-mut-help-with-impl.stderr | 2 +-
src/test/ui/borrowck/index-mut-help.stderr | 2 +-
src/test/ui/borrowck/issue-42344.stderr | 2 +-
src/test/ui/borrowck/issue-51117.stderr | 2 +-
src/test/ui/borrowck/issue-81365-10.stderr | 2 +-
src/test/ui/borrowck/issue-81365-5.stderr | 2 +-
src/test/ui/borrowck/issue-82032.stderr | 2 +-
src/test/ui/borrowck/issue-82462.nll.stderr | 22 ---------
src/test/ui/borrowck/issue-85581.stderr | 2 +-
src/test/ui/borrowck/issue-85765.stderr | 2 +-
.../ui/borrowck/mut-borrow-of-mut-ref.stderr | 2 +-
.../borrowck/mut-borrow-outside-loop.stderr | 4 +-
.../ui/borrowck/two-phase-across-loop.stderr | 2 +-
...wo-phase-cannot-nest-mut-self-calls.stderr | 19 +++++---
.../ui/borrowck/two-phase-multi-mut.stderr | 5 +-
...-sharing-interference-2.migrate2015.stderr | 5 +-
...-sharing-interference-2.migrate2018.stderr | 5 +-
...tion-sharing-interference-2.nll2015.stderr | 10 ++--
...tion-sharing-interference-2.nll2018.stderr | 10 ++--
...interference-future-compat-lint.nll.stderr | 15 +++---
...ing-interference-future-compat-lint.stderr | 10 ++--
src/test/ui/borrowck/two-phase-sneaky.stderr | 2 +-
.../two-phase-surprise-no-conflict.stderr | 37 ++++++++------
src/test/ui/box/leak-alloc.stderr | 2 +-
.../cannot-mutate-captured-non-mut-var.stderr | 2 +-
src/test/ui/codemap_tests/issue-11715.stderr | 2 +-
src/test/ui/codemap_tests/one_line.stderr | 5 +-
.../issues/issue-67375.full.stderr | 2 +-
src/test/ui/consts/const_let_assign3.stderr | 2 +-
src/test/ui/did_you_mean/issue-34126.stderr | 5 +-
src/test/ui/did_you_mean/issue-35937.stderr | 2 +-
src/test/ui/did_you_mean/issue-38147-1.stderr | 2 +-
src/test/ui/did_you_mean/issue-38147-2.stderr | 2 +-
src/test/ui/did_you_mean/issue-38147-3.stderr | 2 +-
src/test/ui/did_you_mean/issue-38147-4.stderr | 2 +-
src/test/ui/did_you_mean/issue-40823.stderr | 2 +-
.../dropck/drop-with-active-borrows-1.stderr | 2 +-
.../dropck/drop-with-active-borrows-2.stderr | 2 +-
src/test/ui/error-codes/E0161.edition.stderr | 2 +-
src/test/ui/error-codes/E0161.migrate.stderr | 2 +-
src/test/ui/error-codes/E0161.nll.stderr | 2 +-
src/test/ui/error-codes/E0161.zflags.stderr | 2 +-
src/test/ui/error-codes/E0499.stderr | 2 +-
src/test/ui/error-codes/E0502.nll.stderr | 2 +-
src/test/ui/error-codes/E0502.stderr | 2 +-
src/test/ui/error-codes/E0503.stderr | 2 +-
src/test/ui/error-codes/E0505.stderr | 2 +-
src/test/ui/error-codes/E0507.stderr | 2 +-
src/test/ui/generator/dropck-resume.stderr | 2 +-
src/test/ui/generator/dropck.stderr | 2 +-
.../hashmap-iter-value-lifetime.nll.stderr | 15 ------
.../hashmap-iter-value-lifetime.stderr | 2 +-
.../ui/hashmap/hashmap-lifetimes.nll.stderr | 13 -----
src/test/ui/hashmap/hashmap-lifetimes.stderr | 2 +-
.../ui/hrtb/hrtb-debruijn-in-receiver.stderr | 4 +-
.../ui/hygiene/fields-numeric-borrowck.stderr | 2 +-
src/test/ui/issues/issue-13497-2.stderr | 15 +++---
src/test/ui/issues/issue-19163.stderr | 6 ++-
src/test/ui/issues/issue-21600.stderr | 2 +-
src/test/ui/issues/issue-41726.stderr | 2 +-
src/test/ui/issues/issue-42106.stderr | 4 +-
src/test/ui/issues/issue-44405.stderr | 2 +-
src/test/ui/issues/issue-47646.stderr | 2 +-
.../issue-52126-assign-op-invariance.stderr | 2 +-
src/test/ui/issues/issue-61108.stderr | 2 +-
src/test/ui/issues/issue-81584.stderr | 2 +-
.../lifetimes/borrowck-let-suggestion.stderr | 2 +-
...oth-anon-regions-using-fn-items.nll.stderr | 16 +++----
...non-regions-using-trait-objects.nll.stderr | 16 +++----
src/test/ui/lint/unaligned_references.stderr | 2 +-
src/test/ui/match/issue-74050-end-span.stderr | 2 +-
src/test/ui/methods/method-self-arg-2.stderr | 4 +-
.../ui/moves/move-fn-self-receiver.stderr | 2 +-
src/test/ui/mut/mut-cant-alias.stderr | 2 +-
src/test/ui/mut/mut-suggestion.stderr | 4 +-
src/test/ui/nll/closure-access-spans.stderr | 10 ++--
src/test/ui/nll/closure-borrow-spans.stderr | 28 +++++------
src/test/ui/nll/get_default.nll.stderr | 48 -------------------
src/test/ui/nll/get_default.stderr | 6 +--
src/test/ui/nll/issue-46589.stderr | 4 +-
src/test/ui/nll/issue-51191.stderr | 2 +-
src/test/ui/nll/issue-52669.stderr | 2 +-
src/test/ui/nll/issue-53773.stderr | 2 +-
src/test/ui/nll/issue-54556-niconii.stderr | 2 +-
.../nll/issue-62007-assign-const-index.stderr | 2 +-
...issue-62007-assign-differing-fields.stderr | 2 +-
.../ui/nll/loan_ends_mid_block_vec.stderr | 6 +--
.../assignment-to-differing-field.stderr | 4 +-
.../region-ends-after-if-condition.nll.stderr | 15 ------
src/test/ui/nll/return_from_loop.stderr | 4 +-
.../object-safety-by-value-self-use.stderr | 2 +-
.../ui/regions/region-object-lifetime-5.rs | 2 +-
.../regions/region-object-lifetime-5.stderr | 7 +--
.../borrowck-issue-49631.nll.stderr | 14 ------
.../borrowck-issue-49631.stderr | 2 +-
...ck-borrow-overloaded-auto-deref-mut.stderr | 8 ++--
...borrowck-call-is-borrow-issue-12224.stderr | 2 +-
...owck-call-method-from-mut-aliasable.stderr | 2 +-
.../ui/span/borrowck-fn-in-const-b.stderr | 2 +-
.../borrowck-let-suggestion-suffixes.stderr | 2 +-
.../ui/span/borrowck-object-mutability.stderr | 4 +-
.../ui/span/destructor-restrictions.stderr | 2 +-
...338-locals-die-before-temps-of-body.stderr | 4 +-
src/test/ui/span/issue-36537.stderr | 2 +-
src/test/ui/span/issue-40157.stderr | 2 +-
src/test/ui/span/mut-arg-hint.stderr | 6 +--
.../ui/span/mut-ptr-cant-outlive-ref.stderr | 2 +-
.../regionck-unboxed-closure-lifetimes.stderr | 2 +-
.../span/regions-escape-loop-via-vec.stderr | 11 +++--
.../span/send-is-not-static-std-sync.stderr | 10 ++--
src/test/ui/span/slice-borrow.stderr | 2 +-
...-bound-needing-more-suggestions.nll.stderr | 16 ++-----
...atic-bound-needing-more-suggestions.stderr | 16 ++-----
src/test/ui/unop-move-semantics.stderr | 2 +-
...after-move-implicity-coerced-object.stderr | 2 +-
170 files changed, 453 insertions(+), 583 deletions(-)
delete mode 100644 src/test/ui/borrowck/borrowck-for-loop-head-linkage.nll.stderr
delete mode 100644 src/test/ui/borrowck/borrowck-object-lifetime.nll.stderr
delete mode 100644 src/test/ui/borrowck/issue-82462.nll.stderr
delete mode 100644 src/test/ui/hashmap/hashmap-iter-value-lifetime.nll.stderr
delete mode 100644 src/test/ui/hashmap/hashmap-lifetimes.nll.stderr
delete mode 100644 src/test/ui/nll/get_default.nll.stderr
delete mode 100644 src/test/ui/nll/region-ends-after-if-condition.nll.stderr
delete mode 100644 src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.nll.stderr
diff --git a/compiler/rustc_mir_build/src/thir/cx/expr.rs b/compiler/rustc_mir_build/src/thir/cx/expr.rs
index 66005be05df..17296a95bc1 100644
--- a/compiler/rustc_mir_build/src/thir/cx/expr.rs
+++ b/compiler/rustc_mir_build/src/thir/cx/expr.rs
@@ -39,10 +39,17 @@ impl<'tcx> Cx<'tcx> {
let mut expr = self.make_mirror_unadjusted(hir_expr);
+ let adjustment_span = match self.adjustment_span {
+ Some((hir_id, span)) if hir_id == hir_expr.hir_id => Some(span),
+ _ => None,
+ };
+
// Now apply adjustments, if any.
for adjustment in self.typeck_results.expr_adjustments(hir_expr) {
debug!("make_mirror: expr={:?} applying adjustment={:?}", expr, adjustment);
- expr = self.apply_adjustment(hir_expr, expr, adjustment);
+ let span = expr.span;
+ expr =
+ self.apply_adjustment(hir_expr, expr, adjustment, adjustment_span.unwrap_or(span));
}
// Next, wrap this up in the expr's scope.
@@ -82,8 +89,9 @@ impl<'tcx> Cx<'tcx> {
hir_expr: &'tcx hir::Expr<'tcx>,
mut expr: Expr<'tcx>,
adjustment: &Adjustment<'tcx>,
+ mut span: Span,
) -> Expr<'tcx> {
- let Expr { temp_lifetime, mut span, .. } = expr;
+ let Expr { temp_lifetime, .. } = expr;
// Adjust the span from the block, to the last expression of the
// block. This is a better span when returning a mutable reference
@@ -150,6 +158,7 @@ impl<'tcx> Cx<'tcx> {
fn make_mirror_unadjusted(&mut self, expr: &'tcx hir::Expr<'tcx>) -> Expr<'tcx> {
let expr_ty = self.typeck_results().expr_ty(expr);
+ let expr_span = expr.span;
let temp_lifetime = self.region_scope_tree.temporary_scope(expr.hir_id.local_id);
let kind = match expr.kind {
@@ -157,7 +166,13 @@ impl<'tcx> Cx<'tcx> {
hir::ExprKind::MethodCall(_, method_span, ref args, fn_span) => {
// Rewrite a.b(c) into UFCS form like Trait::b(a, c)
let expr = self.method_callee(expr, method_span, None);
+ // When we apply adjustments to the receiver, use the span of
+ // the overall method call for better diagnostics. args[0]
+ // is guaranteed to exist, since a method call always has a receiver.
+ let old_adjustment_span = self.adjustment_span.replace((args[0].hir_id, expr_span));
+ tracing::info!("Using method span: {:?}", expr.span);
let args = self.mirror_exprs(args);
+ self.adjustment_span = old_adjustment_span;
ExprKind::Call {
ty: expr.ty,
fun: self.thir.exprs.push(expr),
diff --git a/compiler/rustc_mir_build/src/thir/cx/mod.rs b/compiler/rustc_mir_build/src/thir/cx/mod.rs
index 5059dd939d9..38a4676bd15 100644
--- a/compiler/rustc_mir_build/src/thir/cx/mod.rs
+++ b/compiler/rustc_mir_build/src/thir/cx/mod.rs
@@ -9,6 +9,7 @@ use rustc_ast as ast;
use rustc_data_structures::steal::Steal;
use rustc_hir as hir;
use rustc_hir::def_id::{DefId, LocalDefId};
+use rustc_hir::HirId;
use rustc_hir::Node;
use rustc_middle::middle::region;
use rustc_middle::mir::interpret::{LitToConstError, LitToConstInput};
@@ -46,6 +47,14 @@ struct Cx<'tcx> {
crate region_scope_tree: &'tcx region::ScopeTree,
crate typeck_results: &'tcx ty::TypeckResults<'tcx>,
+ /// When applying adjustments to the expression
+ /// with the given `HirId`, use the given `Span`,
+ /// instead of the usual span. This is used to
+ /// assign the span of an overall method call
+ /// (e.g. `my_val.foo()`) to the adjustment expressions
+ /// for the receiver.
+ adjustment_span: Option<(HirId, Span)>,
+
/// The `DefId` of the owner of this body.
body_owner: DefId,
}
@@ -60,6 +69,7 @@ impl<'tcx> Cx<'tcx> {
region_scope_tree: tcx.region_scope_tree(def.did),
typeck_results,
body_owner: def.did.to_def_id(),
+ adjustment_span: None,
}
}
diff --git a/src/test/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir b/src/test/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir
index a64c960b9f7..bec0fa9c049 100644
--- a/src/test/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir
+++ b/src/test/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir
@@ -1,7 +1,7 @@
// MIR for `BAR::promoted[0]` after SimplifyCfg-elaborate-drops
promoted[0] in BAR: &[&i32; 1] = {
- let mut _0: &[&i32; 1]; // return place in scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
+ let mut _0: &[&i32; 1]; // return place in scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
let mut _1: [&i32; 1]; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
let mut _2: &i32; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:32: 9:34
let mut _3: &i32; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:33: 9:34
@@ -16,8 +16,8 @@ promoted[0] in BAR: &[&i32; 1] = {
// + literal: Const { ty: &i32, val: Value(Scalar(alloc1)) }
_2 = &(*_3); // scope 0 at $DIR/const-promotion-extern-static.rs:9:32: 9:34
_1 = [move _2]; // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
- _0 = &_1; // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
- return; // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
+ _0 = &_1; // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
+ return; // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
}
}
diff --git a/src/test/mir-opt/const_promotion_extern_static.BAR.PromoteTemps.diff b/src/test/mir-opt/const_promotion_extern_static.BAR.PromoteTemps.diff
index 49d0a7ff455..bdd62f1029f 100644
--- a/src/test/mir-opt/const_promotion_extern_static.BAR.PromoteTemps.diff
+++ b/src/test/mir-opt/const_promotion_extern_static.BAR.PromoteTemps.diff
@@ -3,21 +3,21 @@
static mut BAR: *const &i32 = {
let mut _0: *const &i32; // return place in scope 0 at $DIR/const-promotion-extern-static.rs:9:17: 9:28
- let mut _1: &[&i32]; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
- let mut _2: &[&i32; 1]; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
+ let mut _1: &[&i32]; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
+ let mut _2: &[&i32; 1]; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
let _3: [&i32; 1]; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
let mut _4: &i32; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:32: 9:34
let _5: &i32; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:33: 9:34
-+ let mut _6: &[&i32; 1]; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
++ let mut _6: &[&i32; 1]; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
bb0: {
- StorageLive(_1); // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
- StorageLive(_2); // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
+ StorageLive(_1); // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
+ StorageLive(_2); // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
- StorageLive(_3); // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
- StorageLive(_4); // scope 0 at $DIR/const-promotion-extern-static.rs:9:32: 9:34
- StorageLive(_5); // scope 0 at $DIR/const-promotion-extern-static.rs:9:33: 9:34
- _5 = const {alloc1: &i32}; // scope 0 at $DIR/const-promotion-extern-static.rs:9:33: 9:34
-+ _6 = const BAR::promoted[0]; // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
++ _6 = const BAR::promoted[0]; // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
// ty::Const
- // + ty: &i32
- // + val: Value(Scalar(alloc1))
@@ -28,11 +28,11 @@
- // + literal: Const { ty: &i32, val: Value(Scalar(alloc1)) }
- _4 = &(*_5); // scope 0 at $DIR/const-promotion-extern-static.rs:9:32: 9:34
- _3 = [move _4]; // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
-- _2 = &_3; // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
-+ // + span: $DIR/const-promotion-extern-static.rs:9:31: 9:35
+- _2 = &_3; // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
++ // + span: $DIR/const-promotion-extern-static.rs:9:31: 9:44
+ // + literal: Const { ty: &[&i32; 1], val: Unevaluated(Unevaluated { def: WithOptConstParam { did: DefId(0:6 ~ const_promotion_extern_static[55e6]::BAR), const_param_did: None }, substs_: Some([]), promoted: Some(promoted[0]) }) }
-+ _2 = &(*_6); // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
- _1 = move _2 as &[&i32] (Pointer(Unsize)); // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
++ _2 = &(*_6); // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
+ _1 = move _2 as &[&i32] (Pointer(Unsize)); // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
- StorageDead(_4); // scope 0 at $DIR/const-promotion-extern-static.rs:9:34: 9:35
StorageDead(_2); // scope 0 at $DIR/const-promotion-extern-static.rs:9:34: 9:35
_0 = core::slice::<impl [&i32]>::as_ptr(move _1) -> [return: bb1, unwind: bb2]; // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
diff --git a/src/test/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir b/src/test/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir
index 8b3c5d332f2..c01b31525b6 100644
--- a/src/test/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir
+++ b/src/test/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir
@@ -1,7 +1,7 @@
// MIR for `FOO::promoted[0]` after SimplifyCfg-elaborate-drops
promoted[0] in FOO: &[&i32; 1] = {
- let mut _0: &[&i32; 1]; // return place in scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
+ let mut _0: &[&i32; 1]; // return place in scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
let mut _1: [&i32; 1]; // in scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
let mut _2: &i32; // in scope 0 at $DIR/const-promotion-extern-static.rs:13:32: 13:45
let mut _3: *const i32; // in scope 0 at $DIR/const-promotion-extern-static.rs:13:42: 13:43
@@ -16,8 +16,8 @@ promoted[0] in FOO: &[&i32; 1] = {
// + literal: Const { ty: *const i32, val: Value(Scalar(alloc3)) }
_2 = &(*_3); // scope 0 at $DIR/const-promotion-extern-static.rs:13:41: 13:43
_1 = [move _2]; // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
- _0 = &_1; // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
- return; // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
+ _0 = &_1; // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
+ return; // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
}
}
diff --git a/src/test/mir-opt/const_promotion_extern_static.FOO.PromoteTemps.diff b/src/test/mir-opt/const_promotion_extern_static.FOO.PromoteTemps.diff
index f2504ae880e..94b337806af 100644
--- a/src/test/mir-opt/const_promotion_extern_static.FOO.PromoteTemps.diff
+++ b/src/test/mir-opt/const_promotion_extern_static.FOO.PromoteTemps.diff
@@ -3,23 +3,23 @@
static mut FOO: *const &i32 = {
let mut _0: *const &i32; // return place in scope 0 at $DIR/const-promotion-extern-static.rs:13:17: 13:28
- let mut _1: &[&i32]; // in scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
- let mut _2: &[&i32; 1]; // in scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
+ let mut _1: &[&i32]; // in scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
+ let mut _2: &[&i32; 1]; // in scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
let _3: [&i32; 1]; // in scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
let mut _4: &i32; // in scope 0 at $DIR/const-promotion-extern-static.rs:13:32: 13:45
let _5: *const i32; // in scope 0 at $DIR/const-promotion-extern-static.rs:13:42: 13:43
-+ let mut _6: &[&i32; 1]; // in scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
++ let mut _6: &[&i32; 1]; // in scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
scope 1 {
}
bb0: {
- StorageLive(_1); // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
- StorageLive(_2); // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
+ StorageLive(_1); // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
+ StorageLive(_2); // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
- StorageLive(_3); // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
- StorageLive(_4); // scope 0 at $DIR/const-promotion-extern-static.rs:13:32: 13:45
- StorageLive(_5); // scope 1 at $DIR/const-promotion-extern-static.rs:13:42: 13:43
- _5 = const {alloc3: *const i32}; // scope 1 at $DIR/const-promotion-extern-static.rs:13:42: 13:43
-+ _6 = const FOO::promoted[0]; // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
++ _6 = const FOO::promoted[0]; // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
// ty::Const
- // + ty: *const i32
- // + val: Value(Scalar(alloc3))
@@ -30,11 +30,11 @@
- // + literal: Const { ty: *const i32, val: Value(Scalar(alloc3)) }
- _4 = &(*_5); // scope 1 at $DIR/const-promotion-extern-static.rs:13:41: 13:43
- _3 = [move _4]; // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
-- _2 = &_3; // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
-+ // + span: $DIR/const-promotion-extern-static.rs:13:31: 13:46
+- _2 = &_3; // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
++ // + span: $DIR/const-promotion-extern-static.rs:13:31: 13:55
+ // + literal: Const { ty: &[&i32; 1], val: Unevaluated(Unevaluated { def: WithOptConstParam { did: DefId(0:7 ~ const_promotion_extern_static[55e6]::FOO), const_param_did: None }, substs_: Some([]), promoted: Some(promoted[0]) }) }
-+ _2 = &(*_6); // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
- _1 = move _2 as &[&i32] (Pointer(Unsize)); // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
++ _2 = &(*_6); // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
+ _1 = move _2 as &[&i32] (Pointer(Unsize)); // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
- StorageDead(_4); // scope 0 at $DIR/const-promotion-extern-static.rs:13:45: 13:46
StorageDead(_2); // scope 0 at $DIR/const-promotion-extern-static.rs:13:45: 13:46
_0 = core::slice::<impl [&i32]>::as_ptr(move _1) -> [return: bb1, unwind: bb2]; // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
diff --git a/src/test/mir-opt/deduplicate_blocks.is_line_doc_comment_2.DeduplicateBlocks.diff b/src/test/mir-opt/deduplicate_blocks.is_line_doc_comment_2.DeduplicateBlocks.diff
index 48a37a8496c..7695afded3d 100644
--- a/src/test/mir-opt/deduplicate_blocks.is_line_doc_comment_2.DeduplicateBlocks.diff
+++ b/src/test/mir-opt/deduplicate_blocks.is_line_doc_comment_2.DeduplicateBlocks.diff
@@ -5,7 +5,7 @@
debug s => _1; // in scope 0 at $DIR/deduplicate_blocks.rs:2:36: 2:37
let mut _0: bool; // return place in scope 0 at $DIR/deduplicate_blocks.rs:2:48: 2:52
let mut _2: &[u8]; // in scope 0 at $DIR/deduplicate_blocks.rs:3:11: 3:23
- let mut _3: &str; // in scope 0 at $DIR/deduplicate_blocks.rs:3:11: 3:12
+ let mut _3: &str; // in scope 0 at $DIR/deduplicate_blocks.rs:3:11: 3:23
let mut _4: usize; // in scope 0 at $DIR/deduplicate_blocks.rs:5:9: 5:31
let mut _5: bool; // in scope 0 at $DIR/deduplicate_blocks.rs:5:9: 5:31
let mut _6: usize; // in scope 0 at $DIR/deduplicate_blocks.rs:4:9: 4:37
@@ -19,8 +19,8 @@
bb0: {
StorageLive(_2); // scope 0 at $DIR/deduplicate_blocks.rs:3:11: 3:23
- StorageLive(_3); // scope 0 at $DIR/deduplicate_blocks.rs:3:11: 3:12
- _3 = _1; // scope 0 at $DIR/deduplicate_blocks.rs:3:11: 3:12
+ StorageLive(_3); // scope 0 at $DIR/deduplicate_blocks.rs:3:11: 3:23
+ _3 = _1; // scope 0 at $DIR/deduplicate_blocks.rs:3:11: 3:23
StorageLive(_8); // scope 2 at $DIR/deduplicate_blocks.rs:3:11: 3:23
_8 = _3; // scope 2 at $DIR/deduplicate_blocks.rs:3:11: 3:23
- _2 = transmute::<&str, &[u8]>(move _8) -> bb14; // scope 2 at $DIR/deduplicate_blocks.rs:3:11: 3:23
diff --git a/src/test/mir-opt/funky_arms.float_to_exponential_common.ConstProp.diff b/src/test/mir-opt/funky_arms.float_to_exponential_common.ConstProp.diff
index fd29e14a041..000bc634325 100644
--- a/src/test/mir-opt/funky_arms.float_to_exponential_common.ConstProp.diff
+++ b/src/test/mir-opt/funky_arms.float_to_exponential_common.ConstProp.diff
@@ -7,9 +7,9 @@
debug upper => _3; // in scope 0 at $DIR/funky_arms.rs:11:69: 11:74
let mut _0: std::result::Result<(), std::fmt::Error>; // return place in scope 0 at $DIR/funky_arms.rs:11:85: 11:91
let _4: bool; // in scope 0 at $DIR/funky_arms.rs:15:9: 15:19
- let mut _5: &std::fmt::Formatter; // in scope 0 at $DIR/funky_arms.rs:15:22: 15:25
+ let mut _5: &std::fmt::Formatter; // in scope 0 at $DIR/funky_arms.rs:15:22: 15:37
let mut _7: std::option::Option<usize>; // in scope 0 at $DIR/funky_arms.rs:24:30: 24:45
- let mut _8: &std::fmt::Formatter; // in scope 0 at $DIR/funky_arms.rs:24:30: 24:33
+ let mut _8: &std::fmt::Formatter; // in scope 0 at $DIR/funky_arms.rs:24:30: 24:45
let mut _9: isize; // in scope 0 at $DIR/funky_arms.rs:24:12: 24:27
let mut _11: &mut std::fmt::Formatter; // in scope 0 at $DIR/funky_arms.rs:26:43: 26:46
let mut _12: &T; // in scope 0 at $DIR/funky_arms.rs:26:48: 26:51
@@ -36,8 +36,8 @@
bb0: {
StorageLive(_4); // scope 0 at $DIR/funky_arms.rs:15:9: 15:19
- StorageLive(_5); // scope 0 at $DIR/funky_arms.rs:15:22: 15:25
- _5 = &(*_1); // scope 0 at $DIR/funky_arms.rs:15:22: 15:25
+ StorageLive(_5); // scope 0 at $DIR/funky_arms.rs:15:22: 15:37
+ _5 = &(*_1); // scope 0 at $DIR/funky_arms.rs:15:22: 15:37
_4 = Formatter::sign_plus(move _5) -> bb1; // scope 0 at $DIR/funky_arms.rs:15:22: 15:37
// mir::Constant
// + span: $DIR/funky_arms.rs:15:26: 15:35
@@ -62,8 +62,8 @@
bb4: {
StorageLive(_7); // scope 2 at $DIR/funky_arms.rs:24:30: 24:45
- StorageLive(_8); // scope 2 at $DIR/funky_arms.rs:24:30: 24:33
- _8 = &(*_1); // scope 2 at $DIR/funky_arms.rs:24:30: 24:33
+ StorageLive(_8); // scope 2 at $DIR/funky_arms.rs:24:30: 24:45
+ _8 = &(*_1); // scope 2 at $DIR/funky_arms.rs:24:30: 24:45
_7 = Formatter::precision(move _8) -> bb5; // scope 2 at $DIR/funky_arms.rs:24:30: 24:45
// mir::Constant
// + span: $DIR/funky_arms.rs:24:34: 24:43
diff --git a/src/test/mir-opt/inline/inline_shims.clone.Inline.diff b/src/test/mir-opt/inline/inline_shims.clone.Inline.diff
index 3bdd4f4ff56..7379d5f219c 100644
--- a/src/test/mir-opt/inline/inline_shims.clone.Inline.diff
+++ b/src/test/mir-opt/inline/inline_shims.clone.Inline.diff
@@ -4,13 +4,13 @@
fn clone(_1: fn(A, B)) -> fn(A, B) {
debug f => _1; // in scope 0 at $DIR/inline-shims.rs:5:20: 5:21
let mut _0: fn(A, B); // return place in scope 0 at $DIR/inline-shims.rs:5:36: 5:44
- let mut _2: &fn(A, B); // in scope 0 at $DIR/inline-shims.rs:6:5: 6:6
+ let mut _2: &fn(A, B); // in scope 0 at $DIR/inline-shims.rs:6:5: 6:14
+ scope 1 (inlined <fn(A, B) as Clone>::clone - shim(fn(A, B))) { // at $DIR/inline-shims.rs:6:5: 6:14
+ }
bb0: {
- StorageLive(_2); // scope 0 at $DIR/inline-shims.rs:6:5: 6:6
- _2 = &_1; // scope 0 at $DIR/inline-shims.rs:6:5: 6:6
+ StorageLive(_2); // scope 0 at $DIR/inline-shims.rs:6:5: 6:14
+ _2 = &_1; // scope 0 at $DIR/inline-shims.rs:6:5: 6:14
- _0 = <fn(A, B) as Clone>::clone(move _2) -> bb1; // scope 0 at $DIR/inline-shims.rs:6:5: 6:14
- // mir::Constant
- // + span: $DIR/inline-shims.rs:6:7: 6:12
diff --git a/src/test/mir-opt/inline/inline_trait_method.test.Inline.after.mir b/src/test/mir-opt/inline/inline_trait_method.test.Inline.after.mir
index eada5ac1347..0be979901ac 100644
--- a/src/test/mir-opt/inline/inline_trait_method.test.Inline.after.mir
+++ b/src/test/mir-opt/inline/inline_trait_method.test.Inline.after.mir
@@ -3,11 +3,11 @@
fn test(_1: &dyn X) -> u32 {
debug x => _1; // in scope 0 at $DIR/inline-trait-method.rs:8:9: 8:10
let mut _0: u32; // return place in scope 0 at $DIR/inline-trait-method.rs:8:23: 8:26
- let mut _2: &dyn X; // in scope 0 at $DIR/inline-trait-method.rs:9:5: 9:6
+ let mut _2: &dyn X; // in scope 0 at $DIR/inline-trait-method.rs:9:5: 9:10
bb0: {
- StorageLive(_2); // scope 0 at $DIR/inline-trait-method.rs:9:5: 9:6
- _2 = &(*_1); // scope 0 at $DIR/inline-trait-method.rs:9:5: 9:6
+ StorageLive(_2); // scope 0 at $DIR/inline-trait-method.rs:9:5: 9:10
+ _2 = &(*_1); // scope 0 at $DIR/inline-trait-method.rs:9:5: 9:10
_0 = <dyn X as X>::y(move _2) -> bb1; // scope 0 at $DIR/inline-trait-method.rs:9:5: 9:10
// mir::Constant
// + span: $DIR/inline-trait-method.rs:9:7: 9:8
diff --git a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.a.Inline.after.mir b/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.a.Inline.after.mir
index 651855f8024..1b5153daa8b 100644
--- a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.a.Inline.after.mir
+++ b/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.a.Inline.after.mir
@@ -5,7 +5,7 @@ fn a(_1: &mut [T]) -> &mut [T] {
let mut _0: &mut [T]; // return place in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:2:29: 2:37
let mut _2: &mut [T]; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
let mut _3: &mut [T]; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
- let mut _4: &mut [T]; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:6
+ let mut _4: &mut [T]; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
scope 1 (inlined <[T] as AsMut<[T]>>::as_mut) { // at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
debug self => _4; // in scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
let mut _5: &mut [T]; // in scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
@@ -14,8 +14,8 @@ fn a(_1: &mut [T]) -> &mut [T] {
bb0: {
StorageLive(_2); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
StorageLive(_3); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
- StorageLive(_4); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:6
- _4 = &mut (*_1); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:6
+ StorageLive(_4); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
+ _4 = &mut (*_1); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
StorageLive(_5); // scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
_5 = &mut (*_4); // scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
_3 = &mut (*_5); // scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:3:5: 3:15
diff --git a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.b.Inline.after.mir b/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.b.Inline.after.mir
index c67ea7e00b7..257ddec780e 100644
--- a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.b.Inline.after.mir
+++ b/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.b.Inline.after.mir
@@ -5,7 +5,7 @@ fn b(_1: &mut Box<T>) -> &mut T {
let mut _0: &mut T; // return place in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:7:32: 7:38
let mut _2: &mut T; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
let mut _3: &mut T; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
- let mut _4: &mut std::boxed::Box<T>; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:6
+ let mut _4: &mut std::boxed::Box<T>; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
scope 1 (inlined <Box<T> as AsMut<T>>::as_mut) { // at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
debug self => _4; // in scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
let mut _5: &mut T; // in scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
@@ -15,8 +15,8 @@ fn b(_1: &mut Box<T>) -> &mut T {
bb0: {
StorageLive(_2); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
StorageLive(_3); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
- StorageLive(_4); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:6
- _4 = &mut (*_1); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:6
+ StorageLive(_4); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
+ _4 = &mut (*_1); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
StorageLive(_5); // scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
StorageLive(_6); // scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
_6 = &mut (*(*_4)); // scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:8:5: 8:15
diff --git a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.c.Inline.after.mir b/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.c.Inline.after.mir
index 16fae453ac9..9817e8cd5fa 100644
--- a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.c.Inline.after.mir
+++ b/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.c.Inline.after.mir
@@ -4,15 +4,15 @@ fn c(_1: &[T]) -> &[T] {
debug x => _1; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:12:13: 12:14
let mut _0: &[T]; // return place in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:12:25: 12:29
let _2: &[T]; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:5: 13:15
- let mut _3: &[T]; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:5: 13:6
+ let mut _3: &[T]; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:5: 13:15
scope 1 (inlined <[T] as AsRef<[T]>>::as_ref) { // at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:5: 13:15
debug self => _3; // in scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:5: 13:15
}
bb0: {
StorageLive(_2); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:5: 13:15
- StorageLive(_3); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:5: 13:6
- _3 = &(*_1); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:5: 13:6
+ StorageLive(_3); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:5: 13:15
+ _3 = &(*_1); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:5: 13:15
_2 = _3; // scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:5: 13:15
_0 = &(*_2); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:5: 13:15
StorageDead(_3); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:13:14: 13:15
diff --git a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.d.Inline.after.mir b/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.d.Inline.after.mir
index e9ca7095a43..e49c91581b3 100644
--- a/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.d.Inline.after.mir
+++ b/src/test/mir-opt/inline/issue_58867_inline_as_ref_as_mut.d.Inline.after.mir
@@ -4,15 +4,15 @@ fn d(_1: &Box<T>) -> &T {
debug x => _1; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:17:13: 17:14
let mut _0: &T; // return place in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:17:28: 17:30
let _2: &T; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:5: 18:15
- let mut _3: &std::boxed::Box<T>; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:5: 18:6
+ let mut _3: &std::boxed::Box<T>; // in scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:5: 18:15
scope 1 (inlined <Box<T> as AsRef<T>>::as_ref) { // at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:5: 18:15
debug self => _3; // in scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:5: 18:15
}
bb0: {
StorageLive(_2); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:5: 18:15
- StorageLive(_3); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:5: 18:6
- _3 = &(*_1); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:5: 18:6
+ StorageLive(_3); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:5: 18:15
+ _3 = &(*_1); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:5: 18:15
_2 = &(*(*_3)); // scope 1 at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:5: 18:15
_0 = &(*_2); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:5: 18:15
StorageDead(_3); // scope 0 at $DIR/issue-58867-inline-as-ref-as-mut.rs:18:14: 18:15
diff --git a/src/test/mir-opt/lower_slice_len.bound.LowerSliceLenCalls.diff b/src/test/mir-opt/lower_slice_len.bound.LowerSliceLenCalls.diff
index 25db3b98c25..13241d882f2 100644
--- a/src/test/mir-opt/lower_slice_len.bound.LowerSliceLenCalls.diff
+++ b/src/test/mir-opt/lower_slice_len.bound.LowerSliceLenCalls.diff
@@ -8,7 +8,7 @@
let mut _3: bool; // in scope 0 at $DIR/lower_slice_len.rs:5:8: 5:27
let mut _4: usize; // in scope 0 at $DIR/lower_slice_len.rs:5:8: 5:13
let mut _5: usize; // in scope 0 at $DIR/lower_slice_len.rs:5:16: 5:27
- let mut _6: &[u8]; // in scope 0 at $DIR/lower_slice_len.rs:5:16: 5:21
+ let mut _6: &[u8]; // in scope 0 at $DIR/lower_slice_len.rs:5:16: 5:27
let _7: usize; // in scope 0 at $DIR/lower_slice_len.rs:6:15: 6:20
let mut _8: usize; // in scope 0 at $DIR/lower_slice_len.rs:6:9: 6:21
let mut _9: bool; // in scope 0 at $DIR/lower_slice_len.rs:6:9: 6:21
@@ -18,8 +18,8 @@
StorageLive(_4); // scope 0 at $DIR/lower_slice_len.rs:5:8: 5:13
_4 = _1; // scope 0 at $DIR/lower_slice_len.rs:5:8: 5:13
StorageLive(_5); // scope 0 at $DIR/lower_slice_len.rs:5:16: 5:27
- StorageLive(_6); // scope 0 at $DIR/lower_slice_len.rs:5:16: 5:21
- _6 = &(*_2); // scope 0 at $DIR/lower_slice_len.rs:5:16: 5:21
+ StorageLive(_6); // scope 0 at $DIR/lower_slice_len.rs:5:16: 5:27
+ _6 = &(*_2); // scope 0 at $DIR/lower_slice_len.rs:5:16: 5:27
- _5 = core::slice::<impl [u8]>::len(move _6) -> bb1; // scope 0 at $DIR/lower_slice_len.rs:5:16: 5:27
- // mir::Constant
- // + span: $DIR/lower_slice_len.rs:5:22: 5:25
diff --git a/src/test/mir-opt/no_spurious_drop_after_call.main.ElaborateDrops.before.mir b/src/test/mir-opt/no_spurious_drop_after_call.main.ElaborateDrops.before.mir
index 7bdf7b6a648..5c55ee4b9bb 100644
--- a/src/test/mir-opt/no_spurious_drop_after_call.main.ElaborateDrops.before.mir
+++ b/src/test/mir-opt/no_spurious_drop_after_call.main.ElaborateDrops.before.mir
@@ -4,13 +4,13 @@ fn main() -> () {
let mut _0: (); // return place in scope 0 at $DIR/no-spurious-drop-after-call.rs:8:11: 8:11
let _1: (); // in scope 0 at $DIR/no-spurious-drop-after-call.rs:9:5: 9:35
let mut _2: std::string::String; // in scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:34
- let mut _3: &str; // in scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
+ let mut _3: &str; // in scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:34
let _4: &str; // in scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
bb0: {
StorageLive(_1); // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:5: 9:35
StorageLive(_2); // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:34
- StorageLive(_3); // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
+ StorageLive(_3); // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:34
StorageLive(_4); // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
_4 = const ""; // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
// ty::Const
@@ -19,7 +19,7 @@ fn main() -> () {
// mir::Constant
// + span: $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [], len: Size { raw: 0 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 0 }) }
- _3 = &(*_4); // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
+ _3 = &(*_4); // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:34
_2 = <str as ToString>::to_string(move _3) -> bb1; // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:34
// mir::Constant
// + span: $DIR/no-spurious-drop-after-call.rs:9:23: 9:32
diff --git a/src/test/mir-opt/receiver_ptr_mutability.main.mir_map.0.mir b/src/test/mir-opt/receiver_ptr_mutability.main.mir_map.0.mir
index f54c8f8ab4a..f1a1f388c50 100644
--- a/src/test/mir-opt/receiver_ptr_mutability.main.mir_map.0.mir
+++ b/src/test/mir-opt/receiver_ptr_mutability.main.mir_map.0.mir
@@ -10,15 +10,15 @@ fn main() -> () {
let mut _0: (); // return place in scope 0 at $DIR/receiver-ptr-mutability.rs:13:11: 13:11
let _1: *mut Test as UserTypeProjection { base: UserType(0), projs: [] }; // in scope 0 at $DIR/receiver-ptr-mutability.rs:14:9: 14:12
let _2: (); // in scope 0 at $DIR/receiver-ptr-mutability.rs:15:5: 15:12
- let mut _3: *const Test; // in scope 0 at $DIR/receiver-ptr-mutability.rs:15:5: 15:8
+ let mut _3: *const Test; // in scope 0 at $DIR/receiver-ptr-mutability.rs:15:5: 15:12
let mut _4: *mut Test; // in scope 0 at $DIR/receiver-ptr-mutability.rs:15:5: 15:8
let _6: &&&&*mut Test; // in scope 0 at $DIR/receiver-ptr-mutability.rs:18:34: 18:41
let _7: &&&*mut Test; // in scope 0 at $DIR/receiver-ptr-mutability.rs:18:35: 18:41
let _8: &&*mut Test; // in scope 0 at $DIR/receiver-ptr-mutability.rs:18:36: 18:41
let _9: &*mut Test; // in scope 0 at $DIR/receiver-ptr-mutability.rs:18:37: 18:41
let _10: (); // in scope 0 at $DIR/receiver-ptr-mutability.rs:19:5: 19:16
- let mut _11: *const Test; // in scope 0 at $DIR/receiver-ptr-mutability.rs:19:5: 19:12
- let mut _12: *mut Test; // in scope 0 at $DIR/receiver-ptr-mutability.rs:19:5: 19:12
+ let mut _11: *const Test; // in scope 0 at $DIR/receiver-ptr-mutability.rs:19:5: 19:16
+ let mut _12: *mut Test; // in scope 0 at $DIR/receiver-ptr-mutability.rs:19:5: 19:16
scope 1 {
debug ptr => _1; // in scope 1 at $DIR/receiver-ptr-mutability.rs:14:9: 14:12
let _5: &&&&*mut Test as UserTypeProjection { base: UserType(2), projs: [] }; // in scope 1 at $DIR/receiver-ptr-mutability.rs:18:9: 18:16
@@ -39,10 +39,10 @@ fn main() -> () {
FakeRead(ForLet(None), _1); // scope 0 at $DIR/receiver-ptr-mutability.rs:14:9: 14:12
AscribeUserType(_1, o, UserTypeProjection { base: UserType(1), projs: [] }); // scope 0 at $DIR/receiver-ptr-mutability.rs:14:14: 14:23
StorageLive(_2); // scope 1 at $DIR/receiver-ptr-mutability.rs:15:5: 15:12
- StorageLive(_3); // scope 1 at $DIR/receiver-ptr-mutability.rs:15:5: 15:8
+ StorageLive(_3); // scope 1 at $DIR/receiver-ptr-mutability.rs:15:5: 15:12
StorageLive(_4); // scope 1 at $DIR/receiver-ptr-mutability.rs:15:5: 15:8
_4 = _1; // scope 1 at $DIR/receiver-ptr-mutability.rs:15:5: 15:8
- _3 = move _4 as *const Test (Pointer(MutToConstPointer)); // scope 1 at $DIR/receiver-ptr-mutability.rs:15:5: 15:8
+ _3 = move _4 as *const Test (Pointer(MutToConstPointer)); // scope 1 at $DIR/receiver-ptr-mutability.rs:15:5: 15:12
StorageDead(_4); // scope 1 at $DIR/receiver-ptr-mutability.rs:15:7: 15:8
_2 = Test::x(move _3) -> [return: bb2, unwind: bb4]; // scope 1 at $DIR/receiver-ptr-mutability.rs:15:5: 15:12
// mir::Constant
@@ -67,10 +67,10 @@ fn main() -> () {
AscribeUserType(_5, o, UserTypeProjection { base: UserType(3), projs: [] }); // scope 1 at $DIR/receiver-ptr-mutability.rs:18:18: 18:31
StorageDead(_6); // scope 1 at $DIR/receiver-ptr-mutability.rs:18:41: 18:42
StorageLive(_10); // scope 2 at $DIR/receiver-ptr-mutability.rs:19:5: 19:16
- StorageLive(_11); // scope 2 at $DIR/receiver-ptr-mutability.rs:19:5: 19:12
- StorageLive(_12); // scope 2 at $DIR/receiver-ptr-mutability.rs:19:5: 19:12
- _12 = (*(*(*(*_5)))); // scope 2 at $DIR/receiver-ptr-mutability.rs:19:5: 19:12
- _11 = move _12 as *const Test (Pointer(MutToConstPointer)); // scope 2 at $DIR/receiver-ptr-mutability.rs:19:5: 19:12
+ StorageLive(_11); // scope 2 at $DIR/receiver-ptr-mutability.rs:19:5: 19:16
+ StorageLive(_12); // scope 2 at $DIR/receiver-ptr-mutability.rs:19:5: 19:16
+ _12 = (*(*(*(*_5)))); // scope 2 at $DIR/receiver-ptr-mutability.rs:19:5: 19:16
+ _11 = move _12 as *const Test (Pointer(MutToConstPointer)); // scope 2 at $DIR/receiver-ptr-mutability.rs:19:5: 19:16
StorageDead(_12); // scope 2 at $DIR/receiver-ptr-mutability.rs:19:11: 19:12
_10 = Test::x(move _11) -> [return: bb3, unwind: bb4]; // scope 2 at $DIR/receiver-ptr-mutability.rs:19:5: 19:16
// mir::Constant
diff --git a/src/test/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.mir b/src/test/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.mir
index cdf7282c8c3..6bb92c5e6bc 100644
--- a/src/test/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.mir
+++ b/src/test/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.mir
@@ -4,7 +4,7 @@ fn main() -> () {
let mut _0: (); // return place in scope 0 at $DIR/retag.rs:29:11: 29:11
let mut _1: i32; // in scope 0 at $DIR/retag.rs:30:9: 30:14
let _2: (); // in scope 0 at $DIR/retag.rs:31:5: 37:6
- let mut _4: &Test; // in scope 0 at $DIR/retag.rs:32:17: 32:24
+ let mut _4: &Test; // in scope 0 at $DIR/retag.rs:32:17: 32:36
let _5: Test; // in scope 0 at $DIR/retag.rs:32:17: 32:24
let mut _6: &mut i32; // in scope 0 at $DIR/retag.rs:32:29: 32:35
let mut _7: &mut i32; // in scope 0 at $DIR/retag.rs:32:29: 32:35
@@ -15,7 +15,7 @@ fn main() -> () {
let mut _17: &i32; // in scope 0 at $DIR/retag.rs:44:16: 44:18
let _18: &i32; // in scope 0 at $DIR/retag.rs:44:16: 44:18
let _19: &i32; // in scope 0 at $DIR/retag.rs:47:5: 47:24
- let mut _20: &Test; // in scope 0 at $DIR/retag.rs:47:5: 47:12
+ let mut _20: &Test; // in scope 0 at $DIR/retag.rs:47:5: 47:24
let _21: Test; // in scope 0 at $DIR/retag.rs:47:5: 47:12
let mut _22: &i32; // in scope 0 at $DIR/retag.rs:47:21: 47:23
let _23: &i32; // in scope 0 at $DIR/retag.rs:47:21: 47:23
@@ -60,11 +60,11 @@ fn main() -> () {
_1 = const 0_i32; // scope 0 at $DIR/retag.rs:30:17: 30:18
StorageLive(_2); // scope 1 at $DIR/retag.rs:31:5: 37:6
StorageLive(_3); // scope 1 at $DIR/retag.rs:32:13: 32:14
- StorageLive(_4); // scope 1 at $DIR/retag.rs:32:17: 32:24
+ StorageLive(_4); // scope 1 at $DIR/retag.rs:32:17: 32:36
StorageLive(_5); // scope 1 at $DIR/retag.rs:32:17: 32:24
_5 = Test(const 0_i32); // scope 1 at $DIR/retag.rs:32:17: 32:24
- _4 = &_5; // scope 1 at $DIR/retag.rs:32:17: 32:24
- Retag(_4); // scope 1 at $DIR/retag.rs:32:17: 32:24
+ _4 = &_5; // scope 1 at $DIR/retag.rs:32:17: 32:36
+ Retag(_4); // scope 1 at $DIR/retag.rs:32:17: 32:36
StorageLive(_6); // scope 1 at $DIR/retag.rs:32:29: 32:35
StorageLive(_7); // scope 1 at $DIR/retag.rs:32:29: 32:35
_7 = &mut _1; // scope 1 at $DIR/retag.rs:32:29: 32:35
@@ -140,11 +140,11 @@ fn main() -> () {
StorageDead(_16); // scope 6 at $DIR/retag.rs:44:18: 44:19
StorageDead(_18); // scope 6 at $DIR/retag.rs:44:19: 44:20
StorageLive(_19); // scope 7 at $DIR/retag.rs:47:5: 47:24
- StorageLive(_20); // scope 7 at $DIR/retag.rs:47:5: 47:12
+ StorageLive(_20); // scope 7 at $DIR/retag.rs:47:5: 47:24
StorageLive(_21); // scope 7 at $DIR/retag.rs:47:5: 47:12
_21 = Test(const 0_i32); // scope 7 at $DIR/retag.rs:47:5: 47:12
- _20 = &_21; // scope 7 at $DIR/retag.rs:47:5: 47:12
- Retag(_20); // scope 7 at $DIR/retag.rs:47:5: 47:12
+ _20 = &_21; // scope 7 at $DIR/retag.rs:47:5: 47:24
+ Retag(_20); // scope 7 at $DIR/retag.rs:47:5: 47:24
StorageLive(_22); // scope 7 at $DIR/retag.rs:47:21: 47:23
StorageLive(_23); // scope 7 at $DIR/retag.rs:47:21: 47:23
_28 = const main::promoted[0]; // scope 7 at $DIR/retag.rs:47:21: 47:23
diff --git a/src/test/ui/array-slice-vec/vec-mut-iter-borrow.stderr b/src/test/ui/array-slice-vec/vec-mut-iter-borrow.stderr
index 679fd899773..0ec263c850e 100644
--- a/src/test/ui/array-slice-vec/vec-mut-iter-borrow.stderr
+++ b/src/test/ui/array-slice-vec/vec-mut-iter-borrow.stderr
@@ -7,7 +7,7 @@ LL | for x in &mut xs {
| first mutable borrow occurs here
| first borrow later used here
LL | xs.push(1)
- | ^^ second mutable borrow occurs here
+ | ^^^^^^^^^^ second mutable borrow occurs here
error: aborting due to previous error
diff --git a/src/test/ui/async-await/issue-61452.stderr b/src/test/ui/async-await/issue-61452.stderr
index f2dec87baf0..2d3bb48e03b 100644
--- a/src/test/ui/async-await/issue-61452.stderr
+++ b/src/test/ui/async-await/issue-61452.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
LL | pub async fn f(x: Option<usize>) {
| - help: consider changing this to be mutable: `mut x`
LL | x.take();
- | ^ cannot borrow as mutable
+ | ^^^^^^^^ cannot borrow as mutable
error[E0384]: cannot assign twice to immutable variable `x`
--> $DIR/issue-61452.rs:9:5
diff --git a/src/test/ui/async-await/issues/issue-61187.stderr b/src/test/ui/async-await/issues/issue-61187.stderr
index 4d361c824dd..163053471b5 100644
--- a/src/test/ui/async-await/issues/issue-61187.stderr
+++ b/src/test/ui/async-await/issues/issue-61187.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow `data` as mutable, as it is not declared as mutable
LL | async fn response(data: Vec<u8>) {
| ---- help: consider changing this to be mutable: `mut data`
LL | data.reverse();
- | ^^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^ cannot borrow as mutable
error: aborting due to previous error
diff --git a/src/test/ui/binop/binop-move-semantics.stderr b/src/test/ui/binop/binop-move-semantics.stderr
index 7721f8827db..2cd6d1abfdc 100644
--- a/src/test/ui/binop/binop-move-semantics.stderr
+++ b/src/test/ui/binop/binop-move-semantics.stderr
@@ -30,7 +30,7 @@ LL | x
| - value moved here
LL | +
LL | x.clone();
- | ^ value borrowed here after move
+ | ^^^^^^^^^ value borrowed here after move
|
help: consider further restricting this bound
|
diff --git a/src/test/ui/borrowck/borrow-tuple-fields.stderr b/src/test/ui/borrowck/borrow-tuple-fields.stderr
index 503ea49d74e..ad628abcbfc 100644
--- a/src/test/ui/borrowck/borrow-tuple-fields.stderr
+++ b/src/test/ui/borrowck/borrow-tuple-fields.stderr
@@ -7,7 +7,7 @@ LL | let y = x;
| ^ move out of `x` occurs here
LL |
LL | r.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0502]: cannot borrow `x.0` as mutable because it is also borrowed as immutable
--> $DIR/borrow-tuple-fields.rs:18:13
@@ -17,7 +17,7 @@ LL | let a = &x.0;
LL | let b = &mut x.0;
| ^^^^^^^^ mutable borrow occurs here
LL | a.use_ref();
- | - immutable borrow later used here
+ | ----------- immutable borrow later used here
error[E0499]: cannot borrow `x.0` as mutable more than once at a time
--> $DIR/borrow-tuple-fields.rs:23:13
@@ -27,7 +27,7 @@ LL | let a = &mut x.0;
LL | let b = &mut x.0;
| ^^^^^^^^ second mutable borrow occurs here
LL | a.use_ref();
- | - first borrow later used here
+ | ----------- first borrow later used here
error[E0505]: cannot move out of `x` because it is borrowed
--> $DIR/borrow-tuple-fields.rs:28:13
@@ -37,7 +37,7 @@ LL | let r = &x.0;
LL | let y = x;
| ^ move out of `x` occurs here
LL | r.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0502]: cannot borrow `x.0` as mutable because it is also borrowed as immutable
--> $DIR/borrow-tuple-fields.rs:33:13
@@ -47,7 +47,7 @@ LL | let a = &x.0;
LL | let b = &mut x.0;
| ^^^^^^^^ mutable borrow occurs here
LL | a.use_ref();
- | - immutable borrow later used here
+ | ----------- immutable borrow later used here
error[E0499]: cannot borrow `x.0` as mutable more than once at a time
--> $DIR/borrow-tuple-fields.rs:38:13
@@ -57,7 +57,7 @@ LL | let a = &mut x.0;
LL | let b = &mut x.0;
| ^^^^^^^^ second mutable borrow occurs here
LL | a.use_mut();
- | - first borrow later used here
+ | ----------- first borrow later used here
error: aborting due to 6 previous errors
diff --git a/src/test/ui/borrowck/borrowck-argument.stderr b/src/test/ui/borrowck/borrowck-argument.stderr
index cf158331409..d4d646e390c 100644
--- a/src/test/ui/borrowck/borrowck-argument.stderr
+++ b/src/test/ui/borrowck/borrowck-argument.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable
LL | fn func(arg: S) {
| --- help: consider changing this to be mutable: `mut arg`
LL | arg.mutate();
- | ^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^ cannot borrow as mutable
error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable
--> $DIR/borrowck-argument.rs:15:9
@@ -12,7 +12,7 @@ error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable
LL | fn method(&self, arg: S) {
| --- help: consider changing this to be mutable: `mut arg`
LL | arg.mutate();
- | ^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^ cannot borrow as mutable
error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable
--> $DIR/borrowck-argument.rs:21:9
@@ -20,13 +20,13 @@ error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable
LL | fn default(&self, arg: S) {
| --- help: consider changing this to be mutable: `mut arg`
LL | arg.mutate();
- | ^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^ cannot borrow as mutable
error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable
--> $DIR/borrowck-argument.rs:32:17
|
LL | (|arg: S| { arg.mutate() })(s);
- | --- ^^^ cannot borrow as mutable
+ | --- ^^^^^^^^^^^^ cannot borrow as mutable
| |
| help: consider changing this to be mutable: `mut arg`
diff --git a/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr b/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr
index 3ed76c13f6a..186ecddd6d6 100644
--- a/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr
+++ b/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
LL | let x = Foo { x: 3 };
| - help: consider changing this to be mutable: `mut x`
LL | x.printme();
- | ^ cannot borrow as mutable
+ | ^^^^^^^^^^^ cannot borrow as mutable
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr b/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr
index 7d7e305a31f..017a1d7f5d5 100644
--- a/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr
+++ b/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow `*a` as mutable, as `a` is not declared as mutable
LL | let a: Box<_> = box A;
| - help: consider changing this to be mutable: `mut a`
LL | a.foo();
- | ^ cannot borrow as mutable
+ | ^^^^^^^ cannot borrow as mutable
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.stderr b/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.stderr
index fa0ae318e72..42b6c34cd2f 100644
--- a/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.stderr
+++ b/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.stderr
@@ -2,11 +2,11 @@ error[E0499]: cannot borrow `*x` as mutable more than once at a time
--> $DIR/borrowck-borrow-mut-object-twice.rs:13:5
|
LL | let y = x.f1();
- | - first mutable borrow occurs here
+ | ------ first mutable borrow occurs here
LL | x.f2();
- | ^ second mutable borrow occurs here
+ | ^^^^^^ second mutable borrow occurs here
LL | y.use_ref();
- | - first borrow later used here
+ | ----------- first borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr b/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr
index 426d5bc4726..fdf6568d839 100644
--- a/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr
+++ b/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr
@@ -58,7 +58,7 @@ error[E0596]: cannot borrow data in an `Rc` as mutable
--> $DIR/borrowck-borrow-overloaded-auto-deref.rs:72:5
|
LL | x.set(0, 0);
- | ^ cannot borrow as mutable
+ | ^^^^^^^^^^^ cannot borrow as mutable
|
= help: trait `DerefMut` is required to modify through a dereference, but it is not implemented for `Rc<Point>`
@@ -66,7 +66,7 @@ error[E0596]: cannot borrow data in an `Rc` as mutable
--> $DIR/borrowck-borrow-overloaded-auto-deref.rs:76:5
|
LL | x.set(0, 0);
- | ^ cannot borrow as mutable
+ | ^^^^^^^^^^^ cannot borrow as mutable
|
= help: trait `DerefMut` is required to modify through a dereference, but it is not implemented for `Rc<Point>`
@@ -74,7 +74,7 @@ error[E0596]: cannot borrow data in an `Rc` as mutable
--> $DIR/borrowck-borrow-overloaded-auto-deref.rs:84:5
|
LL | x.y_mut()
- | ^ cannot borrow as mutable
+ | ^^^^^^^^^ cannot borrow as mutable
|
= help: trait `DerefMut` is required to modify through a dereference, but it is not implemented for `Rc<Point>`
@@ -82,7 +82,7 @@ error[E0596]: cannot borrow data in an `Rc` as mutable
--> $DIR/borrowck-borrow-overloaded-auto-deref.rs:88:5
|
LL | x.y_mut()
- | ^ cannot borrow as mutable
+ | ^^^^^^^^^ cannot borrow as mutable
|
= help: trait `DerefMut` is required to modify through a dereference, but it is not implemented for `Rc<Point>`
@@ -90,7 +90,7 @@ error[E0596]: cannot borrow data in an `Rc` as mutable
--> $DIR/borrowck-borrow-overloaded-auto-deref.rs:92:6
|
LL | *x.y_mut() = 3;
- | ^ cannot borrow as mutable
+ | ^^^^^^^^^ cannot borrow as mutable
|
= help: trait `DerefMut` is required to modify through a dereference, but it is not implemented for `Rc<Point>`
@@ -98,7 +98,7 @@ error[E0596]: cannot borrow data in an `Rc` as mutable
--> $DIR/borrowck-borrow-overloaded-auto-deref.rs:96:6
|
LL | *x.y_mut() = 3;
- | ^ cannot borrow as mutable
+ | ^^^^^^^^^ cannot borrow as mutable
|
= help: trait `DerefMut` is required to modify through a dereference, but it is not implemented for `Rc<Point>`
@@ -106,7 +106,7 @@ error[E0596]: cannot borrow data in an `Rc` as mutable
--> $DIR/borrowck-borrow-overloaded-auto-deref.rs:100:6
|
LL | *x.y_mut() = 3;
- | ^ cannot borrow as mutable
+ | ^^^^^^^^^ cannot borrow as mutable
|
= help: trait `DerefMut` is required to modify through a dereference, but it is not implemented for `Rc<Point>`
diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr
index c91a4377b4c..01379ed8512 100644
--- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr
+++ b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr
@@ -7,7 +7,7 @@ LL | buggy_map.insert(42, &*Box::new(1));
| creates a temporary which is freed while still in use
...
LL | buggy_map.insert(43, &*tmp);
- | --------- borrow later used here
+ | --------------------------- borrow later used here
|
= note: consider using a `let` binding to create a longer lived value
diff --git a/src/test/ui/borrowck/borrowck-closures-unique-imm.stderr b/src/test/ui/borrowck/borrowck-closures-unique-imm.stderr
index b8bbb31a355..0c5fd39b718 100644
--- a/src/test/ui/borrowck/borrowck-closures-unique-imm.stderr
+++ b/src/test/ui/borrowck/borrowck-closures-unique-imm.stderr
@@ -6,7 +6,7 @@ LL | let p = &this.x;
LL | &mut this.x;
| ^^^^^^^^^^^ mutable borrow occurs here
LL | p.use_ref();
- | - immutable borrow later used here
+ | ----------- immutable borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.stderr b/src/test/ui/borrowck/borrowck-describe-lvalue.stderr
index 4b9c5a2a98f..f909dbc4082 100644
--- a/src/test/ui/borrowck/borrowck-describe-lvalue.stderr
+++ b/src/test/ui/borrowck/borrowck-describe-lvalue.stderr
@@ -41,7 +41,7 @@ error[E0503]: cannot use `f.x` because it was mutably borrowed
--> $DIR/borrowck-describe-lvalue.rs:37:9
|
LL | let x = f.x();
- | - borrow of `f` occurs here
+ | ----- borrow of `f` occurs here
LL | f.x;
| ^^^ use of borrowed `f`
LL | drop(x);
@@ -51,7 +51,7 @@ error[E0503]: cannot use `g.0` because it was mutably borrowed
--> $DIR/borrowck-describe-lvalue.rs:44:9
|
LL | let x = g.x();
- | - borrow of `g` occurs here
+ | ----- borrow of `g` occurs here
LL | g.0;
| ^^^ use of borrowed `g`
LL | drop(x);
@@ -71,7 +71,7 @@ error[E0503]: cannot use `e.0` because it was mutably borrowed
--> $DIR/borrowck-describe-lvalue.rs:59:20
|
LL | let x = e.x();
- | - borrow of `e` occurs here
+ | ----- borrow of `e` occurs here
LL | match e {
LL | Baz::X(value) => value
| ^^^^^ use of borrowed `e`
@@ -93,7 +93,7 @@ error[E0503]: cannot use `f.x` because it was mutably borrowed
--> $DIR/borrowck-describe-lvalue.rs:74:9
|
LL | let x = f.x();
- | - borrow of `*f` occurs here
+ | ----- borrow of `*f` occurs here
LL | f.x;
| ^^^ use of borrowed `*f`
LL | drop(x);
@@ -103,7 +103,7 @@ error[E0503]: cannot use `g.0` because it was mutably borrowed
--> $DIR/borrowck-describe-lvalue.rs:81:9
|
LL | let x = g.x();
- | - borrow of `*g` occurs here
+ | ----- borrow of `*g` occurs here
LL | g.0;
| ^^^ use of borrowed `*g`
LL | drop(x);
@@ -123,7 +123,7 @@ error[E0503]: cannot use `e.0` because it was mutably borrowed
--> $DIR/borrowck-describe-lvalue.rs:96:20
|
LL | let x = e.x();
- | - borrow of `*e` occurs here
+ | ----- borrow of `*e` occurs here
LL | match *e {
LL | Baz::X(value) => value
| ^^^^^ use of borrowed `*e`
diff --git a/src/test/ui/borrowck/borrowck-for-loop-head-linkage.nll.stderr b/src/test/ui/borrowck/borrowck-for-loop-head-linkage.nll.stderr
deleted file mode 100644
index 3468f29fb1a..00000000000
--- a/src/test/ui/borrowck/borrowck-for-loop-head-linkage.nll.stderr
+++ /dev/null
@@ -1,27 +0,0 @@
-error[E0502]: cannot borrow `vector` as mutable because it is also borrowed as immutable
- --> $DIR/borrowck-for-loop-head-linkage.rs:7:9
- |
-LL | for &x in &vector {
- | -------
- | |
- | immutable borrow occurs here
- | immutable borrow later used here
-LL | let cap = vector.capacity();
-LL | vector.extend(repeat(0));
- | ^^^^^^ mutable borrow occurs here
-
-error[E0502]: cannot borrow `vector` as mutable because it is also borrowed as immutable
- --> $DIR/borrowck-for-loop-head-linkage.rs:8:9
- |
-LL | for &x in &vector {
- | -------
- | |
- | immutable borrow occurs here
- | immutable borrow later used here
-...
-LL | vector[1] = 5;
- | ^^^^^^ mutable borrow occurs here
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/borrowck/borrowck-insert-during-each.stderr b/src/test/ui/borrowck/borrowck-insert-during-each.stderr
index a1ac45795fa..99d08e905d5 100644
--- a/src/test/ui/borrowck/borrowck-insert-during-each.stderr
+++ b/src/test/ui/borrowck/borrowck-insert-during-each.stderr
@@ -16,15 +16,17 @@ LL | | })
error[E0500]: closure requires unique access to `f` but it is already borrowed
--> $DIR/borrowck-insert-during-each.rs:18:9
|
-LL | f.foo(
- | - --- first borrow later used by call
- | |
- | borrow occurs here
-LL |
-LL | |a| {
- | ^^^ closure construction occurs here
-LL | f.n.insert(*a);
- | --- second borrow occurs due to use of `f` in closure
+LL | f.foo(
+ | - --- first borrow later used by call
+ | _____|
+ | |
+LL | |
+LL | | |a| {
+ | | ^^^ closure construction occurs here
+LL | | f.n.insert(*a);
+ | | --- second borrow occurs due to use of `f` in closure
+LL | | })
+ | |__________- borrow occurs here
error: aborting due to 2 previous errors
diff --git a/src/test/ui/borrowck/borrowck-issue-2657-1.stderr b/src/test/ui/borrowck/borrowck-issue-2657-1.stderr
index 4ea4eb8f007..390bb9384f8 100644
--- a/src/test/ui/borrowck/borrowck-issue-2657-1.stderr
+++ b/src/test/ui/borrowck/borrowck-issue-2657-1.stderr
@@ -6,7 +6,7 @@ LL | Some(ref _y) => {
LL | let _a = x;
| ^ move out of `x` occurs here
LL | _y.use_ref();
- | -- borrow later used here
+ | ------------ borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-lend-flow-if.stderr b/src/test/ui/borrowck/borrowck-lend-flow-if.stderr
index 68a82bdb57c..e47efc0e0b3 100644
--- a/src/test/ui/borrowck/borrowck-lend-flow-if.stderr
+++ b/src/test/ui/borrowck/borrowck-lend-flow-if.stderr
@@ -7,7 +7,7 @@ LL | }
LL | borrow_mut(&mut *v);
| ^^^^^^^ mutable borrow occurs here
LL | _w.use_ref();
- | -- immutable borrow later used here
+ | ------------ immutable borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-lend-flow.stderr b/src/test/ui/borrowck/borrowck-lend-flow.stderr
index 07b11b3e728..40c14f54cb8 100644
--- a/src/test/ui/borrowck/borrowck-lend-flow.stderr
+++ b/src/test/ui/borrowck/borrowck-lend-flow.stderr
@@ -6,7 +6,7 @@ LL | let _w = &v;
LL | borrow_mut(&mut *v);
| ^^^^^^^ mutable borrow occurs here
LL | _w.use_ref();
- | -- immutable borrow later used here
+ | ------------ immutable borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.stderr b/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.stderr
index ac25502ad05..3548da35b61 100644
--- a/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.stderr
+++ b/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.stderr
@@ -10,7 +10,7 @@ LL | println!("v={}", *v);
| -- move occurs due to use in closure
LL | });
LL | w.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0505]: cannot move out of `v` because it is borrowed
--> $DIR/borrowck-loan-blocks-move-cc.rs:24:19
@@ -24,7 +24,7 @@ LL | println!("v={}", *v);
| -- move occurs due to use in closure
LL | });
LL | w.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error: aborting due to 2 previous errors
diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-move.stderr b/src/test/ui/borrowck/borrowck-loan-blocks-move.stderr
index 615660febbc..b5c6b101f76 100644
--- a/src/test/ui/borrowck/borrowck-loan-blocks-move.stderr
+++ b/src/test/ui/borrowck/borrowck-loan-blocks-move.stderr
@@ -6,7 +6,7 @@ LL | let w = &v;
LL | take(v);
| ^ move out of `v` occurs here
LL | w.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.stderr b/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.stderr
index 095ae7f56b2..668f9fa5d36 100644
--- a/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.stderr
+++ b/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.stderr
@@ -4,7 +4,7 @@ error[E0382]: borrow of moved value: `x`
LL | let x = Foo(box 3);
| - move occurs because `x` has type `Foo`, which does not implement the `Copy` trait
LL | let _y = {x} + x.clone(); // the `{x}` forces a move to occur
- | - ^ value borrowed here after move
+ | - ^^^^^^^^^ value borrowed here after move
| |
| value moved here
diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr
index aa874c34a22..1d8d04c9181 100644
--- a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr
+++ b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr
@@ -17,7 +17,7 @@ LL | let q = &mut p;
| ------ mutable borrow occurs here
...
LL | p.times(3);
- | ^ immutable borrow occurs here
+ | ^^^^^^^^^^ immutable borrow occurs here
LL |
LL | *q + 3; // OK to use the new alias `q`
| -- mutable borrow later used here
diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr.stderr b/src/test/ui/borrowck/borrowck-loan-rcvr.stderr
index 489ec7d04ed..74cad575d27 100644
--- a/src/test/ui/borrowck/borrowck-loan-rcvr.stderr
+++ b/src/test/ui/borrowck/borrowck-loan-rcvr.stderr
@@ -1,13 +1,15 @@
error[E0502]: cannot borrow `p` as mutable because it is also borrowed as immutable
--> $DIR/borrowck-loan-rcvr.rs:23:14
|
-LL | p.blockm(|| {
- | - ------ ^^ mutable borrow occurs here
- | | |
- | | immutable borrow later used by call
- | immutable borrow occurs here
-LL | p.x = 10;
- | --- second borrow occurs due to use of `p` in closure
+LL | p.blockm(|| {
+ | - ------ ^^ mutable borrow occurs here
+ | | |
+ | _____| immutable borrow later used by call
+ | |
+LL | | p.x = 10;
+ | | --- second borrow occurs due to use of `p` in closure
+LL | | })
+ | |______- immutable borrow occurs here
error[E0502]: cannot borrow `p` as immutable because it is also borrowed as mutable
--> $DIR/borrowck-loan-rcvr.rs:34:5
@@ -15,7 +17,7 @@ error[E0502]: cannot borrow `p` as immutable because it is also borrowed as muta
LL | let l = &mut p;
| ------ mutable borrow occurs here
LL | p.impurem();
- | ^ immutable borrow occurs here
+ | ^^^^^^^^^^^ immutable borrow occurs here
LL |
LL | l.x += 1;
| -------- mutable borrow later used here
diff --git a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr b/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr
index e4840fba672..b305e3c0a16 100644
--- a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr
+++ b/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr
@@ -7,7 +7,7 @@ LL |
LL | let z = *a;
| ^^ move out of `*a` occurs here
LL | b.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.stderr b/src/test/ui/borrowck/borrowck-move-mut-base-ptr.stderr
index 77f5b72e51c..d5ff0c501c4 100644
--- a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.stderr
+++ b/src/test/ui/borrowck/borrowck-move-mut-base-ptr.stderr
@@ -7,7 +7,7 @@ LL | let t1 = t0;
| ^^ move out of `t0` occurs here
LL | *t1 = 22;
LL | p.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.stderr b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.stderr
index 0a29d2bb1d5..79745065070 100644
--- a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.stderr
+++ b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.stderr
@@ -2,7 +2,7 @@ error[E0507]: cannot move out of an `Rc`
--> $DIR/borrowck-move-out-of-overloaded-auto-deref.rs:4:14
|
LL | let _x = Rc::new(vec![1, 2]).into_iter();
- | ^^^^^^^^^^^^^^^^^^^ move occurs because value has type `Vec<i32>`, which does not implement the `Copy` trait
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ move occurs because value has type `Vec<i32>`, which does not implement the `Copy` trait
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.stderr b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.stderr
index a4090777939..15ac737606d 100644
--- a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.stderr
+++ b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.stderr
@@ -5,8 +5,9 @@ LL | 1 => { addr.push(&mut x); }
| ^^^^^^ second mutable borrow occurs here
LL | 2 => { addr.push(&mut x); }
LL | _ => { addr.push(&mut x); }
- | ---- ------ first mutable borrow occurs here
- | |
+ | -----------------
+ | | |
+ | | first mutable borrow occurs here
| first borrow later used here
error[E0499]: cannot borrow `x` as mutable more than once at a time
@@ -15,8 +16,9 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time
LL | 2 => { addr.push(&mut x); }
| ^^^^^^ second mutable borrow occurs here
LL | _ => { addr.push(&mut x); }
- | ---- ------ first mutable borrow occurs here
- | |
+ | -----------------
+ | | |
+ | | first mutable borrow occurs here
| first borrow later used here
error[E0499]: cannot borrow `x` as mutable more than once at a time
diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr b/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr
index f2baee09376..ef811b84905 100644
--- a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr
+++ b/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr
@@ -7,7 +7,7 @@ LL | let mut t2 = &mut t0;
| ^^^^^^^ mutable borrow occurs here
LL | **t2 += 1; // Mutates `*t0`
LL | p.use_ref();
- | - immutable borrow later used here
+ | ----------- immutable borrow later used here
error[E0499]: cannot borrow `t0` as mutable more than once at a time
--> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:19:18
@@ -18,7 +18,7 @@ LL | let mut t2 = &mut t0;
| ^^^^^^^ second mutable borrow occurs here
LL | **t2 += 1; // Mutates `*t0` but not through `*p`
LL | p.use_mut();
- | - first borrow later used here
+ | ----------- first borrow later used here
error: aborting due to 2 previous errors
diff --git a/src/test/ui/borrowck/borrowck-object-lifetime.nll.stderr b/src/test/ui/borrowck/borrowck-object-lifetime.nll.stderr
deleted file mode 100644
index 49c3f861ea9..00000000000
--- a/src/test/ui/borrowck/borrowck-object-lifetime.nll.stderr
+++ /dev/null
@@ -1,23 +0,0 @@
-error[E0502]: cannot borrow `*x` as mutable because it is also borrowed as immutable
- --> $DIR/borrowck-object-lifetime.rs:20:13
- |
-LL | let y = x.borrowed();
- | - immutable borrow occurs here
-LL | let z = x.mut_borrowed();
- | ^ mutable borrow occurs here
-LL | y.use_ref();
- | - immutable borrow later used here
-
-error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
- --> $DIR/borrowck-object-lifetime.rs:26:13
- |
-LL | let y = x.borrowed();
- | - immutable borrow occurs here
-LL | let z = &mut x;
- | ^^^^^^ mutable borrow occurs here
-LL | y.use_ref();
- | - immutable borrow later used here
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/borrowck/borrowck-object-lifetime.stderr b/src/test/ui/borrowck/borrowck-object-lifetime.stderr
index cf94c74dec2..215ed760ae1 100644
--- a/src/test/ui/borrowck/borrowck-object-lifetime.stderr
+++ b/src/test/ui/borrowck/borrowck-object-lifetime.stderr
@@ -2,21 +2,21 @@ error[E0502]: cannot borrow `*x` as mutable because it is also borrowed as immut
--> $DIR/borrowck-object-lifetime.rs:20:13
|
LL | let y = x.borrowed();
- | - immutable borrow occurs here
+ | ------------ immutable borrow occurs here
LL | let z = x.mut_borrowed();
| ^^^^^^^^^^^^^^^^ mutable borrow occurs here
LL | y.use_ref();
- | - immutable borrow later used here
+ | ----------- immutable borrow later used here
error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
--> $DIR/borrowck-object-lifetime.rs:26:13
|
LL | let y = x.borrowed();
- | - immutable borrow occurs here
+ | ------------ immutable borrow occurs here
LL | let z = &mut x;
| ^^^^^^ mutable borrow occurs here
LL | y.use_ref();
- | - immutable borrow later used here
+ | ----------- immutable borrow later used here
error: aborting due to 2 previous errors
diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.stderr
index 978e1291722..087f2ac799e 100644
--- a/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.stderr
+++ b/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.stderr
@@ -6,7 +6,7 @@ LL | let p = &mut f[&s];
LL | let q = &f[&s];
| ^ immutable borrow occurs here
LL | p.use_mut();
- | - mutable borrow later used here
+ | ----------- mutable borrow later used here
error[E0499]: cannot borrow `*f` as mutable more than once at a time
--> $DIR/borrowck-overloaded-index-autoderef.rs:43:18
@@ -16,7 +16,7 @@ LL | let p = &mut f[&s];
LL | let q = &mut f[&s];
| ^ second mutable borrow occurs here
LL | p.use_mut();
- | - first borrow later used here
+ | ----------- first borrow later used here
error[E0499]: cannot borrow `f.foo` as mutable more than once at a time
--> $DIR/borrowck-overloaded-index-autoderef.rs:53:18
@@ -26,7 +26,7 @@ LL | let p = &mut f.foo[&s];
LL | let q = &mut f.foo[&s];
| ^^^^^ second mutable borrow occurs here
LL | p.use_mut();
- | - first borrow later used here
+ | ----------- first borrow later used here
error[E0502]: cannot borrow `f.foo` as mutable because it is also borrowed as immutable
--> $DIR/borrowck-overloaded-index-autoderef.rs:65:18
@@ -36,7 +36,7 @@ LL | let p = &f.foo[&s];
LL | let q = &mut f.foo[&s];
| ^^^^^ mutable borrow occurs here
LL | p.use_ref();
- | - immutable borrow later used here
+ | ----------- immutable borrow later used here
error[E0506]: cannot assign to `f.foo` because it is borrowed
--> $DIR/borrowck-overloaded-index-autoderef.rs:71:5
@@ -46,7 +46,7 @@ LL | let p = &f.foo[&s];
LL | f.foo = g;
| ^^^^^^^^^ assignment to borrowed `f.foo` occurs here
LL | p.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0506]: cannot assign to `*f` because it is borrowed
--> $DIR/borrowck-overloaded-index-autoderef.rs:77:5
@@ -56,7 +56,7 @@ LL | let p = &f.foo[&s];
LL | *f = g;
| ^^^^^^ assignment to borrowed `*f` occurs here
LL | p.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0506]: cannot assign to `f.foo` because it is borrowed
--> $DIR/borrowck-overloaded-index-autoderef.rs:83:5
@@ -66,7 +66,7 @@ LL | let p = &mut f.foo[&s];
LL | f.foo = g;
| ^^^^^^^^^ assignment to borrowed `f.foo` occurs here
LL | p.use_mut();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0506]: cannot assign to `*f` because it is borrowed
--> $DIR/borrowck-overloaded-index-autoderef.rs:89:5
@@ -76,7 +76,7 @@ LL | let p = &mut f.foo[&s];
LL | *f = g;
| ^^^^^^ assignment to borrowed `*f` occurs here
LL | p.use_mut();
- | - borrow later used here
+ | ----------- borrow later used here
error: aborting due to 8 previous errors
diff --git a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr b/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr
index db73d4c04ac..d05996413dd 100644
--- a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr
+++ b/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr
@@ -8,7 +8,7 @@ LL | let z = &x;
| ^^ immutable borrow occurs here
...
LL | y.use_mut();
- | - mutable borrow later used here
+ | ----------- mutable borrow later used here
error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
--> $DIR/borrowck-report-with-custom-diagnostic.rs:21:21
@@ -20,7 +20,7 @@ LL | let z = &mut x;
| ^^^^^^ mutable borrow occurs here
...
LL | y.use_ref();
- | - immutable borrow later used here
+ | ----------- immutable borrow later used here
error[E0499]: cannot borrow `x` as mutable more than once at a time
--> $DIR/borrowck-report-with-custom-diagnostic.rs:36:17
@@ -32,7 +32,7 @@ LL | let z = &mut x;
| ^^^^^^ second mutable borrow occurs here
...
LL | y.use_mut();
- | - first borrow later used here
+ | ----------- first borrow later used here
error: aborting due to 3 previous errors
diff --git a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.stderr b/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.stderr
index 1c55953c91f..b39215b9aab 100644
--- a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.stderr
+++ b/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.stderr
@@ -7,7 +7,7 @@ LL | swap(&mut t0, &mut t1);
| ^^^^^^^ mutable borrow occurs here
LL | *t1 = 22;
LL | p.use_ref();
- | - immutable borrow later used here
+ | ----------- immutable borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-union-borrow-nested.stderr b/src/test/ui/borrowck/borrowck-union-borrow-nested.stderr
index 61569b9cac1..4bd7d54cffe 100644
--- a/src/test/ui/borrowck/borrowck-union-borrow-nested.stderr
+++ b/src/test/ui/borrowck/borrowck-union-borrow-nested.stderr
@@ -6,7 +6,7 @@ LL | let ra = &mut u.s.a;
LL | let b = u.c;
| ^^^ use of borrowed `u.s.a`
LL | ra.use_mut();
- | -- borrow later used here
+ | ------------ borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-uniq-via-lend.stderr b/src/test/ui/borrowck/borrowck-uniq-via-lend.stderr
index 923edc8edae..6dbe4c74b58 100644
--- a/src/test/ui/borrowck/borrowck-uniq-via-lend.stderr
+++ b/src/test/ui/borrowck/borrowck-uniq-via-lend.stderr
@@ -6,7 +6,7 @@ LL | let w = &mut v;
LL | borrow(&*v);
| ^^^ immutable borrow occurs here
LL | w.use_mut();
- | - mutable borrow later used here
+ | ----------- mutable borrow later used here
error[E0502]: cannot borrow `*v` as immutable because it is also borrowed as mutable
--> $DIR/borrowck-uniq-via-lend.rs:53:12
@@ -16,7 +16,7 @@ LL | x = &mut v;
LL | borrow(&*v);
| ^^^ immutable borrow occurs here
LL | x.use_mut();
- | - mutable borrow later used here
+ | ----------- mutable borrow later used here
error: aborting due to 2 previous errors
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr
index 5141fcc1bb2..eb0f24b9b7a 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr
+++ b/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr
@@ -5,8 +5,9 @@ LL | let vb: &mut [isize] = &mut v;
| ------ first mutable borrow occurs here
...
LL | v.push(tail[0] + tail[1]);
- | ^ ------- first borrow later used here
- | |
+ | ^^^^^^^-------^^^^^^^^^^^
+ | | |
+ | | first borrow later used here
| second mutable borrow occurs here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr
index 36f8f5c9ad7..8886e3fec2e 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr
+++ b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr
@@ -8,7 +8,7 @@ LL | vec[0] = box 4;
| ^^^^^^ assignment to borrowed `vec[_]` occurs here
LL |
LL | _a.use_ref();
- | -- borrow later used here
+ | ------------ borrow later used here
error[E0506]: cannot assign to `vec[_]` because it is borrowed
--> $DIR/borrowck-vec-pattern-nesting.rs:23:13
@@ -20,7 +20,7 @@ LL | vec[0] = box 4;
| ^^^^^^ assignment to borrowed `vec[_]` occurs here
LL |
LL | _b.use_ref();
- | -- borrow later used here
+ | ------------ borrow later used here
error[E0508]: cannot move out of type `[Box<isize>]`, a non-copy slice
--> $DIR/borrowck-vec-pattern-nesting.rs:34:11
diff --git a/src/test/ui/borrowck/index-mut-help-with-impl.stderr b/src/test/ui/borrowck/index-mut-help-with-impl.stderr
index 89391f4099a..69dca7e7b56 100644
--- a/src/test/ui/borrowck/index-mut-help-with-impl.stderr
+++ b/src/test/ui/borrowck/index-mut-help-with-impl.stderr
@@ -2,7 +2,7 @@ error[E0596]: cannot borrow data in a `&` reference as mutable
--> $DIR/index-mut-help-with-impl.rs:9:5
|
LL | Index::index(&v, 1..2).make_ascii_uppercase();
- | ^^^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/index-mut-help.stderr b/src/test/ui/borrowck/index-mut-help.stderr
index 52b9ad496e5..057c6ee15f3 100644
--- a/src/test/ui/borrowck/index-mut-help.stderr
+++ b/src/test/ui/borrowck/index-mut-help.stderr
@@ -2,7 +2,7 @@ error[E0596]: cannot borrow data in an index of `HashMap<&str, String>` as mutab
--> $DIR/index-mut-help.rs:11:5
|
LL | map["peter"].clear();
- | ^^^^^^^^^^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
|
= help: trait `IndexMut` is required to modify indexed content, but it is not implemented for `HashMap<&str, String>`
diff --git a/src/test/ui/borrowck/issue-42344.stderr b/src/test/ui/borrowck/issue-42344.stderr
index 5cffa1b5121..29b4c8c38d7 100644
--- a/src/test/ui/borrowck/issue-42344.stderr
+++ b/src/test/ui/borrowck/issue-42344.stderr
@@ -2,7 +2,7 @@ error[E0596]: cannot borrow `*TAB[_]` as mutable, as `TAB` is an immutable stati
--> $DIR/issue-42344.rs:4:5
|
LL | TAB[0].iter_mut();
- | ^^^^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^^^^ cannot borrow as mutable
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/issue-51117.stderr b/src/test/ui/borrowck/issue-51117.stderr
index f8a9608ad37..ef1a16ea953 100644
--- a/src/test/ui/borrowck/issue-51117.stderr
+++ b/src/test/ui/borrowck/issue-51117.stderr
@@ -4,7 +4,7 @@ error[E0499]: cannot borrow `*bar` as mutable more than once at a time
LL | Some(baz) => {
| --- first mutable borrow occurs here
LL | bar.take();
- | ^^^ second mutable borrow occurs here
+ | ^^^^^^^^^^ second mutable borrow occurs here
LL | drop(baz);
| --- first borrow later used here
diff --git a/src/test/ui/borrowck/issue-81365-10.stderr b/src/test/ui/borrowck/issue-81365-10.stderr
index 891f70ed7f6..27123ef2be1 100644
--- a/src/test/ui/borrowck/issue-81365-10.stderr
+++ b/src/test/ui/borrowck/issue-81365-10.stderr
@@ -2,7 +2,7 @@ error[E0506]: cannot assign to `self.container_field` because it is borrowed
--> $DIR/issue-81365-10.rs:21:9
|
LL | let first = &self.deref().target_field;
- | ---- borrow of `self.container_field` occurs here
+ | ------------ borrow of `self.container_field` occurs here
LL | self.container_field = true;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.container_field` occurs here
LL | first;
diff --git a/src/test/ui/borrowck/issue-81365-5.stderr b/src/test/ui/borrowck/issue-81365-5.stderr
index 7c0e9f43bd0..8201894c6db 100644
--- a/src/test/ui/borrowck/issue-81365-5.stderr
+++ b/src/test/ui/borrowck/issue-81365-5.stderr
@@ -2,7 +2,7 @@ error[E0506]: cannot assign to `self.container_field` because it is borrowed
--> $DIR/issue-81365-5.rs:28:9
|
LL | let first = self.get();
- | ---- borrow of `self.container_field` occurs here
+ | ---------- borrow of `self.container_field` occurs here
LL | self.container_field = true;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.container_field` occurs here
LL | first;
diff --git a/src/test/ui/borrowck/issue-82032.stderr b/src/test/ui/borrowck/issue-82032.stderr
index f272477a9f5..25f343117a3 100644
--- a/src/test/ui/borrowck/issue-82032.stderr
+++ b/src/test/ui/borrowck/issue-82032.stderr
@@ -7,7 +7,7 @@ LL | for v in self.0.values() {
| | help: use mutable method: `values_mut()`
| this iterator yields `&` references
LL | v.flush();
- | ^ `v` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^ `v` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/issue-82462.nll.stderr b/src/test/ui/borrowck/issue-82462.nll.stderr
deleted file mode 100644
index 10497c30e64..00000000000
--- a/src/test/ui/borrowck/issue-82462.nll.stderr
+++ /dev/null
@@ -1,22 +0,0 @@
-error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
- --> $DIR/issue-82462.rs:18:9
- |
-LL | for x in DroppingSlice(&*v).iter() {
- | ------------------
- | | |
- | | immutable borrow occurs here
- | a temporary with access to the immutable borrow is created here ...
-LL | v.push(*x);
- | ^ mutable borrow occurs here
-LL | break;
-LL | }
- | - ... and the immutable borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `DroppingSlice`
- |
-help: consider adding semicolon after the expression so its temporaries are dropped sooner, before the local variables declared by the block are dropped
- |
-LL | };
- | +
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/borrowck/issue-85581.stderr b/src/test/ui/borrowck/issue-85581.stderr
index 29c0429f2a0..59ca4867fd7 100644
--- a/src/test/ui/borrowck/issue-85581.stderr
+++ b/src/test/ui/borrowck/issue-85581.stderr
@@ -7,7 +7,7 @@ LL | match heap.peek_mut() {
| first mutable borrow occurs here
| a temporary with access to the first borrow is created here ...
LL | Some(_) => { heap.pop(); },
- | ^^^^ second mutable borrow occurs here
+ | ^^^^^^^^^^ second mutable borrow occurs here
...
LL | }
| - ... and the first borrow might be used here, when that temporary is dropped and runs the destructor for type `Option<PeekMut<'_, i32>>`
diff --git a/src/test/ui/borrowck/issue-85765.stderr b/src/test/ui/borrowck/issue-85765.stderr
index af83c6ea6d9..80acaa7d21c 100644
--- a/src/test/ui/borrowck/issue-85765.stderr
+++ b/src/test/ui/borrowck/issue-85765.stderr
@@ -5,7 +5,7 @@ LL | let rofl: &Vec<Vec<i32>> = &mut test;
| ---- help: consider changing this to be a mutable reference: `&mut Vec<Vec<i32>>`
LL |
LL | rofl.push(Vec::new());
- | ^^^^ `rofl` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^^^^^^^^^^^^^ `rofl` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error[E0594]: cannot assign to `*r`, which is behind a `&` reference
--> $DIR/issue-85765.rs:12:5
diff --git a/src/test/ui/borrowck/mut-borrow-of-mut-ref.stderr b/src/test/ui/borrowck/mut-borrow-of-mut-ref.stderr
index e4c51bb77c9..2ffe7ff6413 100644
--- a/src/test/ui/borrowck/mut-borrow-of-mut-ref.stderr
+++ b/src/test/ui/borrowck/mut-borrow-of-mut-ref.stderr
@@ -53,7 +53,7 @@ error[E0596]: cannot borrow `f` as mutable, as it is not declared as mutable
--> $DIR/mut-borrow-of-mut-ref.rs:35:5
|
LL | f.bar();
- | ^ cannot borrow as mutable
+ | ^^^^^^^ cannot borrow as mutable
|
help: consider making the binding mutable
|
diff --git a/src/test/ui/borrowck/mut-borrow-outside-loop.stderr b/src/test/ui/borrowck/mut-borrow-outside-loop.stderr
index 4fcb693f1bf..e6895b27f35 100644
--- a/src/test/ui/borrowck/mut-borrow-outside-loop.stderr
+++ b/src/test/ui/borrowck/mut-borrow-outside-loop.stderr
@@ -6,7 +6,7 @@ LL | let first = &mut void;
LL | let second = &mut void;
| ^^^^^^^^^ second mutable borrow occurs here
LL | first.use_mut();
- | ----- first borrow later used here
+ | --------------- first borrow later used here
error[E0499]: cannot borrow `inner_void` as mutable more than once at a time
--> $DIR/mut-borrow-outside-loop.rs:15:28
@@ -17,7 +17,7 @@ LL | let inner_second = &mut inner_void;
| ^^^^^^^^^^^^^^^ second mutable borrow occurs here
LL | inner_second.use_mut();
LL | inner_first.use_mut();
- | ----------- first borrow later used here
+ | --------------------- first borrow later used here
error: aborting due to 2 previous errors
diff --git a/src/test/ui/borrowck/two-phase-across-loop.stderr b/src/test/ui/borrowck/two-phase-across-loop.stderr
index d4e515d12bb..95896c6bbf9 100644
--- a/src/test/ui/borrowck/two-phase-across-loop.stderr
+++ b/src/test/ui/borrowck/two-phase-across-loop.stderr
@@ -2,7 +2,7 @@ error[E0499]: cannot borrow `foo` as mutable more than once at a time
--> $DIR/two-phase-across-loop.rs:17:22
|
LL | strings.push(foo.get_string());
- | ^^^ `foo` was mutably borrowed here in the previous iteration of the loop
+ | ^^^^^^^^^^^^^^^^ `foo` was mutably borrowed here in the previous iteration of the loop
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr b/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr
index 9bfd8b994bf..a89bb941532 100644
--- a/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr
+++ b/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr
@@ -1,13 +1,18 @@
error[E0502]: cannot borrow `vec` as mutable because it is also borrowed as immutable
--> $DIR/two-phase-cannot-nest-mut-self-calls.rs:16:9
|
-LL | vec.get({
- | --- --- immutable borrow later used by call
- | |
- | immutable borrow occurs here
-LL |
-LL | vec.push(2);
- | ^^^ mutable borrow occurs here
+LL | vec.get({
+ | - --- immutable borrow later used by call
+ | _____|
+ | |
+LL | |
+LL | | vec.push(2);
+ | | ^^^^^^^^^^^ mutable borrow occurs here
+LL | |
+LL | |
+LL | | 0
+LL | | });
+ | |______- immutable borrow occurs here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/two-phase-multi-mut.stderr b/src/test/ui/borrowck/two-phase-multi-mut.stderr
index 33fa4a3a150..2e53e17a31b 100644
--- a/src/test/ui/borrowck/two-phase-multi-mut.stderr
+++ b/src/test/ui/borrowck/two-phase-multi-mut.stderr
@@ -12,8 +12,9 @@ error[E0499]: cannot borrow `foo` as mutable more than once at a time
--> $DIR/two-phase-multi-mut.rs:11:16
|
LL | foo.method(&mut foo);
- | --- ------ ^^^^^^^^ second mutable borrow occurs here
- | | |
+ | -----------^^^^^^^^-
+ | | | |
+ | | | second mutable borrow occurs here
| | first borrow later used by call
| first mutable borrow occurs here
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2015.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2015.stderr
index e4fceb197be..6cff53399ca 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2015.stderr
+++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2015.stderr
@@ -27,8 +27,9 @@ LL | let shared = &v;
| -- immutable borrow occurs here
LL |
LL | v.push(shared.len());
- | ^ ------ immutable borrow later used here
- | |
+ | ^^^^^^^------------^
+ | | |
+ | | immutable borrow later used here
| mutable borrow occurs here
|
= note: `#[warn(mutable_borrow_reservation_conflict)]` on by default
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2018.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2018.stderr
index e4fceb197be..6cff53399ca 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2018.stderr
+++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2018.stderr
@@ -27,8 +27,9 @@ LL | let shared = &v;
| -- immutable borrow occurs here
LL |
LL | v.push(shared.len());
- | ^ ------ immutable borrow later used here
- | |
+ | ^^^^^^^------------^
+ | | |
+ | | immutable borrow later used here
| mutable borrow occurs here
|
= note: `#[warn(mutable_borrow_reservation_conflict)]` on by default
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.nll2015.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.nll2015.stderr
index 52017394e89..0ae6fe78c6a 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.nll2015.stderr
+++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.nll2015.stderr
@@ -5,8 +5,9 @@ LL | let shared = &v;
| -- immutable borrow occurs here
LL |
LL | v.extend(shared);
- | ^ ------ immutable borrow later used here
- | |
+ | ^^^^^^^^^------^
+ | | |
+ | | immutable borrow later used here
| mutable borrow occurs here
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
@@ -26,8 +27,9 @@ LL | let shared = &v;
| -- immutable borrow occurs here
LL |
LL | v.push(shared.len());
- | ^ ------ immutable borrow later used here
- | |
+ | ^^^^^^^------------^
+ | | |
+ | | immutable borrow later used here
| mutable borrow occurs here
error: aborting due to 3 previous errors
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.nll2018.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.nll2018.stderr
index 52017394e89..0ae6fe78c6a 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.nll2018.stderr
+++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.nll2018.stderr
@@ -5,8 +5,9 @@ LL | let shared = &v;
| -- immutable borrow occurs here
LL |
LL | v.extend(shared);
- | ^ ------ immutable borrow later used here
- | |
+ | ^^^^^^^^^------^
+ | | |
+ | | immutable borrow later used here
| mutable borrow occurs here
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
@@ -26,8 +27,9 @@ LL | let shared = &v;
| -- immutable borrow occurs here
LL |
LL | v.push(shared.len());
- | ^ ------ immutable borrow later used here
- | |
+ | ^^^^^^^------------^
+ | | |
+ | | immutable borrow later used here
| mutable borrow occurs here
error: aborting due to 3 previous errors
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-future-compat-lint.nll.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-future-compat-lint.nll.stderr
index d2ea5ab2077..52e8de3c4ac 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-future-compat-lint.nll.stderr
+++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-future-compat-lint.nll.stderr
@@ -5,8 +5,9 @@ LL | let shared = &v;
| -- immutable borrow occurs here
LL |
LL | v.push(shared.len());
- | ^ ------ immutable borrow later used here
- | |
+ | ^^^^^^^------------^
+ | | |
+ | | immutable borrow later used here
| mutable borrow occurs here
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
@@ -16,8 +17,9 @@ LL | let shared = &v;
| -- immutable borrow occurs here
LL |
LL | v.push(shared.len());
- | ^ ------ immutable borrow later used here
- | |
+ | ^^^^^^^------------^
+ | | |
+ | | immutable borrow later used here
| mutable borrow occurs here
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
@@ -27,8 +29,9 @@ LL | let shared = &v;
| -- immutable borrow occurs here
LL |
LL | v.push(shared.len());
- | ^ ------ immutable borrow later used here
- | |
+ | ^^^^^^^------------^
+ | | |
+ | | immutable borrow later used here
| mutable borrow occurs here
error: aborting due to 3 previous errors
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-future-compat-lint.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-future-compat-lint.stderr
index 03f49d2d92f..aab21c9e78b 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-future-compat-lint.stderr
+++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-future-compat-lint.stderr
@@ -5,8 +5,9 @@ LL | let shared = &v;
| -- immutable borrow occurs here
LL |
LL | v.push(shared.len());
- | ^ ------ immutable borrow later used here
- | |
+ | ^^^^^^^------------^
+ | | |
+ | | immutable borrow later used here
| mutable borrow occurs here
|
note: the lint level is defined here
@@ -24,8 +25,9 @@ LL | let shared = &v;
| -- immutable borrow occurs here
LL |
LL | v.push(shared.len());
- | ^ ------ immutable borrow later used here
- | |
+ | ^^^^^^^------------^
+ | | |
+ | | immutable borrow later used here
| mutable borrow occurs here
|
note: the lint level is defined here
diff --git a/src/test/ui/borrowck/two-phase-sneaky.stderr b/src/test/ui/borrowck/two-phase-sneaky.stderr
index c66f3cbed91..cffbf0706fe 100644
--- a/src/test/ui/borrowck/two-phase-sneaky.stderr
+++ b/src/test/ui/borrowck/two-phase-sneaky.stderr
@@ -7,7 +7,7 @@ LL | v[0].push_str({
| first mutable borrow occurs here
LL |
LL | v.push(format!("foo"));
- | ^ second mutable borrow occurs here
+ | ^^^^^^^^^^^^^^^^^^^^^^ second mutable borrow occurs here
error: aborting due to previous error
diff --git a/src/test/ui/borrowck/two-phase-surprise-no-conflict.stderr b/src/test/ui/borrowck/two-phase-surprise-no-conflict.stderr
index 7d0e1566750..5a240d90011 100644
--- a/src/test/ui/borrowck/two-phase-surprise-no-conflict.stderr
+++ b/src/test/ui/borrowck/two-phase-surprise-no-conflict.stderr
@@ -13,7 +13,7 @@ error[E0502]: cannot borrow `*self` as mutable because it is also borrowed as im
--> $DIR/two-phase-surprise-no-conflict.rs:57:17
|
LL | self.hash_expr(&self.cx_mut.body(eid).value);
- | ^^^^^---------^^-----------^^^^^^^^^^^^^^^^^
+ | ^^^^^---------^^---------------------^^^^^^^
| | | |
| | | immutable borrow occurs here
| | immutable borrow later used by call
@@ -23,8 +23,9 @@ error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time
--> $DIR/two-phase-surprise-no-conflict.rs:119:51
|
LL | reg.register_static(Box::new(TrivialPass::new(&mut reg.sess_mut)));
- | --- --------------- ^^^^^^^^^^^^^^^^^ second mutable borrow occurs here
- | | |
+ | ----------------------------------------------^^^^^^^^^^^^^^^^^---
+ | | | |
+ | | | second mutable borrow occurs here
| | first borrow later used by call
| first mutable borrow occurs here
@@ -32,8 +33,9 @@ error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time
--> $DIR/two-phase-surprise-no-conflict.rs:122:54
|
LL | reg.register_bound(Box::new(TrivialPass::new_mut(&mut reg.sess_mut)));
- | --- -------------- ^^^^^^^^^^^^^^^^^ second mutable borrow occurs here
- | | |
+ | -------------------------------------------------^^^^^^^^^^^^^^^^^---
+ | | | |
+ | | | second mutable borrow occurs here
| | first borrow later used by call
| first mutable borrow occurs here
@@ -41,8 +43,9 @@ error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time
--> $DIR/two-phase-surprise-no-conflict.rs:125:53
|
LL | reg.register_univ(Box::new(TrivialPass::new_mut(&mut reg.sess_mut)));
- | --- ------------- ^^^^^^^^^^^^^^^^^ second mutable borrow occurs here
- | | |
+ | ------------------------------------------------^^^^^^^^^^^^^^^^^---
+ | | | |
+ | | | second mutable borrow occurs here
| | first borrow later used by call
| first mutable borrow occurs here
@@ -50,8 +53,9 @@ error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time
--> $DIR/two-phase-surprise-no-conflict.rs:128:44
|
LL | reg.register_ref(&TrivialPass::new_mut(&mut reg.sess_mut));
- | --- ------------ ^^^^^^^^^^^^^^^^^ second mutable borrow occurs here
- | | |
+ | ---------------------------------------^^^^^^^^^^^^^^^^^--
+ | | | |
+ | | | second mutable borrow occurs here
| | first borrow later used by call
| first mutable borrow occurs here
@@ -102,8 +106,9 @@ error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time
--> $DIR/two-phase-surprise-no-conflict.rs:154:54
|
LL | reg.register_bound(Box::new(CapturePass::new_mut(&mut reg.sess_mut)));
- | --- -------------- ^^^^^^^^^^^^^^^^^ second mutable borrow occurs here
- | | |
+ | -------------------------------------------------^^^^^^^^^^^^^^^^^---
+ | | | |
+ | | | second mutable borrow occurs here
| | first borrow later used by call
| first mutable borrow occurs here
@@ -124,8 +129,9 @@ error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time
--> $DIR/two-phase-surprise-no-conflict.rs:158:53
|
LL | reg.register_univ(Box::new(CapturePass::new_mut(&mut reg.sess_mut)));
- | --- ------------- ^^^^^^^^^^^^^^^^^ second mutable borrow occurs here
- | | |
+ | ------------------------------------------------^^^^^^^^^^^^^^^^^---
+ | | | |
+ | | | second mutable borrow occurs here
| | first borrow later used by call
| first mutable borrow occurs here
@@ -143,8 +149,9 @@ error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time
--> $DIR/two-phase-surprise-no-conflict.rs:162:44
|
LL | reg.register_ref(&CapturePass::new_mut(&mut reg.sess_mut));
- | --- ------------ ^^^^^^^^^^^^^^^^^ second mutable borrow occurs here
- | | |
+ | ---------------------------------------^^^^^^^^^^^^^^^^^--
+ | | | |
+ | | | second mutable borrow occurs here
| | first borrow later used by call
| first mutable borrow occurs here
diff --git a/src/test/ui/box/leak-alloc.stderr b/src/test/ui/box/leak-alloc.stderr
index 09beb181460..e8a6ad0995a 100644
--- a/src/test/ui/box/leak-alloc.stderr
+++ b/src/test/ui/box/leak-alloc.stderr
@@ -2,7 +2,7 @@ error[E0505]: cannot move out of `alloc` because it is borrowed
--> $DIR/leak-alloc.rs:26:10
|
LL | let boxed = Box::new_in(10, alloc.by_ref());
- | ----- borrow of `alloc` occurs here
+ | -------------- borrow of `alloc` occurs here
LL | let theref = Box::leak(boxed);
LL | drop(alloc);
| ^^^^^ move out of `alloc` occurs here
diff --git a/src/test/ui/cannot-mutate-captured-non-mut-var.stderr b/src/test/ui/cannot-mutate-captured-non-mut-var.stderr
index 2d6e83c9e82..06b5ca407db 100644
--- a/src/test/ui/cannot-mutate-captured-non-mut-var.stderr
+++ b/src/test/ui/cannot-mutate-captured-non-mut-var.stderr
@@ -12,7 +12,7 @@ error[E0596]: cannot borrow `s` as mutable, as it is not declared as mutable
LL | let s = std::io::stdin();
| - help: consider changing this to be mutable: `mut s`
LL | to_fn_once(move|| { s.read_to_end(&mut Vec::new()); });
- | ^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
error: aborting due to 2 previous errors
diff --git a/src/test/ui/codemap_tests/issue-11715.stderr b/src/test/ui/codemap_tests/issue-11715.stderr
index d0c29c768eb..a6b2b2e50a3 100644
--- a/src/test/ui/codemap_tests/issue-11715.stderr
+++ b/src/test/ui/codemap_tests/issue-11715.stderr
@@ -7,7 +7,7 @@ LL | let z = &mut x;
| ^^^^^^ second mutable borrow occurs here
LL | z.use_mut();
LL | y.use_mut();
- | - first borrow later used here
+ | ----------- first borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/codemap_tests/one_line.stderr b/src/test/ui/codemap_tests/one_line.stderr
index eddbd29c0ef..1ee612184de 100644
--- a/src/test/ui/codemap_tests/one_line.stderr
+++ b/src/test/ui/codemap_tests/one_line.stderr
@@ -2,8 +2,9 @@ error[E0499]: cannot borrow `v` as mutable more than once at a time
--> $DIR/one_line.rs:3:12
|
LL | v.push(v.pop().unwrap());
- | - ---- ^ second mutable borrow occurs here
- | | |
+ | -------^^^^^^^----------
+ | | | |
+ | | | second mutable borrow occurs here
| | first borrow later used by call
| first mutable borrow occurs here
diff --git a/src/test/ui/const-generics/issues/issue-67375.full.stderr b/src/test/ui/const-generics/issues/issue-67375.full.stderr
index d7b52063dc4..8c9672fd7fc 100644
--- a/src/test/ui/const-generics/issues/issue-67375.full.stderr
+++ b/src/test/ui/const-generics/issues/issue-67375.full.stderr
@@ -2,7 +2,7 @@ error: overly complex generic constant
--> $DIR/issue-67375.rs:7:17
|
LL | inner: [(); { [|_: &T| {}; 0].len() }],
- | ^^---------------^^^^^^^^
+ | ^^---------------------^^
| |
| unsupported operation in generic constant
|
diff --git a/src/test/ui/consts/const_let_assign3.stderr b/src/test/ui/consts/const_let_assign3.stderr
index 89073f975e8..b550ac54573 100644
--- a/src/test/ui/consts/const_let_assign3.stderr
+++ b/src/test/ui/consts/const_let_assign3.stderr
@@ -11,7 +11,7 @@ error[E0658]: mutable references are not allowed in constants
--> $DIR/const_let_assign3.rs:14:5
|
LL | s.foo(3);
- | ^
+ | ^^^^^^^^
|
= note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
= help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
diff --git a/src/test/ui/did_you_mean/issue-34126.stderr b/src/test/ui/did_you_mean/issue-34126.stderr
index 666172197ce..0503fac4a66 100644
--- a/src/test/ui/did_you_mean/issue-34126.stderr
+++ b/src/test/ui/did_you_mean/issue-34126.stderr
@@ -19,8 +19,9 @@ error[E0502]: cannot borrow `self` as mutable because it is also borrowed as imm
--> $DIR/issue-34126.rs:6:18
|
LL | self.run(&mut self);
- | ---- --- ^^^^^^^^^ mutable borrow occurs here
- | | |
+ | ---------^^^^^^^^^-
+ | | | |
+ | | | mutable borrow occurs here
| | immutable borrow later used by call
| immutable borrow occurs here
diff --git a/src/test/ui/did_you_mean/issue-35937.stderr b/src/test/ui/did_you_mean/issue-35937.stderr
index 1f578d18a1c..9562d94509e 100644
--- a/src/test/ui/did_you_mean/issue-35937.stderr
+++ b/src/test/ui/did_you_mean/issue-35937.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow `f.v` as mutable, as `f` is not declared as mutable
LL | let f = Foo { v: Vec::new() };
| - help: consider changing this to be mutable: `mut f`
LL | f.v.push("cat".to_string());
- | ^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
error[E0594]: cannot assign to `s.x`, as `s` is not declared as mutable
--> $DIR/issue-35937.rs:16:5
diff --git a/src/test/ui/did_you_mean/issue-38147-1.stderr b/src/test/ui/did_you_mean/issue-38147-1.stderr
index 6efac371c02..dd193458b37 100644
--- a/src/test/ui/did_you_mean/issue-38147-1.stderr
+++ b/src/test/ui/did_you_mean/issue-38147-1.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` referenc
LL | fn f(&self) {
| ----- help: consider changing this to be a mutable reference: `&mut self`
LL | self.s.push('x');
- | ^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error: aborting due to previous error
diff --git a/src/test/ui/did_you_mean/issue-38147-2.stderr b/src/test/ui/did_you_mean/issue-38147-2.stderr
index cb498108931..8bf5c76977d 100644
--- a/src/test/ui/did_you_mean/issue-38147-2.stderr
+++ b/src/test/ui/did_you_mean/issue-38147-2.stderr
@@ -5,7 +5,7 @@ LL | s: &'a String
| ---------- help: consider changing this to be mutable: `&'a mut String`
...
LL | self.s.push('x');
- | ^^^^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^^^ cannot borrow as mutable
error: aborting due to previous error
diff --git a/src/test/ui/did_you_mean/issue-38147-3.stderr b/src/test/ui/did_you_mean/issue-38147-3.stderr
index 67782578a2c..0e1e42261c4 100644
--- a/src/test/ui/did_you_mean/issue-38147-3.stderr
+++ b/src/test/ui/did_you_mean/issue-38147-3.stderr
@@ -5,7 +5,7 @@ LL | s: &'a String
| ---------- help: consider changing this to be mutable: `&'a mut String`
...
LL | self.s.push('x');
- | ^^^^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^^^ cannot borrow as mutable
error: aborting due to previous error
diff --git a/src/test/ui/did_you_mean/issue-38147-4.stderr b/src/test/ui/did_you_mean/issue-38147-4.stderr
index db3e6b89426..a2d162f08a1 100644
--- a/src/test/ui/did_you_mean/issue-38147-4.stderr
+++ b/src/test/ui/did_you_mean/issue-38147-4.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow `*f.s` as mutable, as it is behind a `&` reference
LL | fn f(x: usize, f: &Foo) {
| ---- help: consider changing this to be a mutable reference: `&mut Foo<'_>`
LL | f.s.push('x');
- | ^^^ `f` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^^^^^ `f` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error: aborting due to previous error
diff --git a/src/test/ui/did_you_mean/issue-40823.stderr b/src/test/ui/did_you_mean/issue-40823.stderr
index 73473406a9a..67703a1497f 100644
--- a/src/test/ui/did_you_mean/issue-40823.stderr
+++ b/src/test/ui/did_you_mean/issue-40823.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow `*buf` as mutable, as it is behind a `&` reference
LL | let mut buf = &[1, 2, 3, 4];
| ------------- help: consider changing this to be a mutable reference: `&mut [1, 2, 3, 4]`
LL | buf.iter_mut();
- | ^^^ `buf` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^^^^^^ `buf` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error: aborting due to previous error
diff --git a/src/test/ui/dropck/drop-with-active-borrows-1.stderr b/src/test/ui/dropck/drop-with-active-borrows-1.stderr
index 7fed27adaff..8d6a7f3721f 100644
--- a/src/test/ui/dropck/drop-with-active-borrows-1.stderr
+++ b/src/test/ui/dropck/drop-with-active-borrows-1.stderr
@@ -2,7 +2,7 @@ error[E0505]: cannot move out of `a` because it is borrowed
--> $DIR/drop-with-active-borrows-1.rs:4:10
|
LL | let b: Vec<&str> = a.lines().collect();
- | - borrow of `a` occurs here
+ | --------- borrow of `a` occurs here
LL | drop(a);
| ^ move out of `a` occurs here
LL | for s in &b {
diff --git a/src/test/ui/dropck/drop-with-active-borrows-2.stderr b/src/test/ui/dropck/drop-with-active-borrows-2.stderr
index ffec9306b77..24650dfac02 100644
--- a/src/test/ui/dropck/drop-with-active-borrows-2.stderr
+++ b/src/test/ui/dropck/drop-with-active-borrows-2.stderr
@@ -2,7 +2,7 @@ error[E0515]: cannot return value referencing local variable `raw_lines`
--> $DIR/drop-with-active-borrows-2.rs:3:5
|
LL | raw_lines.iter().map(|l| l.trim()).collect()
- | ---------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ | ----------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| |
| returns a value referencing data owned by the current function
| `raw_lines` is borrowed here
diff --git a/src/test/ui/error-codes/E0161.edition.stderr b/src/test/ui/error-codes/E0161.edition.stderr
index 6beb29c57d5..1060675cd45 100644
--- a/src/test/ui/error-codes/E0161.edition.stderr
+++ b/src/test/ui/error-codes/E0161.edition.stderr
@@ -2,7 +2,7 @@ error[E0161]: cannot move a value of type dyn Bar: the size of dyn Bar cannot be
--> $DIR/E0161.rs:29:5
|
LL | x.f();
- | ^
+ | ^^^^^
error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0161.migrate.stderr b/src/test/ui/error-codes/E0161.migrate.stderr
index 6beb29c57d5..1060675cd45 100644
--- a/src/test/ui/error-codes/E0161.migrate.stderr
+++ b/src/test/ui/error-codes/E0161.migrate.stderr
@@ -2,7 +2,7 @@ error[E0161]: cannot move a value of type dyn Bar: the size of dyn Bar cannot be
--> $DIR/E0161.rs:29:5
|
LL | x.f();
- | ^
+ | ^^^^^
error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0161.nll.stderr b/src/test/ui/error-codes/E0161.nll.stderr
index 6beb29c57d5..1060675cd45 100644
--- a/src/test/ui/error-codes/E0161.nll.stderr
+++ b/src/test/ui/error-codes/E0161.nll.stderr
@@ -2,7 +2,7 @@ error[E0161]: cannot move a value of type dyn Bar: the size of dyn Bar cannot be
--> $DIR/E0161.rs:29:5
|
LL | x.f();
- | ^
+ | ^^^^^
error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0161.zflags.stderr b/src/test/ui/error-codes/E0161.zflags.stderr
index 6beb29c57d5..1060675cd45 100644
--- a/src/test/ui/error-codes/E0161.zflags.stderr
+++ b/src/test/ui/error-codes/E0161.zflags.stderr
@@ -2,7 +2,7 @@ error[E0161]: cannot move a value of type dyn Bar: the size of dyn Bar cannot be
--> $DIR/E0161.rs:29:5
|
LL | x.f();
- | ^
+ | ^^^^^
error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0499.stderr b/src/test/ui/error-codes/E0499.stderr
index d56baf72272..af5a1e18633 100644
--- a/src/test/ui/error-codes/E0499.stderr
+++ b/src/test/ui/error-codes/E0499.stderr
@@ -7,7 +7,7 @@ LL | let mut a = &mut i;
| ^^^^^^ second mutable borrow occurs here
LL | a.use_mut();
LL | x.use_mut();
- | - first borrow later used here
+ | ----------- first borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0502.nll.stderr b/src/test/ui/error-codes/E0502.nll.stderr
index e5671ee49e6..a3c7ef76189 100644
--- a/src/test/ui/error-codes/E0502.nll.stderr
+++ b/src/test/ui/error-codes/E0502.nll.stderr
@@ -6,7 +6,7 @@ LL | let ref y = a;
LL | bar(a);
| ^ mutable borrow occurs here
LL | y.use_ref();
- | - immutable borrow later used here
+ | ----------- immutable borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0502.stderr b/src/test/ui/error-codes/E0502.stderr
index cade6d71852..94cc89754db 100644
--- a/src/test/ui/error-codes/E0502.stderr
+++ b/src/test/ui/error-codes/E0502.stderr
@@ -6,7 +6,7 @@ LL | let ref y = a;
LL | bar(a);
| ^^^^^^ mutable borrow occurs here
LL | y.use_ref();
- | - immutable borrow later used here
+ | ----------- immutable borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0503.stderr b/src/test/ui/error-codes/E0503.stderr
index 106dda2bc22..fafe363eb47 100644
--- a/src/test/ui/error-codes/E0503.stderr
+++ b/src/test/ui/error-codes/E0503.stderr
@@ -6,7 +6,7 @@ LL | let _borrow = &mut value;
LL | let _sum = value + 1;
| ^^^^^ use of borrowed `value`
LL | _borrow.use_mut();
- | ------- borrow later used here
+ | ----------------- borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0505.stderr b/src/test/ui/error-codes/E0505.stderr
index 4d9d1ef121c..bd3f37f54e0 100644
--- a/src/test/ui/error-codes/E0505.stderr
+++ b/src/test/ui/error-codes/E0505.stderr
@@ -6,7 +6,7 @@ LL | let _ref_to_val: &Value = &x;
LL | eat(x);
| ^ move out of `x` occurs here
LL | _ref_to_val.use_ref();
- | ----------- borrow later used here
+ | --------------------- borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0507.stderr b/src/test/ui/error-codes/E0507.stderr
index cd5e467944b..3837e206169 100644
--- a/src/test/ui/error-codes/E0507.stderr
+++ b/src/test/ui/error-codes/E0507.stderr
@@ -2,7 +2,7 @@ error[E0507]: cannot move out of dereference of `Ref<'_, TheDarkKnight>`
--> $DIR/E0507.rs:12:5
|
LL | x.borrow().nothing_is_true();
- | ^^^^^^^^^^ move occurs because value has type `TheDarkKnight`, which does not implement the `Copy` trait
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ move occurs because value has type `TheDarkKnight`, which does not implement the `Copy` trait
error: aborting due to previous error
diff --git a/src/test/ui/generator/dropck-resume.stderr b/src/test/ui/generator/dropck-resume.stderr
index ecf92e7e3ae..b0756eb5589 100644
--- a/src/test/ui/generator/dropck-resume.stderr
+++ b/src/test/ui/generator/dropck-resume.stderr
@@ -5,7 +5,7 @@ LL | let z = &mut y;
| ------ mutable borrow occurs here
...
LL | r = y.as_ref().unwrap();
- | ^ immutable borrow occurs here
+ | ^^^^^^^^^^ immutable borrow occurs here
LL |
LL | }
| - mutable borrow might be used here, when `g` is dropped and runs the destructor for generator
diff --git a/src/test/ui/generator/dropck.stderr b/src/test/ui/generator/dropck.stderr
index 8bb860f288f..7bb188352d7 100644
--- a/src/test/ui/generator/dropck.stderr
+++ b/src/test/ui/generator/dropck.stderr
@@ -2,7 +2,7 @@ error[E0597]: `*cell` does not live long enough
--> $DIR/dropck.rs:10:40
|
LL | let ref_ = Box::leak(Box::new(Some(cell.borrow_mut())));
- | ^^^^ borrowed value does not live long enough
+ | ^^^^^^^^^^^^^^^^^ borrowed value does not live long enough
...
LL | }
| -
diff --git a/src/test/ui/hashmap/hashmap-iter-value-lifetime.nll.stderr b/src/test/ui/hashmap/hashmap-iter-value-lifetime.nll.stderr
deleted file mode 100644
index 312a91adca6..00000000000
--- a/src/test/ui/hashmap/hashmap-iter-value-lifetime.nll.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0502]: cannot borrow `my_stuff` as mutable because it is also borrowed as immutable
- --> $DIR/hashmap-iter-value-lifetime.rs:7:5
- |
-LL | let (_, thing) = my_stuff.iter().next().unwrap();
- | -------- immutable borrow occurs here
-LL |
-LL | my_stuff.clear();
- | ^^^^^^^^ mutable borrow occurs here
-LL |
-LL | println!("{}", *thing);
- | ------ immutable borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr b/src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr
index f7626b13bad..0724fec9055 100644
--- a/src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr
+++ b/src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr
@@ -2,7 +2,7 @@ error[E0502]: cannot borrow `my_stuff` as mutable because it is also borrowed as
--> $DIR/hashmap-iter-value-lifetime.rs:7:5
|
LL | let (_, thing) = my_stuff.iter().next().unwrap();
- | -------- immutable borrow occurs here
+ | --------------- immutable borrow occurs here
LL |
LL | my_stuff.clear();
| ^^^^^^^^^^^^^^^^ mutable borrow occurs here
diff --git a/src/test/ui/hashmap/hashmap-lifetimes.nll.stderr b/src/test/ui/hashmap/hashmap-lifetimes.nll.stderr
deleted file mode 100644
index aa8e890c168..00000000000
--- a/src/test/ui/hashmap/hashmap-lifetimes.nll.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0502]: cannot borrow `my_stuff` as mutable because it is also borrowed as immutable
- --> $DIR/hashmap-lifetimes.rs:6:5
- |
-LL | let mut it = my_stuff.iter();
- | -------- immutable borrow occurs here
-LL | my_stuff.insert(1, 43);
- | ^^^^^^^^ mutable borrow occurs here
-LL | it;
- | -- immutable borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/hashmap/hashmap-lifetimes.stderr b/src/test/ui/hashmap/hashmap-lifetimes.stderr
index 497c7d1216c..d1bcd53ae3b 100644
--- a/src/test/ui/hashmap/hashmap-lifetimes.stderr
+++ b/src/test/ui/hashmap/hashmap-lifetimes.stderr
@@ -2,7 +2,7 @@ error[E0502]: cannot borrow `my_stuff` as mutable because it is also borrowed as
--> $DIR/hashmap-lifetimes.rs:6:5
|
LL | let mut it = my_stuff.iter();
- | -------- immutable borrow occurs here
+ | --------------- immutable borrow occurs here
LL | my_stuff.insert(1, 43);
| ^^^^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
LL | it;
diff --git a/src/test/ui/hrtb/hrtb-debruijn-in-receiver.stderr b/src/test/ui/hrtb/hrtb-debruijn-in-receiver.stderr
index 70d5b3c2ec5..fa391ecba8a 100644
--- a/src/test/ui/hrtb/hrtb-debruijn-in-receiver.stderr
+++ b/src/test/ui/hrtb/hrtb-debruijn-in-receiver.stderr
@@ -2,9 +2,9 @@ error[E0499]: cannot borrow `foo` as mutable more than once at a time
--> $DIR/hrtb-debruijn-in-receiver.rs:17:5
|
LL | foo.insert();
- | --- first mutable borrow occurs here
+ | ------------ first mutable borrow occurs here
LL | foo.insert();
- | ^^^
+ | ^^^^^^^^^^^^
| |
| second mutable borrow occurs here
| first borrow later used here
diff --git a/src/test/ui/hygiene/fields-numeric-borrowck.stderr b/src/test/ui/hygiene/fields-numeric-borrowck.stderr
index fb90825c0d9..bc13aa62f4d 100644
--- a/src/test/ui/hygiene/fields-numeric-borrowck.stderr
+++ b/src/test/ui/hygiene/fields-numeric-borrowck.stderr
@@ -7,7 +7,7 @@ LL | let S { 0: ref mut borrow2 } = s;
| ^^^^^^^^^^^^^^^ second mutable borrow occurs here
...
LL | borrow1.use_mut();
- | ------- first borrow later used here
+ | ----------------- first borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-13497-2.stderr b/src/test/ui/issues/issue-13497-2.stderr
index 8ad921027e2..6f72b79f2a5 100644
--- a/src/test/ui/issues/issue-13497-2.stderr
+++ b/src/test/ui/issues/issue-13497-2.stderr
@@ -1,13 +1,14 @@
error[E0515]: cannot return value referencing local variable `rawLines`
--> $DIR/issue-13497-2.rs:3:5
|
-LL | rawLines
- | ^-------
- | |
- | _____`rawLines` is borrowed here
- | |
-LL | | .iter().map(|l| l.trim()).collect()
- | |___________________________________________^ returns a value referencing data owned by the current function
+LL | rawLines
+ | _____^
+ | |_____|
+ | ||
+LL | || .iter().map(|l| l.trim()).collect()
+ | ||_______________-___________________________^ returns a value referencing data owned by the current function
+ | |________________|
+ | `rawLines` is borrowed here
error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-19163.stderr b/src/test/ui/issues/issue-19163.stderr
index af509aa59d4..def032ba1bb 100644
--- a/src/test/ui/issues/issue-19163.stderr
+++ b/src/test/ui/issues/issue-19163.stderr
@@ -1,8 +1,10 @@
error[E0596]: cannot borrow data in a `&` reference as mutable
- --> $DIR/issue-19163.rs:9:14
+ --> $DIR/issue-19163.rs:9:5
|
LL | mywrite!(&v, "Hello world");
- | ^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
+ |
+ = note: this error originates in the macro `mywrite` (in Nightly builds, run with -Z macro-backtrace for more info)
error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-21600.stderr b/src/test/ui/issues/issue-21600.stderr
index 84c7106e890..dab3c3d1797 100644
--- a/src/test/ui/issues/issue-21600.stderr
+++ b/src/test/ui/issues/issue-21600.stderr
@@ -5,7 +5,7 @@ LL | fn call_it<F>(f: F) where F: Fn() { f(); }
| - change this to accept `FnMut` instead of `Fn`
...
LL | call_it(|| x.gen_mut());
- | ------- ^ cannot borrow as mutable
+ | ------- ^^^^^^^^^^^ cannot borrow as mutable
| |
| expects `Fn` instead of `FnMut`
diff --git a/src/test/ui/issues/issue-41726.stderr b/src/test/ui/issues/issue-41726.stderr
index b00a420bc37..22631e7c2a3 100644
--- a/src/test/ui/issues/issue-41726.stderr
+++ b/src/test/ui/issues/issue-41726.stderr
@@ -2,7 +2,7 @@ error[E0596]: cannot borrow data in an index of `HashMap<String, Vec<String>>` a
--> $DIR/issue-41726.rs:5:9
|
LL | things[src.as_str()].sort();
- | ^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
|
= help: trait `IndexMut` is required to modify indexed content, but it is not implemented for `HashMap<String, Vec<String>>`
diff --git a/src/test/ui/issues/issue-42106.stderr b/src/test/ui/issues/issue-42106.stderr
index d5a9d233bc9..73cf8652f6d 100644
--- a/src/test/ui/issues/issue-42106.stderr
+++ b/src/test/ui/issues/issue-42106.stderr
@@ -4,9 +4,9 @@ error[E0502]: cannot borrow `*collection` as mutable because it is also borrowed
LL | let _a = &collection;
| ----------- immutable borrow occurs here
LL | collection.swap(1, 2);
- | ^^^^^^^^^^ mutable borrow occurs here
+ | ^^^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
LL | _a.use_ref();
- | -- immutable borrow later used here
+ | ------------ immutable borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-44405.stderr b/src/test/ui/issues/issue-44405.stderr
index 1fd69f6e777..626cb2999e1 100644
--- a/src/test/ui/issues/issue-44405.stderr
+++ b/src/test/ui/issues/issue-44405.stderr
@@ -2,7 +2,7 @@ error[E0596]: cannot borrow data in an index of `Container` as mutable
--> $DIR/issue-44405.rs:21:5
|
LL | container[&mut val].test();
- | ^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
|
= help: trait `IndexMut` is required to modify indexed content, but it is not implemented for `Container`
diff --git a/src/test/ui/issues/issue-47646.stderr b/src/test/ui/issues/issue-47646.stderr
index b46c277d045..eff1de3e017 100644
--- a/src/test/ui/issues/issue-47646.stderr
+++ b/src/test/ui/issues/issue-47646.stderr
@@ -2,7 +2,7 @@ error[E0502]: cannot borrow `heap` as immutable because it is also borrowed as m
--> $DIR/issue-47646.rs:9:30
|
LL | let borrow = heap.peek_mut();
- | ---- mutable borrow occurs here
+ | --------------- mutable borrow occurs here
LL |
LL | match (borrow, ()) {
| ------------ a temporary with access to the mutable borrow is created here ...
diff --git a/src/test/ui/issues/issue-52126-assign-op-invariance.stderr b/src/test/ui/issues/issue-52126-assign-op-invariance.stderr
index d231f621e59..d4506757762 100644
--- a/src/test/ui/issues/issue-52126-assign-op-invariance.stderr
+++ b/src/test/ui/issues/issue-52126-assign-op-invariance.stderr
@@ -2,7 +2,7 @@ error[E0597]: `line` does not live long enough
--> $DIR/issue-52126-assign-op-invariance.rs:34:28
|
LL | let v: Vec<&str> = line.split_whitespace().collect();
- | ^^^^ borrowed value does not live long enough
+ | ^^^^^^^^^^^^^^^^^^^^^^^ borrowed value does not live long enough
...
LL | acc += cnt2;
| --- borrow later used here
diff --git a/src/test/ui/issues/issue-61108.stderr b/src/test/ui/issues/issue-61108.stderr
index fb242f738c8..6f345f56d1a 100644
--- a/src/test/ui/issues/issue-61108.stderr
+++ b/src/test/ui/issues/issue-61108.stderr
@@ -10,7 +10,7 @@ LL | for l in bad_letters {
| help: consider borrowing to avoid moving into the for loop: `&bad_letters`
...
LL | bad_letters.push('s');
- | ^^^^^^^^^^^ value borrowed here after move
+ | ^^^^^^^^^^^^^^^^^^^^^ value borrowed here after move
|
note: this function takes ownership of the receiver `self`, which moves `bad_letters`
--> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
diff --git a/src/test/ui/issues/issue-81584.stderr b/src/test/ui/issues/issue-81584.stderr
index d57f1b778df..54973cfa34e 100644
--- a/src/test/ui/issues/issue-81584.stderr
+++ b/src/test/ui/issues/issue-81584.stderr
@@ -2,7 +2,7 @@ error[E0515]: cannot return value referencing function parameter `y`
--> $DIR/issue-81584.rs:5:22
|
LL | .map(|y| y.iter().map(|x| x + 1))
- | -^^^^^^^^^^^^^^^^^^^^^^
+ | --------^^^^^^^^^^^^^^^
| |
| returns a value referencing data owned by the current function
| `y` is borrowed here
diff --git a/src/test/ui/lifetimes/borrowck-let-suggestion.stderr b/src/test/ui/lifetimes/borrowck-let-suggestion.stderr
index 4a605cfb862..bbf04c98436 100644
--- a/src/test/ui/lifetimes/borrowck-let-suggestion.stderr
+++ b/src/test/ui/lifetimes/borrowck-let-suggestion.stderr
@@ -7,7 +7,7 @@ LL | let mut x = vec![1].iter();
| creates a temporary which is freed while still in use
LL |
LL | x.use_mut();
- | - borrow later used here
+ | ----------- borrow later used here
|
= note: consider using a `let` binding to create a longer lived value
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.nll.stderr
index 33be98c6491..825c45b2434 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.nll.stderr
+++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.nll.stderr
@@ -1,11 +1,3 @@
-error[E0596]: cannot borrow `y` as mutable, as it is not declared as mutable
- --> $DIR/ex3-both-anon-regions-using-fn-items.rs:2:3
- |
-LL | fn foo(x:fn(&u8, &u8), y: Vec<&u8>, z: &u8) {
- | - help: consider changing this to be mutable: `mut y`
-LL | y.push(z);
- | ^ cannot borrow as mutable
-
error: lifetime may not live long enough
--> $DIR/ex3-both-anon-regions-using-fn-items.rs:2:3
|
@@ -16,6 +8,14 @@ LL | fn foo(x:fn(&u8, &u8), y: Vec<&u8>, z: &u8) {
LL | y.push(z);
| ^^^^^^^^^ argument requires that `'1` must outlive `'2`
+error[E0596]: cannot borrow `y` as mutable, as it is not declared as mutable
+ --> $DIR/ex3-both-anon-regions-using-fn-items.rs:2:3
+ |
+LL | fn foo(x:fn(&u8, &u8), y: Vec<&u8>, z: &u8) {
+ | - help: consider changing this to be mutable: `mut y`
+LL | y.push(z);
+ | ^^^^^^^^^ cannot borrow as mutable
+
error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.nll.stderr
index 3c95be95db0..78a828dde86 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.nll.stderr
+++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.nll.stderr
@@ -1,11 +1,3 @@
-error[E0596]: cannot borrow `y` as mutable, as it is not declared as mutable
- --> $DIR/ex3-both-anon-regions-using-trait-objects.rs:2:3
- |
-LL | fn foo(x:Box<dyn Fn(&u8, &u8)> , y: Vec<&u8>, z: &u8) {
- | - help: consider changing this to be mutable: `mut y`
-LL | y.push(z);
- | ^ cannot borrow as mutable
-
error: lifetime may not live long enough
--> $DIR/ex3-both-anon-regions-using-trait-objects.rs:2:3
|
@@ -16,6 +8,14 @@ LL | fn foo(x:Box<dyn Fn(&u8, &u8)> , y: Vec<&u8>, z: &u8) {
LL | y.push(z);
| ^^^^^^^^^ argument requires that `'1` must outlive `'2`
+error[E0596]: cannot borrow `y` as mutable, as it is not declared as mutable
+ --> $DIR/ex3-both-anon-regions-using-trait-objects.rs:2:3
+ |
+LL | fn foo(x:Box<dyn Fn(&u8, &u8)> , y: Vec<&u8>, z: &u8) {
+ | - help: consider changing this to be mutable: `mut y`
+LL | y.push(z);
+ | ^^^^^^^^^ cannot borrow as mutable
+
error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/lint/unaligned_references.stderr b/src/test/ui/lint/unaligned_references.stderr
index b4cce3cfea2..6a5cc91963d 100644
--- a/src/test/ui/lint/unaligned_references.stderr
+++ b/src/test/ui/lint/unaligned_references.stderr
@@ -47,7 +47,7 @@ error: reference to packed field is unaligned
--> $DIR/unaligned_references.rs:32:17
|
LL | let _ = good.data.clone();
- | ^^^^^^^^^
+ | ^^^^^^^^^^^^^^^^^
|
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
= note: for more information, see issue #82523 <https://github.com/rust-lang/rust/issues/82523>
diff --git a/src/test/ui/match/issue-74050-end-span.stderr b/src/test/ui/match/issue-74050-end-span.stderr
index d636a11a91c..59c091e44eb 100644
--- a/src/test/ui/match/issue-74050-end-span.stderr
+++ b/src/test/ui/match/issue-74050-end-span.stderr
@@ -5,7 +5,7 @@ LL | let _arg = match args.next() {
| ---- borrow later stored here
LL | Some(arg) => {
LL | match arg.to_str() {
- | ^^^ borrowed value does not live long enough
+ | ^^^^^^^^^^^^ borrowed value does not live long enough
...
LL | }
| - `arg` dropped here while still borrowed
diff --git a/src/test/ui/methods/method-self-arg-2.stderr b/src/test/ui/methods/method-self-arg-2.stderr
index 946e71ee5b9..b98f7a78661 100644
--- a/src/test/ui/methods/method-self-arg-2.stderr
+++ b/src/test/ui/methods/method-self-arg-2.stderr
@@ -6,7 +6,7 @@ LL | let y = &mut x;
LL | Foo::bar(&x);
| ^^ immutable borrow occurs here
LL | y.use_mut();
- | - mutable borrow later used here
+ | ----------- mutable borrow later used here
error[E0499]: cannot borrow `x` as mutable more than once at a time
--> $DIR/method-self-arg-2.rs:20:14
@@ -16,7 +16,7 @@ LL | let y = &mut x;
LL | Foo::baz(&mut x);
| ^^^^^^ second mutable borrow occurs here
LL | y.use_mut();
- | - first borrow later used here
+ | ----------- first borrow later used here
error: aborting due to 2 previous errors
diff --git a/src/test/ui/moves/move-fn-self-receiver.stderr b/src/test/ui/moves/move-fn-self-receiver.stderr
index eca6bb9296d..57be5fb4d8a 100644
--- a/src/test/ui/moves/move-fn-self-receiver.stderr
+++ b/src/test/ui/moves/move-fn-self-receiver.stderr
@@ -75,7 +75,7 @@ error[E0505]: cannot move out of `mut_foo` because it is borrowed
--> $DIR/move-fn-self-receiver.rs:50:5
|
LL | let ret = mut_foo.use_mut_self();
- | ------- borrow of `mut_foo` occurs here
+ | ---------------------- borrow of `mut_foo` occurs here
LL | mut_foo;
| ^^^^^^^ move out of `mut_foo` occurs here
LL | ret;
diff --git a/src/test/ui/mut/mut-cant-alias.stderr b/src/test/ui/mut/mut-cant-alias.stderr
index d56e45db13d..6046c076f2e 100644
--- a/src/test/ui/mut/mut-cant-alias.stderr
+++ b/src/test/ui/mut/mut-cant-alias.stderr
@@ -6,7 +6,7 @@ LL | let b1 = &mut *b;
LL | let b2 = &mut *b;
| ^ second mutable borrow occurs here
LL | b1.use_mut();
- | -- first borrow later used here
+ | ------------ first borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/mut/mut-suggestion.stderr b/src/test/ui/mut/mut-suggestion.stderr
index 245eaff4bb4..cba284550b9 100644
--- a/src/test/ui/mut/mut-suggestion.stderr
+++ b/src/test/ui/mut/mut-suggestion.stderr
@@ -5,7 +5,7 @@ LL | fn func(arg: S) {
| --- help: consider changing this to be mutable: `mut arg`
...
LL | arg.mutate();
- | ^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^ cannot borrow as mutable
error[E0596]: cannot borrow `local` as mutable, as it is not declared as mutable
--> $DIR/mut-suggestion.rs:20:5
@@ -14,7 +14,7 @@ LL | let local = S;
| ----- help: consider changing this to be mutable: `mut local`
...
LL | local.mutate();
- | ^^^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^ cannot borrow as mutable
error: aborting due to 2 previous errors
diff --git a/src/test/ui/nll/closure-access-spans.stderr b/src/test/ui/nll/closure-access-spans.stderr
index 8eded8f2857..e9d7ca953d6 100644
--- a/src/test/ui/nll/closure-access-spans.stderr
+++ b/src/test/ui/nll/closure-access-spans.stderr
@@ -8,7 +8,7 @@ LL | || x;
| |
| immutable borrow occurs here
LL | r.use_mut();
- | - mutable borrow later used here
+ | ----------- mutable borrow later used here
error[E0499]: cannot borrow `x` as mutable more than once at a time
--> $DIR/closure-access-spans.rs:11:5
@@ -20,7 +20,7 @@ LL | || x = 2;
| |
| second mutable borrow occurs here
LL | r.use_mut();
- | - first borrow later used here
+ | ----------- first borrow later used here
error[E0500]: closure requires unique access to `x` but it is already borrowed
--> $DIR/closure-access-spans.rs:17:5
@@ -32,7 +32,7 @@ LL | || *x = 2;
| |
| closure construction occurs here
LL | r.use_mut();
- | - first borrow later used here
+ | ----------- first borrow later used here
error[E0503]: cannot use `x` because it was mutably borrowed
--> $DIR/closure-access-spans.rs:23:13
@@ -42,7 +42,7 @@ LL | let r = &mut x;
LL | move || x;
| ^ use of borrowed `x`
LL | r.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0505]: cannot move out of `x` because it is borrowed
--> $DIR/closure-access-spans.rs:29:5
@@ -54,7 +54,7 @@ LL | || x;
| |
| move out of `x` occurs here
LL | r.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0382]: borrow of moved value: `x`
--> $DIR/closure-access-spans.rs:35:5
diff --git a/src/test/ui/nll/closure-borrow-spans.stderr b/src/test/ui/nll/closure-borrow-spans.stderr
index fffbee4d4a8..bada4e1b84b 100644
--- a/src/test/ui/nll/closure-borrow-spans.stderr
+++ b/src/test/ui/nll/closure-borrow-spans.stderr
@@ -8,7 +8,7 @@ LL | let f = || x.len();
LL | let y = x;
| ^ move out of `x` occurs here
LL | f.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
--> $DIR/closure-borrow-spans.rs:11:13
@@ -20,7 +20,7 @@ LL | let f = || x;
LL | let y = &mut x;
| ^^^^^^ mutable borrow occurs here
LL | f.use_ref();
- | - immutable borrow later used here
+ | ----------- immutable borrow later used here
error[E0597]: `x` does not live long enough
--> $DIR/closure-borrow-spans.rs:19:16
@@ -32,7 +32,7 @@ LL | f = || x;
LL | }
| - `x` dropped here while still borrowed
LL | f.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0506]: cannot assign to `x` because it is borrowed
--> $DIR/closure-borrow-spans.rs:26:5
@@ -44,7 +44,7 @@ LL | let f = || x;
LL | x = 1;
| ^^^^^ assignment to borrowed `x` occurs here
LL | f.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0503]: cannot use `x` because it was mutably borrowed
--> $DIR/closure-borrow-spans.rs:32:13
@@ -56,7 +56,7 @@ LL | let f = || x = 0;
LL | let y = x;
| ^ use of borrowed `x`
LL | f.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable
--> $DIR/closure-borrow-spans.rs:38:13
@@ -68,7 +68,7 @@ LL | let f = || x = 0;
LL | let y = &x;
| ^^ immutable borrow occurs here
LL | f.use_ref();
- | - mutable borrow later used here
+ | ----------- mutable borrow later used here
error[E0499]: cannot borrow `x` as mutable more than once at a time
--> $DIR/closure-borrow-spans.rs:44:13
@@ -80,7 +80,7 @@ LL | let f = || x = 0;
LL | let y = &mut x;
| ^^^^^^ second mutable borrow occurs here
LL | f.use_ref();
- | - first borrow later used here
+ | ----------- first borrow later used here
error[E0597]: `x` does not live long enough
--> $DIR/closure-borrow-spans.rs:52:16
@@ -92,7 +92,7 @@ LL | f = || x = 0;
LL | }
| - `x` dropped here while still borrowed
LL | f.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0506]: cannot assign to `x` because it is borrowed
--> $DIR/closure-borrow-spans.rs:59:5
@@ -104,7 +104,7 @@ LL | let f = || x = 0;
LL | x = 1;
| ^^^^^ assignment to borrowed `x` occurs here
LL | f.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0505]: cannot move out of `x` because it is borrowed
--> $DIR/closure-borrow-spans.rs:65:13
@@ -116,7 +116,7 @@ LL | let f = || *x = 0;
LL | let y = x;
| ^ move out of `x` occurs here
LL | f.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0501]: cannot borrow `x` as immutable because previous closure requires unique access
--> $DIR/closure-borrow-spans.rs:71:13
@@ -128,7 +128,7 @@ LL | let f = || *x = 0;
LL | let y = &x;
| ^^ second borrow occurs here
LL | f.use_ref();
- | - first borrow later used here
+ | ----------- first borrow later used here
error[E0501]: cannot borrow `x` as mutable because previous closure requires unique access
--> $DIR/closure-borrow-spans.rs:77:13
@@ -140,7 +140,7 @@ LL | let f = || *x = 0;
LL | let y = &mut x;
| ^^^^^^ second borrow occurs here
LL | f.use_ref();
- | - first borrow later used here
+ | ----------- first borrow later used here
error[E0597]: `x` does not live long enough
--> $DIR/closure-borrow-spans.rs:86:16
@@ -152,7 +152,7 @@ LL | f = || *x = 0;
LL | }
| - `x` dropped here while still borrowed
LL | f.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error[E0506]: cannot assign to `*x` because it is borrowed
--> $DIR/closure-borrow-spans.rs:93:5
@@ -164,7 +164,7 @@ LL | let f = || *x = 0;
LL | *x = 1;
| ^^^^^^ assignment to borrowed `*x` occurs here
LL | f.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error: aborting due to 14 previous errors
diff --git a/src/test/ui/nll/get_default.nll.stderr b/src/test/ui/nll/get_default.nll.stderr
deleted file mode 100644
index 27912306987..00000000000
--- a/src/test/ui/nll/get_default.nll.stderr
+++ /dev/null
@@ -1,48 +0,0 @@
-error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable
- --> $DIR/get_default.rs:21:17
- |
-LL | fn ok(map: &mut Map) -> &String {
- | - let's call the lifetime of this reference `'1`
-LL | loop {
-LL | match map.get() {
- | --- immutable borrow occurs here
-LL | Some(v) => {
-LL | return v;
- | - returning this value requires that `*map` is borrowed for `'1`
-...
-LL | map.set(String::new()); // Ideally, this would not error.
- | ^^^ mutable borrow occurs here
-
-error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable
- --> $DIR/get_default.rs:32:17
- |
-LL | fn err(map: &mut Map) -> &String {
- | - let's call the lifetime of this reference `'1`
-LL | loop {
-LL | match map.get() {
- | --- immutable borrow occurs here
-LL | Some(v) => {
-LL | map.set(String::new()); // Both AST and MIR error here
- | ^^^ mutable borrow occurs here
-LL |
-LL | return v;
- | - returning this value requires that `*map` is borrowed for `'1`
-
-error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable
- --> $DIR/get_default.rs:37:17
- |
-LL | fn err(map: &mut Map) -> &String {
- | - let's call the lifetime of this reference `'1`
-LL | loop {
-LL | match map.get() {
- | --- immutable borrow occurs here
-...
-LL | return v;
- | - returning this value requires that `*map` is borrowed for `'1`
-...
-LL | map.set(String::new()); // Ideally, just AST would error here
- | ^^^ mutable borrow occurs here
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/nll/get_default.stderr b/src/test/ui/nll/get_default.stderr
index af79771e7e1..6998c04336e 100644
--- a/src/test/ui/nll/get_default.stderr
+++ b/src/test/ui/nll/get_default.stderr
@@ -5,7 +5,7 @@ LL | fn ok(map: &mut Map) -> &String {
| - let's call the lifetime of this reference `'1`
LL | loop {
LL | match map.get() {
- | --- immutable borrow occurs here
+ | --------- immutable borrow occurs here
LL | Some(v) => {
LL | return v;
| - returning this value requires that `*map` is borrowed for `'1`
@@ -20,7 +20,7 @@ LL | fn err(map: &mut Map) -> &String {
| - let's call the lifetime of this reference `'1`
LL | loop {
LL | match map.get() {
- | --- immutable borrow occurs here
+ | --------- immutable borrow occurs here
LL | Some(v) => {
LL | map.set(String::new()); // Both AST and MIR error here
| ^^^^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
@@ -35,7 +35,7 @@ LL | fn err(map: &mut Map) -> &String {
| - let's call the lifetime of this reference `'1`
LL | loop {
LL | match map.get() {
- | --- immutable borrow occurs here
+ | --------- immutable borrow occurs here
...
LL | return v;
| - returning this value requires that `*map` is borrowed for `'1`
diff --git a/src/test/ui/nll/issue-46589.stderr b/src/test/ui/nll/issue-46589.stderr
index 82cd364eeff..60ef3f7b85e 100644
--- a/src/test/ui/nll/issue-46589.stderr
+++ b/src/test/ui/nll/issue-46589.stderr
@@ -2,10 +2,10 @@ error[E0499]: cannot borrow `**other` as mutable more than once at a time
--> $DIR/issue-46589.rs:23:21
|
LL | *other = match (*other).get_self() {
- | -------- first mutable borrow occurs here
+ | ------------------- first mutable borrow occurs here
LL | Some(s) => s,
LL | None => (*other).new_self()
- | ^^^^^^^^
+ | ^^^^^^^^^^^^^^^^^^^
| |
| second mutable borrow occurs here
| first borrow later used here
diff --git a/src/test/ui/nll/issue-51191.stderr b/src/test/ui/nll/issue-51191.stderr
index 18696f57c44..9f4e971f909 100644
--- a/src/test/ui/nll/issue-51191.stderr
+++ b/src/test/ui/nll/issue-51191.stderr
@@ -45,7 +45,7 @@ error[E0596]: cannot borrow data in a `&` reference as mutable
--> $DIR/issue-51191.rs:22:9
|
LL | (&mut self).bar();
- | ^^^^^^^^^^^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^^^^ cannot borrow as mutable
error[E0596]: cannot borrow `self` as mutable, as it is not declared as mutable
--> $DIR/issue-51191.rs:28:9
diff --git a/src/test/ui/nll/issue-52669.stderr b/src/test/ui/nll/issue-52669.stderr
index db53e444b9e..807b95f7e13 100644
--- a/src/test/ui/nll/issue-52669.stderr
+++ b/src/test/ui/nll/issue-52669.stderr
@@ -7,7 +7,7 @@ LL | a.b = B;
LL | foo(a);
| - value moved here
LL | a.b.clone()
- | ^^^ value borrowed here after move
+ | ^^^^^^^^^^^ value borrowed here after move
error: aborting due to previous error
diff --git a/src/test/ui/nll/issue-53773.stderr b/src/test/ui/nll/issue-53773.stderr
index 45831460e52..11cd423295a 100644
--- a/src/test/ui/nll/issue-53773.stderr
+++ b/src/test/ui/nll/issue-53773.stderr
@@ -7,7 +7,7 @@ LL |
LL | }
| - here, drop of `child` needs exclusive access to `*child.raw`, because the type `C<'_>` implements the `Drop` trait
LL | members.len();
- | ------- borrow later used here
+ | ------------- borrow later used here
|
= note: consider using a `let` binding to create a longer lived value
diff --git a/src/test/ui/nll/issue-54556-niconii.stderr b/src/test/ui/nll/issue-54556-niconii.stderr
index 70f063ca0e8..a8e1edc5497 100644
--- a/src/test/ui/nll/issue-54556-niconii.stderr
+++ b/src/test/ui/nll/issue-54556-niconii.stderr
@@ -2,7 +2,7 @@ error[E0597]: `counter` does not live long enough
--> $DIR/issue-54556-niconii.rs:22:20
|
LL | if let Ok(_) = counter.lock() { }
- | ^^^^^^^-------
+ | ^^^^^^^^^^^^^^
| |
| borrowed value does not live long enough
| a temporary with access to the borrow is created here ...
diff --git a/src/test/ui/nll/issue-62007-assign-const-index.stderr b/src/test/ui/nll/issue-62007-assign-const-index.stderr
index 0db9fe62c38..12e28aa3fba 100644
--- a/src/test/ui/nll/issue-62007-assign-const-index.stderr
+++ b/src/test/ui/nll/issue-62007-assign-const-index.stderr
@@ -17,7 +17,7 @@ LL | fn to_refs<T>(mut list: [&mut List<T>; 2]) -> Vec<&mut T> {
| - let's call the lifetime of this reference `'1`
...
LL | if let Some(n) = list[0].next.as_mut() {
- | ^^^^^^^^^^^^---------
+ | ^^^^^^^^^^^^^^^^^^^^^
| |
| `list[_].next` was mutably borrowed here in the previous iteration of the loop
| argument requires that `list[_].next` is borrowed for `'1`
diff --git a/src/test/ui/nll/issue-62007-assign-differing-fields.stderr b/src/test/ui/nll/issue-62007-assign-differing-fields.stderr
index f1af2e855af..4488431fc57 100644
--- a/src/test/ui/nll/issue-62007-assign-differing-fields.stderr
+++ b/src/test/ui/nll/issue-62007-assign-differing-fields.stderr
@@ -17,7 +17,7 @@ LL | fn to_refs<'a, T>(mut list: (&'a mut List<T>, &'a mut List<T>)) -> Vec<&'a
| -- lifetime `'a` defined here
...
LL | if let Some(n) = (list.0).next.as_mut() {
- | ^^^^^^^^^^^^^---------
+ | ^^^^^^^^^^^^^^^^^^^^^^
| |
| `list.0.next` was mutably borrowed here in the previous iteration of the loop
| argument requires that `list.0.next` is borrowed for `'a`
diff --git a/src/test/ui/nll/loan_ends_mid_block_vec.stderr b/src/test/ui/nll/loan_ends_mid_block_vec.stderr
index c0b97bea348..22c72af61d6 100644
--- a/src/test/ui/nll/loan_ends_mid_block_vec.stderr
+++ b/src/test/ui/nll/loan_ends_mid_block_vec.stderr
@@ -5,7 +5,7 @@ LL | let slice = &mut data;
| --------- first mutable borrow occurs here
LL | capitalize(slice);
LL | data.push('d');
- | ^^^^ second mutable borrow occurs here
+ | ^^^^^^^^^^^^^^ second mutable borrow occurs here
...
LL | capitalize(slice);
| ----- first borrow later used here
@@ -17,7 +17,7 @@ LL | let slice = &mut data;
| --------- first mutable borrow occurs here
...
LL | data.push('e');
- | ^^^^ second mutable borrow occurs here
+ | ^^^^^^^^^^^^^^ second mutable borrow occurs here
...
LL | capitalize(slice);
| ----- first borrow later used here
@@ -29,7 +29,7 @@ LL | let slice = &mut data;
| --------- first mutable borrow occurs here
...
LL | data.push('f');
- | ^^^^ second mutable borrow occurs here
+ | ^^^^^^^^^^^^^^ second mutable borrow occurs here
LL |
LL | capitalize(slice);
| ----- first borrow later used here
diff --git a/src/test/ui/nll/polonius/assignment-to-differing-field.stderr b/src/test/ui/nll/polonius/assignment-to-differing-field.stderr
index 2fe6a53a49a..fd5e4531b2e 100644
--- a/src/test/ui/nll/polonius/assignment-to-differing-field.stderr
+++ b/src/test/ui/nll/polonius/assignment-to-differing-field.stderr
@@ -17,7 +17,7 @@ LL | fn assignment_to_field_projection<'a, T>(
| -- lifetime `'a` defined here
...
LL | if let Some(n) = (list.0).next.as_mut() {
- | ^^^^^^^^^^^^^---------
+ | ^^^^^^^^^^^^^^^^^^^^^^
| |
| `list.0.next` was mutably borrowed here in the previous iteration of the loop
| argument requires that `list.0.next` is borrowed for `'a`
@@ -41,7 +41,7 @@ LL | fn assignment_through_projection_chain<'a, T>(
| -- lifetime `'a` defined here
...
LL | if let Some(n) = ((((list.0).0).0).0).0.next.as_mut() {
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^---------
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| |
| `list.0.0.0.0.0.next` was mutably borrowed here in the previous iteration of the loop
| argument requires that `list.0.0.0.0.0.next` is borrowed for `'a`
diff --git a/src/test/ui/nll/region-ends-after-if-condition.nll.stderr b/src/test/ui/nll/region-ends-after-if-condition.nll.stderr
deleted file mode 100644
index 322930984a5..00000000000
--- a/src/test/ui/nll/region-ends-after-if-condition.nll.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0502]: cannot borrow `my_struct.field` as mutable because it is also borrowed as immutable
- --> $DIR/region-ends-after-if-condition.rs:26:9
- |
-LL | let value = &my_struct.field;
- | ---------------- immutable borrow occurs here
-LL | if value.is_empty() {
-LL | my_struct.field.push_str("Hello, world!");
- | ^^^^^^^^^^^^^^^ mutable borrow occurs here
-...
-LL | drop(value);
- | ----- immutable borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/nll/return_from_loop.stderr b/src/test/ui/nll/return_from_loop.stderr
index efd56ea2dd5..bd2b8b15859 100644
--- a/src/test/ui/nll/return_from_loop.stderr
+++ b/src/test/ui/nll/return_from_loop.stderr
@@ -5,10 +5,10 @@ LL | let value = &mut my_struct.field;
| -------------------- first mutable borrow occurs here
LL | loop {
LL | my_struct.field.push_str("Hello, world!");
- | ^^^^^^^^^^^^^^^ second mutable borrow occurs here
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ second mutable borrow occurs here
LL |
LL | value.len();
- | ----- first borrow later used here
+ | ----------- first borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/object-safety/object-safety-by-value-self-use.stderr b/src/test/ui/object-safety/object-safety-by-value-self-use.stderr
index 1497aa42082..7ccc0cbdd57 100644
--- a/src/test/ui/object-safety/object-safety-by-value-self-use.stderr
+++ b/src/test/ui/object-safety/object-safety-by-value-self-use.stderr
@@ -2,7 +2,7 @@ error[E0161]: cannot move a value of type dyn Bar: the size of dyn Bar cannot be
--> $DIR/object-safety-by-value-self-use.rs:15:5
|
LL | t.bar()
- | ^
+ | ^^^^^^^
error: aborting due to previous error
diff --git a/src/test/ui/regions/region-object-lifetime-5.rs b/src/test/ui/regions/region-object-lifetime-5.rs
index 307bbcbd58d..ad359367168 100644
--- a/src/test/ui/regions/region-object-lifetime-5.rs
+++ b/src/test/ui/regions/region-object-lifetime-5.rs
@@ -8,7 +8,7 @@ trait Foo {
// Here, the object is bounded by an anonymous lifetime and returned
// as `&'static`, so you get an error.
fn owned_receiver(x: Box<dyn Foo>) -> &'static () {
- x.borrowed() //~ ERROR cannot return value referencing local data `*x`
+ x.borrowed() //~ ERROR cannot return reference to local data `*x`
}
fn main() {}
diff --git a/src/test/ui/regions/region-object-lifetime-5.stderr b/src/test/ui/regions/region-object-lifetime-5.stderr
index b86f6e3a2a1..b82b58c7a8e 100644
--- a/src/test/ui/regions/region-object-lifetime-5.stderr
+++ b/src/test/ui/regions/region-object-lifetime-5.stderr
@@ -1,11 +1,8 @@
-error[E0515]: cannot return value referencing local data `*x`
+error[E0515]: cannot return reference to local data `*x`
--> $DIR/region-object-lifetime-5.rs:11:5
|
LL | x.borrowed()
- | -^^^^^^^^^^^
- | |
- | returns a value referencing data owned by the current function
- | `*x` is borrowed here
+ | ^^^^^^^^^^^^ returns a reference to data owned by the current function
error: aborting due to previous error
diff --git a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.nll.stderr b/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.nll.stderr
deleted file mode 100644
index c74b82dbbd8..00000000000
--- a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.nll.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0502]: cannot borrow `foo` as mutable because it is also borrowed as immutable
- --> $DIR/borrowck-issue-49631.rs:20:9
- |
-LL | while let Some(Ok(string)) = foo.get() {
- | --- immutable borrow occurs here
-LL | foo.mutate();
- | ^^^ mutable borrow occurs here
-LL |
-LL | println!("foo={:?}", *string);
- | ------- immutable borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr b/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr
index 04572920ee4..b7c0b0bb6b9 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr
@@ -2,7 +2,7 @@ error[E0502]: cannot borrow `foo` as mutable because it is also borrowed as immu
--> $DIR/borrowck-issue-49631.rs:20:9
|
LL | while let Some(Ok(string)) = foo.get() {
- | --- immutable borrow occurs here
+ | --------- immutable borrow occurs here
LL | foo.mutate();
| ^^^^^^^^^^^^ mutable borrow occurs here
LL |
diff --git a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr b/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
index 8fceef64c8c..e4ec9f87576 100644
--- a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
+++ b/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
@@ -56,7 +56,7 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
LL | fn deref_mut_method1(x: Own<Point>) {
| - help: consider changing this to be mutable: `mut x`
LL | x.set(0, 0);
- | ^ cannot borrow as mutable
+ | ^^^^^^^^^^^ cannot borrow as mutable
error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
--> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:121:5
@@ -64,7 +64,7 @@ error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
LL | fn deref_extend_mut_method1(x: &Own<Point>) -> &mut isize {
| ----------- help: consider changing this to be a mutable reference: `&mut Own<Point>`
LL | x.y_mut()
- | ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
--> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:129:6
@@ -72,7 +72,7 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
LL | fn assign_method1<'a>(x: Own<Point>) {
| - help: consider changing this to be mutable: `mut x`
LL | *x.y_mut() = 3;
- | ^ cannot borrow as mutable
+ | ^^^^^^^^^ cannot borrow as mutable
error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
--> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:133:6
@@ -80,7 +80,7 @@ error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
LL | fn assign_method2<'a>(x: &'a Own<Point>) {
| -------------- help: consider changing this to be a mutable reference: `&'a mut Own<Point>`
LL | *x.y_mut() = 3;
- | ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error: aborting due to 10 previous errors
diff --git a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr
index 0f630abd148..b4693b7242a 100644
--- a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr
+++ b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr
@@ -24,7 +24,7 @@ error[E0596]: cannot borrow `f.f` as mutable, as it is behind a `&` reference
LL | fn test4(f: &Test) {
| ----- help: consider changing this to be a mutable reference: `&mut Test<'_>`
LL | f.f.call_mut(())
- | ^^^ `f` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^^^^^^^^ `f` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error[E0507]: cannot move out of `f`, a captured variable in an `FnMut` closure
--> $DIR/borrowck-call-is-borrow-issue-12224.rs:57:13
diff --git a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr
index 6b5e0779e5f..1864f5de108 100644
--- a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr
+++ b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr
@@ -5,7 +5,7 @@ LL | fn b(x: &Foo) {
| ---- help: consider changing this to be a mutable reference: `&mut Foo`
LL | x.f();
LL | x.h();
- | ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error: aborting due to previous error
diff --git a/src/test/ui/span/borrowck-fn-in-const-b.stderr b/src/test/ui/span/borrowck-fn-in-const-b.stderr
index 8949a10481a..1f5d8bd32bb 100644
--- a/src/test/ui/span/borrowck-fn-in-const-b.stderr
+++ b/src/test/ui/span/borrowck-fn-in-const-b.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
LL | fn broken(x: &Vec<String>) {
| ------------ help: consider changing this to be a mutable reference: `&mut Vec<String>`
LL | x.push(format!("this is broken"));
- | ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error: aborting due to previous error
diff --git a/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr b/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr
index 7ba909d208a..7c5caba6eae 100644
--- a/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr
+++ b/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr
@@ -32,7 +32,7 @@ LL | v4.push(&id('y'));
| creates a temporary which is freed while still in use
...
LL | v4.use_ref();
- | -- borrow later used here
+ | ------------ borrow later used here
|
= note: consider using a `let` binding to create a longer lived value
diff --git a/src/test/ui/span/borrowck-object-mutability.stderr b/src/test/ui/span/borrowck-object-mutability.stderr
index fe6d05c588f..cc43f6d0928 100644
--- a/src/test/ui/span/borrowck-object-mutability.stderr
+++ b/src/test/ui/span/borrowck-object-mutability.stderr
@@ -5,7 +5,7 @@ LL | fn borrowed_receiver(x: &dyn Foo) {
| -------- help: consider changing this to be a mutable reference: `&mut dyn Foo`
LL | x.borrowed();
LL | x.borrowed_mut();
- | ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error[E0596]: cannot borrow `*x` as mutable, as `x` is not declared as mutable
--> $DIR/borrowck-object-mutability.rs:18:5
@@ -14,7 +14,7 @@ LL | fn owned_receiver(x: Box<dyn Foo>) {
| - help: consider changing this to be mutable: `mut x`
LL | x.borrowed();
LL | x.borrowed_mut();
- | ^ cannot borrow as mutable
+ | ^^^^^^^^^^^^^^^^ cannot borrow as mutable
error: aborting due to 2 previous errors
diff --git a/src/test/ui/span/destructor-restrictions.stderr b/src/test/ui/span/destructor-restrictions.stderr
index 8f75c388f65..53c9404620f 100644
--- a/src/test/ui/span/destructor-restrictions.stderr
+++ b/src/test/ui/span/destructor-restrictions.stderr
@@ -2,7 +2,7 @@ error[E0597]: `*a` does not live long enough
--> $DIR/destructor-restrictions.rs:8:10
|
LL | *a.borrow() + 1
- | ^---------
+ | ^^^^^^^^^^
| |
| borrowed value does not live long enough
| a temporary with access to the borrow is created here ...
diff --git a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr b/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr
index 8d4709d660f..3c2022748f0 100644
--- a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr
+++ b/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr
@@ -2,7 +2,7 @@ error[E0597]: `y` does not live long enough
--> $DIR/issue-23338-locals-die-before-temps-of-body.rs:10:5
|
LL | y.borrow().clone()
- | ^---------
+ | ^^^^^^^^^^
| |
| borrowed value does not live long enough
| a temporary with access to the borrow is created here ...
@@ -23,7 +23,7 @@ error[E0597]: `y` does not live long enough
--> $DIR/issue-23338-locals-die-before-temps-of-body.rs:17:9
|
LL | y.borrow().clone()
- | ^---------
+ | ^^^^^^^^^^
| |
| borrowed value does not live long enough
| a temporary with access to the borrow is created here ...
diff --git a/src/test/ui/span/issue-36537.stderr b/src/test/ui/span/issue-36537.stderr
index 0939584380a..79a0ebaeb8d 100644
--- a/src/test/ui/span/issue-36537.stderr
+++ b/src/test/ui/span/issue-36537.stderr
@@ -7,7 +7,7 @@ LL | p = &a;
LL | }
| - `a` dropped here while still borrowed
LL | p.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/span/issue-40157.stderr b/src/test/ui/span/issue-40157.stderr
index 0b365c3f7b6..57f80214a4f 100644
--- a/src/test/ui/span/issue-40157.stderr
+++ b/src/test/ui/span/issue-40157.stderr
@@ -2,7 +2,7 @@ error[E0597]: `foo` does not live long enough
--> $DIR/issue-40157.rs:2:53
|
LL | {println!("{:?}", match { let foo = vec![1, 2]; foo.get(1) } { x => x });}
- | ------------------------^^^---------
+ | ------------------------^^^^^^^^^^--
| | | |
| | | `foo` dropped here while still borrowed
| | borrowed value does not live long enough
diff --git a/src/test/ui/span/mut-arg-hint.stderr b/src/test/ui/span/mut-arg-hint.stderr
index e04e4cbdabb..8a7c504f005 100644
--- a/src/test/ui/span/mut-arg-hint.stderr
+++ b/src/test/ui/span/mut-arg-hint.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
LL | fn foo(mut a: &String) {
| ------- help: consider changing this to be a mutable reference: `&mut String`
LL | a.push_str("bar");
- | ^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^^^^^^^^^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
--> $DIR/mut-arg-hint.rs:8:5
@@ -12,7 +12,7 @@ error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
LL | pub fn foo<'a>(mut a: &'a String) {
| ---------- help: consider changing this to be a mutable reference: `&'a mut String`
LL | a.push_str("foo");
- | ^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^^^^^^^^^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
--> $DIR/mut-arg-hint.rs:15:9
@@ -20,7 +20,7 @@ error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
LL | pub fn foo(mut a: &String) {
| ------- help: consider changing this to be a mutable reference: `&mut String`
LL | a.push_str("foo");
- | ^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+ | ^^^^^^^^^^^^^^^^^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable
error: aborting due to 3 previous errors
diff --git a/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr b/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr
index 21b29464df5..4d976a7bbfa 100644
--- a/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr
+++ b/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr
@@ -7,7 +7,7 @@ LL | }
| - `b` dropped here while still borrowed
LL |
LL | p.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr b/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr
index 8e9cd595154..0b985de609c 100644
--- a/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr
+++ b/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr
@@ -7,7 +7,7 @@ LL | let c_ref = &c;
LL | }
| - `c` dropped here while still borrowed
LL | f.use_mut();
- | - borrow later used here
+ | ----------- borrow later used here
error: aborting due to previous error
diff --git a/src/test/ui/span/regions-escape-loop-via-vec.stderr b/src/test/ui/span/regions-escape-loop-via-vec.stderr
index b47250db723..2b649307739 100644
--- a/src/test/ui/span/regions-escape-loop-via-vec.stderr
+++ b/src/test/ui/span/regions-escape-loop-via-vec.stderr
@@ -7,7 +7,7 @@ LL | while x < 10 {
| ^ use of borrowed `x`
LL | let mut z = x;
LL | _y.push(&mut z);
- | -- borrow later used here
+ | --------------- borrow later used here
error[E0503]: cannot use `x` because it was mutably borrowed
--> $DIR/regions-escape-loop-via-vec.rs:6:21
@@ -18,14 +18,15 @@ LL | while x < 10 {
LL | let mut z = x;
| ^ use of borrowed `x`
LL | _y.push(&mut z);
- | -- borrow later used here
+ | --------------- borrow later used here
error[E0597]: `z` does not live long enough
--> $DIR/regions-escape-loop-via-vec.rs:7:17
|
LL | _y.push(&mut z);
- | -- ^^^^^^ borrowed value does not live long enough
- | |
+ | --------^^^^^^-
+ | | |
+ | | borrowed value does not live long enough
| borrow later used here
...
LL | }
@@ -38,7 +39,7 @@ LL | let mut _y = vec![&mut x];
| ------ borrow of `x` occurs here
...
LL | _y.push(&mut z);
- | -- borrow later used here
+ | --------------- borrow later used here
LL |
LL | x += 1;
| ^^^^^^ use of borrowed `x`
diff --git a/src/test/ui/span/send-is-not-static-std-sync.stderr b/src/test/ui/span/send-is-not-static-std-sync.stderr
index 81de8c29906..5d493a3e4ee 100644
--- a/src/test/ui/span/send-is-not-static-std-sync.stderr
+++ b/src/test/ui/span/send-is-not-static-std-sync.stderr
@@ -7,7 +7,7 @@ LL | drop(y);
| ^ move out of `y` occurs here
...
LL | *lock.lock().unwrap() = &z;
- | ---- borrow later used here
+ | ----------- borrow later used here
error[E0597]: `z` does not live long enough
--> $DIR/send-is-not-static-std-sync.rs:16:33
@@ -18,7 +18,7 @@ LL | }
| - `z` dropped here while still borrowed
LL |
LL | lock.use_ref(); // (Mutex is #[may_dangle] so its dtor does not use `z` => needs explicit use)
- | ---- borrow later used here
+ | -------------- borrow later used here
error[E0505]: cannot move out of `y` because it is borrowed
--> $DIR/send-is-not-static-std-sync.rs:27:10
@@ -29,7 +29,7 @@ LL | drop(y);
| ^ move out of `y` occurs here
...
LL | *lock.write().unwrap() = &z;
- | ---- borrow later used here
+ | ------------ borrow later used here
error[E0597]: `z` does not live long enough
--> $DIR/send-is-not-static-std-sync.rs:30:34
@@ -40,7 +40,7 @@ LL | }
| - `z` dropped here while still borrowed
LL |
LL | lock.use_ref(); // (RwLock is #[may_dangle] so its dtor does not use `z` => needs explicit use)
- | ---- borrow later used here
+ | -------------- borrow later used here
error[E0505]: cannot move out of `y` because it is borrowed
--> $DIR/send-is-not-static-std-sync.rs:43:10
@@ -51,7 +51,7 @@ LL | drop(y);
| ^ move out of `y` occurs here
...
LL | tx.send(&z).unwrap();
- | -- borrow later used here
+ | ----------- borrow later used here
error[E0597]: `z` does not live long enough
--> $DIR/send-is-not-static-std-sync.rs:46:17
diff --git a/src/test/ui/span/slice-borrow.stderr b/src/test/ui/span/slice-borrow.stderr
index 62a4a6009d4..27df25be3fa 100644
--- a/src/test/ui/span/slice-borrow.stderr
+++ b/src/test/ui/span/slice-borrow.stderr
@@ -7,7 +7,7 @@ LL | let x: &[isize] = &vec![1, 2, 3, 4, 5];
LL | }
| - temporary value is freed at the end of this statement
LL | y.use_ref();
- | - borrow later used here
+ | ----------- borrow later used here
|
= note: consider using a `let` binding to create a longer lived value
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.nll.stderr b/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.nll.stderr
index 043a771129a..80d3c940eb7 100644
--- a/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.nll.stderr
+++ b/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.nll.stderr
@@ -4,7 +4,7 @@ error[E0597]: `val` does not live long enough
LL | fn use_it<'a>(val: Box<dyn ObjectTrait<Assoc = i32>>) -> impl OtherTrait<'a> {
| -- lifetime `'a` defined here ------------------- opaque type requires that `val` is borrowed for `'a`
LL | val.use_self()
- | ^^^ borrowed value does not live long enough
+ | ^^^^^^^^^^^^^^ borrowed value does not live long enough
LL | }
| - `val` dropped here while still borrowed
|
@@ -13,23 +13,17 @@ help: you can add a bound to the opaque type to make it last less than `'static`
LL | fn use_it<'a>(val: Box<dyn ObjectTrait<Assoc = i32>>) -> impl OtherTrait<'a> + 'a {
| ++++
-error[E0515]: cannot return value referencing function parameter `val`
+error[E0515]: cannot return reference to function parameter `val`
--> $DIR/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.rs:43:9
|
LL | val.use_self()
- | ---^^^^^^^^^^^
- | |
- | returns a value referencing data owned by the current function
- | `val` is borrowed here
+ | ^^^^^^^^^^^^^^ returns a reference to data owned by the current function
-error[E0515]: cannot return value referencing function parameter `val`
+error[E0515]: cannot return reference to function parameter `val`
--> $DIR/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.rs:109:9
|
LL | val.use_self()
- | ---^^^^^^^^^^^
- | |
- | returns a value referencing data owned by the current function
- | `val` is borrowed here
+ | ^^^^^^^^^^^^^^ returns a reference to data owned by the current function
error: aborting due to 3 previous errors
diff --git a/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.stderr b/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.stderr
index 29991b6572f..e8c3a7908f5 100644
--- a/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.stderr
+++ b/src/test/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.stderr
@@ -4,7 +4,7 @@ error[E0597]: `val` does not live long enough
LL | fn use_it<'a>(val: Box<dyn ObjectTrait<Assoc = i32>>) -> impl OtherTrait<'a> {
| -- lifetime `'a` defined here ------------------- opaque type requires that `val` is borrowed for `'a`
LL | val.use_self()
- | ^^^ borrowed value does not live long enough
+ | ^^^^^^^^^^^^^^ borrowed value does not live long enough
LL | }
| - `val` dropped here while still borrowed
|
@@ -13,23 +13,17 @@ help: you can add a bound to the opaque type to make it last less than `'static`
LL | fn use_it<'a>(val: Box<dyn ObjectTrait<Assoc = i32>>) -> impl OtherTrait<'a> + 'a {
| ++++
-error[E0515]: cannot return value referencing function parameter `val`
+error[E0515]: cannot return reference to function parameter `val`
--> $DIR/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.rs:43:9
|
LL | val.use_self()
- | ---^^^^^^^^^^^
- | |
- | returns a value referencing data owned by the current function
- | `val` is borrowed here
+ | ^^^^^^^^^^^^^^ returns a reference to data owned by the current function
-error[E0515]: cannot return value referencing function parameter `val`
+error[E0515]: cannot return reference to function parameter `val`
--> $DIR/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.rs:109:9
|
LL | val.use_self()
- | ---^^^^^^^^^^^
- | |
- | returns a value referencing data owned by the current function
- | `val` is borrowed here
+ | ^^^^^^^^^^^^^^ returns a reference to data owned by the current function
error[E0772]: `val` has lifetime `'a` but calling `use_self` introduces an implicit `'static` lifetime requirement
--> $DIR/impl-on-dyn-trait-with-implicit-static-bound-needing-more-suggestions.rs:66:13
diff --git a/src/test/ui/unop-move-semantics.stderr b/src/test/ui/unop-move-semantics.stderr
index 95a0f4f5fab..199d5e37278 100644
--- a/src/test/ui/unop-move-semantics.stderr
+++ b/src/test/ui/unop-move-semantics.stderr
@@ -7,7 +7,7 @@ LL | !x;
| -- `x` moved due to usage in operator
LL |
LL | x.clone();
- | ^ value borrowed here after move
+ | ^^^^^^^^^ value borrowed here after move
|
note: calling this operator moves the left-hand side
--> $SRC_DIR/core/src/ops/bit.rs:LL:COL
diff --git a/src/test/ui/use/use-after-move-implicity-coerced-object.stderr b/src/test/ui/use/use-after-move-implicity-coerced-object.stderr
index b3266562d14..9d27358c9f3 100644
--- a/src/test/ui/use/use-after-move-implicity-coerced-object.stderr
+++ b/src/test/ui/use/use-after-move-implicity-coerced-object.stderr
@@ -7,7 +7,7 @@ LL | let mut l: Box<_> = box List { list: Vec::new() };
LL | l.push(n);
| - value moved here
LL | let x = n.to_string();
- | ^ value borrowed here after move
+ | ^^^^^^^^^^^^^ value borrowed here after move
error: aborting due to previous error