about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2019-12-22 19:04:10 -0500
committerMark Rousskov <mark.simulacrum@gmail.com>2019-12-22 19:04:10 -0500
commit86f12c110b7dafe280cd06daa632011e871d5566 (patch)
tree91316f6087eb98dd4001f5fcb97670f9faa82b1b /src
parenta06baa56b95674fc626b3c3fd680d6a65357fe60 (diff)
downloadrust-86f12c110b7dafe280cd06daa632011e871d5566.tar.gz
rust-86f12c110b7dafe280cd06daa632011e871d5566.zip
test fallout
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/async-await/issues/issue-62009-1.stderr2
-rw-r--r--src/test/ui/closures/closure-move-sync.stderr8
-rw-r--r--src/test/ui/no-send-res-ports.stderr4
-rw-r--r--src/test/ui/type_length_limit.stderr4
4 files changed, 9 insertions, 9 deletions
diff --git a/src/test/ui/async-await/issues/issue-62009-1.stderr b/src/test/ui/async-await/issues/issue-62009-1.stderr
index 6c8e0d0a5c4..3a49a5a97de 100644
--- a/src/test/ui/async-await/issues/issue-62009-1.stderr
+++ b/src/test/ui/async-await/issues/issue-62009-1.stderr
@@ -35,7 +35,7 @@ LL |     (|_| 2333).await;
    | 
   ::: $SRC_DIR/libstd/future.rs:LL:COL
    |
-LL |     F: Future
+LL |     F: Future,
    |        ------ required by this bound in `std::future::poll_with_tls_context`
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/closures/closure-move-sync.stderr b/src/test/ui/closures/closure-move-sync.stderr
index ac5e3ccb421..dcef16dff4c 100644
--- a/src/test/ui/closures/closure-move-sync.stderr
+++ b/src/test/ui/closures/closure-move-sync.stderr
@@ -6,8 +6,8 @@ LL |     let t = thread::spawn(|| {
    | 
   ::: $SRC_DIR/libstd/thread/mod.rs:LL:COL
    |
-LL |     F: FnOnce() -> T, F: Send + 'static, T: Send + 'static
-   |                          ---- required by this bound in `std::thread::spawn`
+LL |     F: Send + 'static,
+   |        ---- required by this bound in `std::thread::spawn`
    |
    = help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Receiver<()>`
    = note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Receiver<()>`
@@ -21,8 +21,8 @@ LL |     thread::spawn(|| tx.send(()).unwrap());
    | 
   ::: $SRC_DIR/libstd/thread/mod.rs:LL:COL
    |
-LL |     F: FnOnce() -> T, F: Send + 'static, T: Send + 'static
-   |                          ---- required by this bound in `std::thread::spawn`
+LL |     F: Send + 'static,
+   |        ---- required by this bound in `std::thread::spawn`
    |
    = help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Sender<()>`
    = note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Sender<()>`
diff --git a/src/test/ui/no-send-res-ports.stderr b/src/test/ui/no-send-res-ports.stderr
index f23a3bf832a..9dbe81db0b5 100644
--- a/src/test/ui/no-send-res-ports.stderr
+++ b/src/test/ui/no-send-res-ports.stderr
@@ -6,8 +6,8 @@ LL |     thread::spawn(move|| {
    | 
   ::: $SRC_DIR/libstd/thread/mod.rs:LL:COL
    |
-LL |     F: FnOnce() -> T, F: Send + 'static, T: Send + 'static
-   |                          ---- required by this bound in `std::thread::spawn`
+LL |     F: Send + 'static,
+   |        ---- required by this bound in `std::thread::spawn`
    |
    = help: within `[closure@$DIR/no-send-res-ports.rs:26:19: 30:6 x:main::Foo]`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>`
    = note: required because it appears within the type `Port<()>`
diff --git a/src/test/ui/type_length_limit.stderr b/src/test/ui/type_length_limit.stderr
index 7e308f107ba..8a9ef993bda 100644
--- a/src/test/ui/type_length_limit.stderr
+++ b/src/test/ui/type_length_limit.stderr
@@ -1,8 +1,8 @@
 error: reached the type-length limit while instantiating `std::mem::drop::<std::option::Op... G), (G, G, G), (G, G, G))))))>>`
   --> $SRC_DIR/libcore/mem/mod.rs:LL:COL
    |
-LL | pub fn drop<T>(_x: T) { }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | pub fn drop<T>(_x: T) {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: consider adding a `#![type_length_limit="1094"]` attribute to your crate