about summary refs log tree commit diff
path: root/src/test/ui/generator
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2018-02-23 03:42:32 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2018-02-26 20:24:02 +0300
commitfa2d9fc4b9e578d95fbf65613d1bf732fbdfb0d4 (patch)
tree1eb1a49b4750e2704d3d724fb4a12ea4e2237eff /src/test/ui/generator
parentcdbd8c2f2aa69c4b8fe6f004449440e87c4ab87e (diff)
Update UI tests
Diffstat (limited to 'src/test/ui/generator')
-rw-r--r--src/test/ui/generator/auto-trait-regions.stderr8


-rw-r--r--src/test/ui/generator/borrowing.stderr14


-rw-r--r--src/test/ui/generator/dropck.stderr6


-rw-r--r--src/test/ui/generator/generator-with-nll.stderr12


-rw-r--r--src/test/ui/generator/issue-48048.stderr4


-rw-r--r--src/test/ui/generator/no-arguments-on-generators.stderr2


-rw-r--r--src/test/ui/generator/not-send-sync.stderr8


-rw-r--r--src/test/ui/generator/pattern-borrow.stderr4


-rw-r--r--src/test/ui/generator/ref-escapes-but-not-over-yield.stderr6


-rw-r--r--src/test/ui/generator/sized-yield.stderr8


-rw-r--r--src/test/ui/generator/unsafe-immovable.stderr6


-rw-r--r--src/test/ui/generator/yield-in-args.stderr2


-rw-r--r--src/test/ui/generator/yield-in-const.stderr2


-rw-r--r--src/test/ui/generator/yield-in-function.stderr2


-rw-r--r--src/test/ui/generator/yield-in-static.stderr2


-rw-r--r--src/test/ui/generator/yield-while-iterating.stderr12


-rw-r--r--src/test/ui/generator/yield-while-local-borrowed.stderr16


-rw-r--r--src/test/ui/generator/yield-while-ref-reborrowed.stderr8


18 files changed, 61 insertions, 61 deletions
diff --git a/src/test/ui/generator/auto-trait-regions.stderr b/src/test/ui/generator/auto-trait-regions.stderr
index 2fc359946fa..8f78bb8fa88 100644
--- a/src/test/ui/generator/auto-trait-regions.stderr
+++ b/src/test/ui/generator/auto-trait-regions.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `No: Foo` is not satisfied in `[generator@$DIR/auto-trait-regions.rs:35:15: 39:6 x:&&'static OnlyFooIfStaticRef for<'r> {&'r OnlyFooIfStaticRef, ()}]`
   --> $DIR/auto-trait-regions.rs:40:5
    |
-40 |     assert_foo(gen); //~ ERROR the trait bound `No: Foo` is not satisfied
+LL |     assert_foo(gen); //~ ERROR the trait bound `No: Foo` is not satisfied
    |     ^^^^^^^^^^ within `[generator@$DIR/auto-trait-regions.rs:35:15: 39:6 x:&&'static OnlyFooIfStaticRef for<'r> {&'r OnlyFooIfStaticRef, ()}]`, the trait `Foo` is not implemented for `No`
    |
    = help: the following implementations were found:
@@ -13,13 +13,13 @@ error[E0277]: the trait bound `No: Foo` is not satisfied in `[generator@$DIR/aut
 note: required by `assert_foo`
   --> $DIR/auto-trait-regions.rs:30:1
    |
-30 | fn assert_foo<T: Foo>(f: T) {}
+LL | fn assert_foo<T: Foo>(f: T) {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0279]: the requirement `for<'r, 's> 'r : 's` is not satisfied (`expected bound lifetime parameter, found concrete lifetime`)
   --> $DIR/auto-trait-regions.rs:57:5
    |
-57 |     assert_foo(gen); //~ ERROR the requirement `for<'r, 's> 'r : 's` is not satisfied
+LL |     assert_foo(gen); //~ ERROR the requirement `for<'r, 's> 'r : 's` is not satisfied
    |     ^^^^^^^^^^
    |
    = note: required because of the requirements on the impl of `for<'r, 's> Foo` for `A<'_, '_>`
@@ -28,7 +28,7 @@ error[E0279]: the requirement `for<'r, 's> 'r : 's` is not satisfied (`expected
 note: required by `assert_foo`
   --> $DIR/auto-trait-regions.rs:30:1
    |
