Merge branch 'master' into rusty-hermit

[rust.git] / src / test / ui / overlap-marker-trait.stderr

diff --git a/src/test/ui/overlap-marker-trait.stderr b/src/test/ui/overlap-marker-trait.stderr
index a59af8dcdbcf74a22ca833c9d517784ef554618c..15ebcd17b0dbc7d37170d79bf40d99846a13d8fd 100644 (file)
--- a/src/test/ui/overlap-marker-trait.stderr
+++ b/src/test/ui/overlap-marker-trait.stderr
@@ -1,14 +1,11 @@
 error[E0277]: the trait bound `NotDebugOrDisplay: Marker` is not satisfied
-  --> $DIR/overlap-marker-trait.rs:30:5
-   |
-LL |     is_marker::<NotDebugOrDisplay>();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Marker` is not implemented for `NotDebugOrDisplay`
-   |
-note: required by `is_marker`
-  --> $DIR/overlap-marker-trait.rs:18:1
+  --> $DIR/overlap-marker-trait.rs:30:17
    |
 LL | fn is_marker<T: Marker>() { }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |    ---------    ------ required by this bound in `is_marker`
+...
+LL |     is_marker::<NotDebugOrDisplay>();
+   |                 ^^^^^^^^^^^^^^^^^ the trait `Marker` is not implemented for `NotDebugOrDisplay`
 
 error: aborting due to previous error