Skip to content

Commit

Permalink
Add tests for updated closure/generator printing
Browse files Browse the repository at this point in the history
Co-authored-by: Dhruv Jauhar <[email protected]>
Co-authored-by: Logan Mosier <[email protected]>
  • Loading branch information
3 people committed Sep 19, 2020
1 parent 381d4ac commit 343ba38
Show file tree
Hide file tree
Showing 22 changed files with 571 additions and 0 deletions.
23 changes: 23 additions & 0 deletions src/test/ui/closures/print/closure-print-generic-1.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
fn to_fn_once<F: FnOnce()>(f: F) -> F {
f
}

fn f<T: std::fmt::Display>(y: T) {
struct Foo<U: std::fmt::Display> {
x: U,
};

let foo = Foo { x: "x" };

let c = to_fn_once(move || {
println!("{} {}", foo.x, y);
});

c();
c();
//~^ ERROR use of moved value
}

fn main() {
f("S");
}
20 changes: 20 additions & 0 deletions src/test/ui/closures/print/closure-print-generic-1.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error[E0382]: use of moved value: `c`
--> $DIR/closure-print-generic-1.rs:17:5
|
LL | let c = to_fn_once(move || {
| - move occurs because `c` has type `[closure@$DIR/closure-print-generic-1.rs:12:24: 14:6]`, which does not implement the `Copy` trait
...
LL | c();
| --- `c` moved due to this call
LL | c();
| ^ value used here after move
|
note: this value implements `FnOnce`, which causes it to be moved when called
--> $DIR/closure-print-generic-1.rs:16:5
|
LL | c();
| ^

error: aborting due to previous error

For more information about this error, try `rustc --explain E0382`.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// compile-flags: -Ztrim-diagnostic-paths=off -Zverbose

mod mod1 {
pub fn f<T: std::fmt::Display>(t: T)
{
let x = 20;

let c = || println!("{} {}", t, x);
let c1 : () = c;
//~^ ERROR mismatched types
}
}

fn main() {
mod1::f(5i32);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error[E0308]: mismatched types
--> $DIR/closure-print-generic-trim-off-verbose.rs:9:23
|
LL | let c = || println!("{} {}", t, x);
| -------------------------- the found closure
LL | let c1 : () = c;
| -- ^ expected `()`, found closure
| |
| expected due to this
|
= note: expected unit type `()`
found closure `[mod1::f<T>::{{closure}}#0 closure_substs=(unavailable)]`
help: use parentheses to call this closure
|
LL | let c1 : () = c();
| ^^

error: aborting due to previous error

For more information about this error, try `rustc --explain E0308`.
16 changes: 16 additions & 0 deletions src/test/ui/closures/print/closure-print-generic-trim-off.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// compile-flags: -Ztrim-diagnostic-paths=off

mod mod1 {
pub fn f<T: std::fmt::Display>(t: T)
{
let x = 20;

let c = || println!("{} {}", t, x);
let c1 : () = c;
//~^ ERROR mismatched types
}
}

fn main() {
mod1::f(5i32);
}
20 changes: 20 additions & 0 deletions src/test/ui/closures/print/closure-print-generic-trim-off.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error[E0308]: mismatched types
--> $DIR/closure-print-generic-trim-off.rs:9:23
|
LL | let c = || println!("{} {}", t, x);
| -------------------------- the found closure
LL | let c1 : () = c;
| -- ^ expected `()`, found closure
| |
| expected due to this
|
= note: expected unit type `()`
found closure `[closure@$DIR/closure-print-generic-trim-off.rs:8:17: 8:43]`
help: use parentheses to call this closure
|
LL | let c1 : () = c();
| ^^

error: aborting due to previous error

For more information about this error, try `rustc --explain E0308`.
24 changes: 24 additions & 0 deletions src/test/ui/closures/print/closure-print-generic-verbose-1.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// compile-flags: -Zverbose

fn to_fn_once<F:FnOnce()>(f: F) -> F { f }

fn f<T: std::fmt::Display>(y: T) {
struct Foo<U: std::fmt::Display> {
x: U
};

let foo = Foo{ x: "x" };

let c = to_fn_once(move|| {
println!("{} {}", foo.x, y);
});

c();
c();
//~^ ERROR use of moved value
}


fn main() {
f("S");
}
20 changes: 20 additions & 0 deletions src/test/ui/closures/print/closure-print-generic-verbose-1.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error[E0382]: use of moved value: `c`
--> $DIR/closure-print-generic-verbose-1.rs:17:5
|
LL | let c = to_fn_once(move|| {
| - move occurs because `c` has type `[f<T>::{{closure}}#0 closure_kind_ty=i32 closure_sig_as_fn_ptr_ty=extern "rust-call" fn(()) upvars_ty=(Foo<&'_#10r str>, T)]`, which does not implement the `Copy` trait
...
LL | c();
| --- `c` moved due to this call
LL | c();
| ^ value used here after move
|
note: this value implements `FnOnce`, which causes it to be moved when called
--> $DIR/closure-print-generic-verbose-1.rs:16:5
|
LL | c();
| ^

error: aborting due to previous error

For more information about this error, try `rustc --explain E0382`.
16 changes: 16 additions & 0 deletions src/test/ui/closures/print/closure-print-generic-verbose.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// compile-flags: -Zverbose

mod mod1 {
pub fn f<T: std::fmt::Display>(t: T)
{
let x = 20;

let c = || println!("{} {}", t, x);
let c1 : () = c;
//~^ ERROR mismatched types
}
}

fn main() {
mod1::f(5i32);
}
20 changes: 20 additions & 0 deletions src/test/ui/closures/print/closure-print-generic-verbose.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error[E0308]: mismatched types
--> $DIR/closure-print-generic-verbose.rs:9:23
|
LL | let c = || println!("{} {}", t, x);
| -------------------------- the found closure
LL | let c1 : () = c;
| -- ^ expected `()`, found closure
| |
| expected due to this
|
= note: expected unit type `()`
found closure `[f<T>::{{closure}}#0 closure_substs=(unavailable)]`
help: use parentheses to call this closure
|
LL | let c1 : () = c();
| ^^

error: aborting due to previous error

For more information about this error, try `rustc --explain E0308`.
13 changes: 13 additions & 0 deletions src/test/ui/closures/print/closure-print-generic.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
mod mod1 {
pub fn f<T: std::fmt::Display>(t: T) {
let x = 20;

let c = || println!("{} {}", t, x);
let c1: () = c;
//~^ ERROR mismatched types
}
}

fn main() {
mod1::f(5i32);
}
20 changes: 20 additions & 0 deletions src/test/ui/closures/print/closure-print-generic.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error[E0308]: mismatched types
--> $DIR/closure-print-generic.rs:6:22
|
LL | let c = || println!("{} {}", t, x);
| -------------------------- the found closure
LL | let c1: () = c;
| -- ^ expected `()`, found closure
| |
| expected due to this
|
= note: expected unit type `()`
found closure `[closure@$DIR/closure-print-generic.rs:5:17: 5:43]`
help: use parentheses to call this closure
|
LL | let c1: () = c();
| ^^

error: aborting due to previous error

For more information about this error, try `rustc --explain E0308`.
12 changes: 12 additions & 0 deletions src/test/ui/closures/print/closure-print-verbose.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// compile-flags: -Zverbose

// Same as closure-coerce-fn-1.rs

// Ensure that capturing closures are never coerced to fns
// Especially interesting as non-capturing closures can be.

fn main() {
let mut a = 0u8;
let foo: fn(u8) -> u8 = |v: u8| { a += v; a };
//~^ ERROR mismatched types
}
14 changes: 14 additions & 0 deletions src/test/ui/closures/print/closure-print-verbose.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error[E0308]: mismatched types
--> $DIR/closure-print-verbose.rs:10:29
|
LL | let foo: fn(u8) -> u8 = |v: u8| { a += v; a };
| ------------ ^^^^^^^^^^^^^^^^^^^^^ expected fn pointer, found closure
| |
| expected due to this
|
= note: expected fn pointer `fn(u8) -> u8`
found closure `[main::{{closure}}#0 closure_substs=(unavailable)]`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0308`.
58 changes: 58 additions & 0 deletions src/test/ui/generator/print/generator-print-1.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// Same as: src/test/ui/generator/issue-68112.stderr

#![feature(generators, generator_trait)]

use std::{
cell::RefCell,
sync::Arc,
pin::Pin,
ops::{Generator, GeneratorState},
};

pub struct Ready<T>(Option<T>);
impl<T> Generator<()> for Ready<T> {
type Return = T;
type Yield = ();
fn resume(mut self: Pin<&mut Self>, _args: ()) -> GeneratorState<(), T> {
GeneratorState::Complete(self.0.take().unwrap())
}
}
pub fn make_gen1<T>(t: T) -> Ready<T> {
Ready(Some(t))
}

fn require_send(_: impl Send) {}

fn make_non_send_generator() -> impl Generator<Return = Arc<RefCell<i32>>> {
make_gen1(Arc::new(RefCell::new(0)))
}

fn test1() {
let send_gen = || {
let _non_send_gen = make_non_send_generator();
yield;
};
require_send(send_gen);
//~^ ERROR generator cannot be sent between threads
}

pub fn make_gen2<T>(t: T) -> impl Generator<Return = T> {
|| {
yield;
t
}
}
fn make_non_send_generator2() -> impl Generator<Return = Arc<RefCell<i32>>> {
make_gen2(Arc::new(RefCell::new(0)))
}

fn test2() {
let send_gen = || {
let _non_send_gen = make_non_send_generator2();
yield;
};
require_send(send_gen);
//~^ ERROR `RefCell<i32>` cannot be shared between threads safely
}

fn main() {}
40 changes: 40 additions & 0 deletions src/test/ui/generator/print/generator-print-1.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
error: generator cannot be sent between threads safely
--> $DIR/generator-print-1.rs:35:5
|
LL | fn require_send(_: impl Send) {}
| ---- required by this bound in `require_send`
...
LL | require_send(send_gen);
| ^^^^^^^^^^^^ generator is not `Send`
|
= help: the trait `Sync` is not implemented for `RefCell<i32>`
note: generator is not `Send` as this value is used across a yield
--> $DIR/generator-print-1.rs:33:9
|
LL | let _non_send_gen = make_non_send_generator();
| ------------- has type `impl Generator` which is not `Send`
LL | yield;
| ^^^^^ yield occurs here, with `_non_send_gen` maybe used later
LL | };
| - `_non_send_gen` is later dropped here

error[E0277]: `RefCell<i32>` cannot be shared between threads safely
--> $DIR/generator-print-1.rs:54:5
|
LL | fn require_send(_: impl Send) {}
| ---- required by this bound in `require_send`
...
LL | require_send(send_gen);
| ^^^^^^^^^^^^ `RefCell<i32>` cannot be shared between threads safely
|
= help: the trait `Sync` is not implemented for `RefCell<i32>`
= note: required because of the requirements on the impl of `Send` for `Arc<RefCell<i32>>`
= note: required because it appears within the type `[generator@$DIR/generator-print-1.rs:40:5: 43:6 {()}]`
= note: required because it appears within the type `impl Generator`
= note: required because it appears within the type `impl Generator`
= note: required because it appears within the type `{impl Generator, ()}`
= note: required because it appears within the type `[generator@$DIR/generator-print-1.rs:50:20: 53:6 {impl Generator, ()}]`

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0277`.
23 changes: 23 additions & 0 deletions src/test/ui/generator/print/generator-print-2.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Same as test/ui/generator/not-send-sync.rs

#![feature(generators)]

use std::cell::Cell;

fn main() {
fn assert_sync<T: Sync>(_: T) {}
fn assert_send<T: Send>(_: T) {}

assert_sync(|| {
//~^ ERROR: generator cannot be shared between threads safely
let a = Cell::new(2);
yield;
});

let a = Cell::new(2);
assert_send(|| {
//~^ ERROR: E0277
drop(&a);
yield;
});
}
Loading

0 comments on commit 343ba38

Please sign in to comment.