-30 | fn assert_foo<T: Foo>(f: T) {}
+LL | fn assert_foo<T: Foo>(f: T) {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/generator/borrowing.stderr b/src/test/ui/generator/borrowing.stderr
index 1d58bca15fa..b60e90dbf36 100644
--- a/src/test/ui/generator/borrowing.stderr
+++ b/src/test/ui/generator/borrowing.stderr
@@ -1,28 +1,28 @@
 error[E0597]: `a` does not live long enough
   --> $DIR/borrowing.rs:18:20
    |
-18 |         (|| yield &a).resume()
+LL |         (|| yield &a).resume()
    |          --        ^ borrowed value does not live long enough
    |          |
    |          capture occurs here
 19 |         //~^ ERROR: `a` does not live long enough
-20 |     };
+LL |     };
    |     - borrowed value only lives until here
 ...
-29 | }
+LL | }
    | - borrowed value needs to live until here
 
 error[E0597]: `a` does not live long enough
   --> $DIR/borrowing.rs:25:20
    |
-24 |         || {
+LL |         || {
    |         -- capture occurs here
-25 |             yield &a
+LL |             yield &a
    |                    ^ borrowed value does not live long enough
 ...
-28 |     };
+LL |     };
    |     - borrowed value only lives until here
-29 | }
+LL | }
    | - borrowed value needs to live until here
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/generator/dropck.stderr b/src/test/ui/generator/dropck.stderr
index 01ef5753424..1c4ee560ff6 100644
--- a/src/test/ui/generator/dropck.stderr
+++ b/src/test/ui/generator/dropck.stderr
@@ -1,13 +1,13 @@
 error[E0597]: `ref_` does not live long enough
   --> $DIR/dropck.rs:23:18
    |
-21 |     gen = || {
+LL |     gen = || {
    |           -- capture occurs here
 22 |         // but the generator can use it to drop a `Ref<'a, i32>`.
-23 |         let _d = ref_.take(); //~ ERROR `ref_` does not live long enough
+LL |         let _d = ref_.take(); //~ ERROR `ref_` does not live long enough
    |                  ^^^^ borrowed value does not live long enough
 ...
-28 | }
+LL | }
    | - borrowed value dropped before borrower
    |
    = note: values in a scope are dropped in the opposite order they are created
diff --git a/src/test/ui/generator/generator-with-nll.stderr b/src/test/ui/generator/generator-with-nll.stderr
index ab81501f237..b97131c8166 100644
--- a/src/test/ui/generator/generator-with-nll.stderr
+++ b/src/test/ui/generator/generator-with-nll.stderr
@@ -1,28 +1,28 @@
 error[E0626]: borrow may still be in use when generator yields (Ast)
   --> $DIR/generator-with-nll.rs:19:23
    |
-19 |         let _a = &mut true; //~ ERROR borrow may still be in use when generator yields (Ast)
+LL |         let _a = &mut true; //~ ERROR borrow may still be in use when generator yields (Ast)
    |                       ^^^^
 ...
-22 |         yield ();
+LL |         yield ();
    |         -------- possible yield occurs here
 
 error[E0626]: borrow may still be in use when generator yields (Ast)
   --> $DIR/generator-with-nll.rs:20:22
    |
-20 |         let b = &mut true; //~ ERROR borrow may still be in use when generator yields (Ast)
+LL |         let b = &mut true; //~ ERROR borrow may still be in use when generator yields (Ast)
    |                      ^^^^
 21 |         //~^ borrow may still be in use when generator yields (Mir)
-22 |         yield ();
+LL |         yield ();
    |         -------- possible yield occurs here
 
 error[E0626]: borrow may still be in use when generator yields (Mir)
   --> $DIR/generator-with-nll.rs:20:17
    |
-20 |         let b = &mut true; //~ ERROR borrow may still be in use when generator yields (Ast)
+LL |         let b = &mut true; //~ ERROR borrow may still be in use when generator yields (Ast)
    |                 ^^^^^^^^^
 21 |         //~^ borrow may still be in use when generator yields (Mir)
-22 |         yield ();
+LL |         yield ();
    |         -------- possible yield occurs here
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/generator/issue-48048.stderr b/src/test/ui/generator/issue-48048.stderr
index 04e4397cc5c..75918766754 100644
--- a/src/test/ui/generator/issue-48048.stderr
+++ b/src/test/ui/generator/issue-48048.stderr
@@ -1,9 +1,9 @@
 error[E0626]: borrow may still be in use when generator yields
   --> $DIR/issue-48048.rs:19:9
    |
