about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWim Looman <wim@nemo157.com>2018-11-07 19:01:35 +0100
committerWim Looman <wim@nemo157.com>2019-01-27 22:59:00 +0100
commitc4bf5f9d63ea04b8907a3b41862f0372ed2afda8 (patch)
tree9d4dc73ddb05164748b03277c989909054404b96
parente7d66758cfce4dc2c87e3224b6ed47aee1fee257 (diff)
downloadrust-c4bf5f9d63ea04b8907a3b41862f0372ed2afda8.tar.gz
rust-c4bf5f9d63ea04b8907a3b41862f0372ed2afda8.zip
Temporary workaround for travis diagnostic difference
-rw-r--r--src/test/ui/generator/static-not-unpin.rs2
-rw-r--r--src/test/ui/generator/static-not-unpin.stderr8
2 files changed, 6 insertions, 4 deletions
diff --git a/src/test/ui/generator/static-not-unpin.rs b/src/test/ui/generator/static-not-unpin.rs
index 7586faf1842..b271e982fb4 100644
--- a/src/test/ui/generator/static-not-unpin.rs
+++ b/src/test/ui/generator/static-not-unpin.rs
@@ -1,5 +1,7 @@
 #![feature(generators)]
 
+// normalize-stderr-test "std::pin::Unpin" -> "std::marker::Unpin"
+
 use std::marker::Unpin;
 
 fn assert_unpin<T: Unpin>(_: T) {
diff --git a/src/test/ui/generator/static-not-unpin.stderr b/src/test/ui/generator/static-not-unpin.stderr
index 7a1243f5783..caf92f0ec69 100644
--- a/src/test/ui/generator/static-not-unpin.stderr
+++ b/src/test/ui/generator/static-not-unpin.stderr
@@ -1,11 +1,11 @@
-error[E0277]: the trait bound `[static generator@$DIR/static-not-unpin.rs:9:25: 11:6 _]: std::marker::Unpin` is not satisfied
-  --> $DIR/static-not-unpin.rs:12:5
+error[E0277]: the trait bound `[static generator@$DIR/static-not-unpin.rs:11:25: 13:6 _]: std::marker::Unpin` is not satisfied
+  --> $DIR/static-not-unpin.rs:14:5
    |
 LL |     assert_unpin(generator); //~ ERROR std::marker::Unpin` is not satisfied
-   |     ^^^^^^^^^^^^ the trait `std::marker::Unpin` is not implemented for `[static generator@$DIR/static-not-unpin.rs:9:25: 11:6 _]`
+   |     ^^^^^^^^^^^^ the trait `std::marker::Unpin` is not implemented for `[static generator@$DIR/static-not-unpin.rs:11:25: 13:6 _]`
    |
 note: required by `assert_unpin`
-  --> $DIR/static-not-unpin.rs:5:1
+  --> $DIR/static-not-unpin.rs:7:1
    |
 LL | fn assert_unpin<T: Unpin>(_: T) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^