Update new tests

diff --git a/src/test/ui/borrowck/issue-7573.nll.stderr b/src/test/ui/borrowck/issue-7573.nll.stderr
index 0da715bbdb76429b638fb4fe0aa464a946f2c5ea..20afecfe5de79f01db7429d9ae5aefc98fce5528 100644 (file)
--- a/src/test/ui/borrowck/issue-7573.nll.stderr
+++ b/src/test/ui/borrowck/issue-7573.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/issue-7573.rs:21:9
    |
 LL |     let mut lines_to_use: Vec<&CrateId> = Vec::new();
-   |         ---------------- `lines_to_use` is declared here, outside of the closure body
+   |         ---------------- `lines_to_use` declared here, outside of the closure body
 LL |
 LL |     let push_id = |installed_id: &CrateId| {
    |                    ------------ `installed_id` is a reference that is only valid in the closure body

diff --git a/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr b/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr
index 4797a9d456cc16c9bc3336024d4e1fa43cca7367..68a0fe0b4f07b7d5a965488381c7ff19b683e265 100644 (file)
--- a/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr
+++ b/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/regions-escape-bound-fn-2.rs:8:18
    |
 LL |     let mut x = None;
-   |         ----- `x` is declared here, outside of the closure body
+   |         ----- `x` declared here, outside of the closure body
 LL |     with_int(|y| x = Some(y));
    |               -  ^^^^^^^^^^^ `y` escapes the closure body here
    |               |

diff --git a/src/test/ui/borrowck/regions-escape-bound-fn.nll.stderr b/src/test/ui/borrowck/regions-escape-bound-fn.nll.stderr
index 2b3a9816e454df8cc2c227395f978e48477122e7..d304de92c7e1891462515dee167bfcbd735d3c8d 100644 (file)
--- a/src/test/ui/borrowck/regions-escape-bound-fn.nll.stderr
+++ b/src/test/ui/borrowck/regions-escape-bound-fn.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/regions-escape-bound-fn.rs:8:18
    |
 LL |     let mut x: Option<&isize> = None;
-   |         ----- `x` is declared here, outside of the closure body
+   |         ----- `x` declared here, outside of the closure body
 LL |     with_int(|y| x = Some(y));
    |               -  ^^^^^^^^^^^ `y` escapes the closure body here
    |               |

diff --git a/src/test/ui/borrowck/regions-escape-unboxed-closure.nll.stderr b/src/test/ui/borrowck/regions-escape-unboxed-closure.nll.stderr
index 8ceefd25344a45647f0e259ee4577784c46db5ae..d9931302f75fcbe428ddce88e052d61d3975c12a 100644 (file)
--- a/src/test/ui/borrowck/regions-escape-unboxed-closure.nll.stderr
+++ b/src/test/ui/borrowck/regions-escape-unboxed-closure.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/regions-escape-unboxed-closure.rs:6:23
    |
 LL |     let mut x: Option<&isize> = None;
-   |         ----- `x` is declared here, outside of the closure body
+   |         ----- `x` declared here, outside of the closure body
 LL |     with_int(&mut |y| x = Some(y));
    |                    -  ^^^^^^^^^^^ `y` escapes the closure body here
    |                    |

diff --git a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr
index f816f27a89236d9af506ca48a3afa72579fe9c1f..d7d716ed4cb0a52b572470d55ef6519080a5f51c 100644 (file)
--- a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr
+++ b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/expect-region-supply-region.rs:18:9
    |
 LL |     let mut f: Option<&u32> = None;
-   |         ----- `f` is declared here, outside of the closure body
+   |         ----- `f` declared here, outside of the closure body
 LL |     closure_expecting_bound(|x| {
    |                              - `x` is a reference that is only valid in the closure body
 LL |         f = Some(x);
@@ -12,7 +12,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/expect-region-supply-region.rs:28:9
    |
 LL |     let mut f: Option<&u32> = None;
-   |         ----- `f` is declared here, outside of the closure body
+   |         ----- `f` declared here, outside of the closure body
 LL |     closure_expecting_bound(|x: &u32| {
    |                              - `x` is a reference that is only valid in the closure body
 LL |         f = Some(x);

diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr
index d352d119a70e85e2997fcff19d0d150a8ebd8b68..92a3942c916b749b166b32d79b24a7b0576ecb18 100644 (file)
--- a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr
+++ b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr
@@ -4,7 +4,7 @@ error[E0521]: borrowed data escapes outside of function
 LL | fn caller2<'a,'b,F:Foo<'a>>(a: Inv<'a>, b: Inv<'b>, f: F) {
    |                             -           - `b` is a reference that is only valid in the function body
    |                             |
-   |                             `a` is declared here, outside of the function body
+   |                             `a` declared here, outside of the function body
 LL |     // Here the value provided for 'y is 'b, and hence 'b:'a does not hold.
 LL |     f.method(b);
    |     ^^^^^^^^^^^ `b` escapes the function body here

diff --git a/src/test/ui/regions/regions-nested-fns.nll.stderr b/src/test/ui/regions/regions-nested-fns.nll.stderr
index 305a76815aca98ba6c50ee3a3b2641fdff203c93..9d966486f98d1d9a1cd1740e75340e0251136dcc 100644 (file)
--- a/src/test/ui/regions/regions-nested-fns.nll.stderr
+++ b/src/test/ui/regions/regions-nested-fns.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/regions-nested-fns.rs:10:9
    |
 LL |     let mut ay = &y;
-   |         ------ `ay` is declared here, outside of the closure body
+   |         ------ `ay` declared here, outside of the closure body
 LL | 
 LL |     ignore::<Box<dyn for<'z> FnMut(&'z isize)>>(Box::new(|z| {
    |                                                           - `z` is a reference that is only valid in the closure body