-19 |         x.0({ //~ ERROR borrow may still be in use when generator yields
+LL |         x.0({ //~ ERROR borrow may still be in use when generator yields
    |         ^^^
-20 |             yield;
+LL |             yield;
    |             ----- possible yield occurs here
 
 error: aborting due to previous error
diff --git a/src/test/ui/generator/no-arguments-on-generators.stderr b/src/test/ui/generator/no-arguments-on-generators.stderr
index 84a5edf4f22..6091946f2fa 100644
--- a/src/test/ui/generator/no-arguments-on-generators.stderr
+++ b/src/test/ui/generator/no-arguments-on-generators.stderr
@@ -1,7 +1,7 @@
 error[E0628]: generators cannot have explicit arguments
   --> $DIR/no-arguments-on-generators.rs:14:15
    |
-14 |     let gen = |start| { //~ ERROR generators cannot have explicit arguments
+LL |     let gen = |start| { //~ ERROR generators cannot have explicit arguments
    |               ^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/generator/not-send-sync.stderr b/src/test/ui/generator/not-send-sync.stderr
index cd2d16fd662..6ca583bf16d 100644
--- a/src/test/ui/generator/not-send-sync.stderr
+++ b/src/test/ui/generator/not-send-sync.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `std::cell::Cell<i32>: std::marker::Sync` is not satisfied
   --> $DIR/not-send-sync.rs:26:5
    |
-26 |     assert_send(|| {
+LL |     assert_send(|| {
    |     ^^^^^^^^^^^ `std::cell::Cell<i32>` cannot be shared between threads safely
    |
    = help: the trait `std::marker::Sync` is not implemented for `std::cell::Cell<i32>`
@@ -10,13 +10,13 @@ error[E0277]: the trait bound `std::cell::Cell<i32>: std::marker::Sync` is not s
 note: required by `main::assert_send`
   --> $DIR/not-send-sync.rs:17:5
    |
-17 |     fn assert_send<T: Send>(_: T) {}
+LL |     fn assert_send<T: Send>(_: T) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `std::cell::Cell<i32>: std::marker::Sync` is not satisfied in `[generator@$DIR/not-send-sync.rs:19:17: 23:6 {std::cell::Cell<i32>, ()}]`
   --> $DIR/not-send-sync.rs:19:5
    |
-19 |     assert_sync(|| {
+LL |     assert_sync(|| {
    |     ^^^^^^^^^^^ `std::cell::Cell<i32>` cannot be shared between threads safely
    |
    = help: within `[generator@$DIR/not-send-sync.rs:19:17: 23:6 {std::cell::Cell<i32>, ()}]`, the trait `std::marker::Sync` is not implemented for `std::cell::Cell<i32>`
@@ -25,7 +25,7 @@ error[E0277]: the trait bound `std::cell::Cell<i32>: std::marker::Sync` is not s
 note: required by `main::assert_sync`
   --> $DIR/not-send-sync.rs:16:5
    |
-16 |     fn assert_sync<T: Sync>(_: T) {}
+LL |     fn assert_sync<T: Sync>(_: T) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/generator/pattern-borrow.stderr b/src/test/ui/generator/pattern-borrow.stderr
index 2346714b212..6acfd96d887 100644
--- a/src/test/ui/generator/pattern-borrow.stderr
+++ b/src/test/ui/generator/pattern-borrow.stderr
@@ -1,9 +1,9 @@
 error[E0626]: borrow may still be in use when generator yields
   --> $DIR/pattern-borrow.rs:19:24
    |
-19 |         if let Test::A(ref _a) = test { //~ ERROR borrow may still be in use when generator yields
+LL |         if let Test::A(ref _a) = test { //~ ERROR borrow may still be in use when generator yields
    |                        ^^^^^^
-20 |             yield ();
+LL |             yield ();
    |             -------- possible yield occurs here
 
 error: aborting due to previous error
diff --git a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr b/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr
index b752a4c064c..c2af17d97e6 100644
--- a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr
+++ b/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr
@@ -1,12 +1,12 @@
 error[E0597]: `b` does not live long enough
   --> $DIR/ref-escapes-but-not-over-yield.rs:24:14
    |
-24 |         a = &b;
+LL |         a = &b;
    |              ^ borrowed value does not live long enough
 25 |         //~^ ERROR `b` does not live long enough
-26 |     };
+LL |     };
    |     - `b` dropped here while still borrowed
-27 | }
+LL | }
    | - borrowed value needs to live until here
 
 error: aborting due to previous error
diff --git a/src/test/ui/generator/sized-yield.stderr b/src/test/ui/generator/sized-yield.stderr
index a61adcf4a77..c10adad99eb 100644
--- a/src/test/ui/generator/sized-yield.stderr
+++ b/src/test/ui/generator/sized-yield.stderr
@@ -1,10 +1,10 @@
 error[E0277]: the trait bound `str: std::marker::Sized` is not satisfied
   --> $DIR/sized-yield.rs:17:26
    |
-17 |      let mut gen = move || { //~ ERROR the trait bound `str: std::marker::Sized` is not satisfied
+LL |      let mut gen = move || { //~ ERROR the trait bound `str: std::marker::Sized` is not satisfied
    |  __________________________^
-18 | |        yield s[..];
-19 | |    };
+LL | |        yield s[..];
+LL | |    };
    | |____^ `str` does not have a constant size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `str`
@@ -13,7 +13,7 @@ error[E0277]: the trait bound `str: std::marker::Sized` is not satisfied
 error[E0277]: the trait bound `str: std::marker::Sized` is not satisfied
   --> $DIR/sized-yield.rs:20:8
    |
-20 |    gen.resume(); //~ ERROR the trait bound `str: std::marker::Sized` is not satisfied
+LL |    gen.resume(); //~ ERROR the trait bound `str: std::marker::Sized` is not satisfied
    |        ^^^^^^ `str` does not have a constant size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `str`
diff --git a/src/test/ui/generator/unsafe-immovable.stderr b/src/test/ui/generator/unsafe-immovable.stderr
index 87a85c6845f..a6755283bce 100644
--- a/src/test/ui/generator/unsafe-immovable.stderr
+++ b/src/test/ui/generator/unsafe-immovable.stderr
@@ -1,9 +1,9 @@
 error[E0133]: construction of immovable generator requires unsafe function or block
   --> $DIR/unsafe-immovable.rs:14:5
    |
-14 | /     static || { //~ ERROR: construction of immovable generator requires unsafe
-15 | |         yield;
-16 | |     };
+LL | /     static || { //~ ERROR: construction of immovable generator requires unsafe
+LL | |         yield;
+LL | |     };
    | |_____^ construction of immovable generator
 
 error: aborting due to previous error
diff --git a/src/test/ui/generator/yield-in-args.stderr b/src/test/ui/generator/yield-in-args.stderr
index f69948c9004..26152f73f5a 100644
--- a/src/test/ui/generator/yield-in-args.stderr
+++ b/src/test/ui/generator/yield-in-args.stderr
@@ -1,7 +1,7 @@
 error[E0626]: borrow may still be in use when generator yields
   --> $DIR/yield-in-args.rs:18:14
    |
-18 |         foo(&b, yield); //~ ERROR
+LL |         foo(&b, yield); //~ ERROR
    |              ^  ----- possible yield occurs here
 
 error: aborting due to previous error
diff --git a/src/test/ui/generator/yield-in-const.stderr b/src/test/ui/generator/yield-in-const.stderr
index b7faca23ed3..119f94695e7 100644
--- a/src/test/ui/generator/yield-in-const.stderr
+++ b/src/test/ui/generator/yield-in-const.stderr
@@ -3,7 +3,7 @@ error[E0601]: main function not found
 error[E0627]: yield statement outside of generator literal
   --> $DIR/yield-in-const.rs:13:17
    |
-13 | const A: u8 = { yield 3u8; 3u8};
+LL | const A: u8 = { yield 3u8; 3u8};
    |                 ^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/generator/yield-in-function.stderr b/src/test/ui/generator/yield-in-function.stderr
index 3aa4130a148..b1d76b41fa2 100644
--- a/src/test/ui/generator/yield-in-function.stderr
+++ b/src/test/ui/generator/yield-in-function.stderr
@@ -1,7 +1,7 @@
 error[E0627]: yield statement outside of generator literal
   --> $DIR/yield-in-function.rs:13:13
    |
-13 | fn main() { yield; }
+LL | fn main() { yield; }
    |             ^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/generator/yield-in-static.stderr b/src/test/ui/generator/yield-in-static.stderr
index 2f3c41f71c3..0a2da21e692 100644
--- a/src/test/ui/generator/yield-in-static.stderr
+++ b/src/test/ui/generator/yield-in-static.stderr
@@ -3,7 +3,7 @@ error[E0601]: main function not found
 error[E0627]: yield statement outside of generator literal
   --> $DIR/yield-in-static.rs:13:18
    |
-13 | static B: u8 = { yield 3u8; 3u8};
+LL | static B: u8 = { yield 3u8; 3u8};
    |                  ^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/generator/yield-while-iterating.stderr b/src/test/ui/generator/yield-while-iterating.stderr
index 27a13a6382c..c7d57f60313 100644
--- a/src/test/ui/generator/yield-while-iterating.stderr
+++ b/src/test/ui/generator/yield-while-iterating.stderr
@@ -1,23 +1,23 @@
 error[E0626]: borrow may still be in use when generator yields
   --> $DIR/yield-while-iterating.rs:22:19
    |
-22 |         for p in &x { //~ ERROR
+LL |         for p in &x { //~ ERROR
    |                   ^
-23 |             yield();
+LL |             yield();
    |             ------- possible yield occurs here
 
 error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable
   --> $DIR/yield-while-iterating.rs:67:20
    |
-62 |     let mut b = || {
+LL |     let mut b = || {
    |                 -- mutable borrow occurs here
-63 |         for p in &mut x {
+LL |         for p in &mut x {
    |                       - previous borrow occurs due to use of `x` in closure
 ...
-67 |     println!("{}", x[0]); //~ ERROR
+LL |     println!("{}", x[0]); //~ ERROR
    |                    ^ immutable borrow occurs here
 68 |     b.resume();
-69 | }
+LL | }
    | - mutable borrow ends here
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/generator/yield-while-local-borrowed.stderr b/src/test/ui/generator/yield-while-local-borrowed.stderr
index d28ea1d4368..7417cdd9aa5 100644
--- a/src/test/ui/generator/yield-while-local-borrowed.stderr
+++ b/src/test/ui/generator/yield-while-local-borrowed.stderr
@@ -1,37 +1,37 @@
 error[E0626]: borrow may still be in use when generator yields (Ast)
   --> $DIR/yield-while-local-borrowed.rs:24:22
    |
-24 |         let a = &mut 3;
+LL |         let a = &mut 3;
    |                      ^
 ...
-27 |         yield();
+LL |         yield();
    |         ------- possible yield occurs here
 
 error[E0626]: borrow may still be in use when generator yields (Ast)
   --> $DIR/yield-while-local-borrowed.rs:52:22
    |
-52 |             let b = &a;
+LL |             let b = &a;
    |                      ^
 ...
-55 |             yield();
+LL |             yield();
    |             ------- possible yield occurs here
 
 error[E0626]: borrow may still be in use when generator yields (Mir)
   --> $DIR/yield-while-local-borrowed.rs:24:17
    |
-24 |         let a = &mut 3;
+LL |         let a = &mut 3;
    |                 ^^^^^^
 ...
-27 |         yield();
+LL |         yield();
    |         ------- possible yield occurs here
 
 error[E0626]: borrow may still be in use when generator yields (Mir)
   --> $DIR/yield-while-local-borrowed.rs:52:21
    |
-52 |             let b = &a;
+LL |             let b = &a;
    |                     ^^
 ...
-55 |             yield();
+LL |             yield();
    |             ------- possible yield occurs here
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.stderr b/src/test/ui/generator/yield-while-ref-reborrowed.stderr
index d2aa84f3c09..01222444ca4 100644
--- a/src/test/ui/generator/yield-while-ref-reborrowed.stderr
+++ b/src/test/ui/generator/yield-while-ref-reborrowed.stderr
@@ -1,15 +1,15 @@
 error[E0501]: cannot borrow `x` as immutable because previous closure requires unique access
   --> $DIR/yield-while-ref-reborrowed.rs:45:20
    |
-40 |     let mut b = || {
+LL |     let mut b = || {
    |                 -- closure construction occurs here
-41 |         let a = &mut *x;
+LL |         let a = &mut *x;
    |                       - previous borrow occurs due to use of `x` in closure
 ...
-45 |     println!("{}", x); //~ ERROR
+LL |     println!("{}", x); //~ ERROR
    |                    ^ borrow occurs here
 46 |     b.resume();
-47 | }
+LL | }
    | - borrow from closure ends here
 
 error: aborting due to previous error

 

generated by cgit-pink 1.4.1-3-g733a5 (git 2.37.1) at 2026-10-07 00:09:01 +0000