about summary refs log tree commit diff
path: root/src/test/ui/compare-method
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/compare-method
parentcdbd8c2f2aa69c4b8fe6f004449440e87c4ab87e (diff)
downloadrust-fa2d9fc4b9e578d95fbf65613d1bf732fbdfb0d4.tar.gz
rust-fa2d9fc4b9e578d95fbf65613d1bf732fbdfb0d4.zip
Update UI tests
Diffstat (limited to 'src/test/ui/compare-method')
-rw-r--r--src/test/ui/compare-method/proj-outlives-region.stderr4
-rw-r--r--src/test/ui/compare-method/region-extra-2.stderr4
-rw-r--r--src/test/ui/compare-method/region-extra.stderr4
-rw-r--r--src/test/ui/compare-method/region-unrelated.stderr4
-rw-r--r--src/test/ui/compare-method/reordered-type-param.stderr4
-rw-r--r--src/test/ui/compare-method/trait-bound-on-type-parameter.stderr4
-rw-r--r--src/test/ui/compare-method/traits-misc-mismatch-1.stderr28
-rw-r--r--src/test/ui/compare-method/traits-misc-mismatch-2.stderr4
8 files changed, 28 insertions, 28 deletions
diff --git a/src/test/ui/compare-method/proj-outlives-region.stderr b/src/test/ui/compare-method/proj-outlives-region.stderr
index f695aa75906..9abecb2e03c 100644
--- a/src/test/ui/compare-method/proj-outlives-region.stderr
+++ b/src/test/ui/compare-method/proj-outlives-region.stderr
@@ -1,10 +1,10 @@
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/proj-outlives-region.rs:19:5
    |
-14 |     fn foo() where T: 'a;
+LL |     fn foo() where T: 'a;
    |     --------------------- definition of `foo` from trait
 ...
-19 |     fn foo() where U: 'a { } //~ ERROR E0276
+LL |     fn foo() where U: 'a { } //~ ERROR E0276
    |     ^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `U: 'a`
 
 error: aborting due to previous error
diff --git a/src/test/ui/compare-method/region-extra-2.stderr b/src/test/ui/compare-method/region-extra-2.stderr
index 59af795be57..32d7024db35 100644
--- a/src/test/ui/compare-method/region-extra-2.stderr
+++ b/src/test/ui/compare-method/region-extra-2.stderr
@@ -1,10 +1,10 @@
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/region-extra-2.rs:19:5
    |
-15 |     fn renew<'b: 'a>(self) -> &'b mut [T];
+LL |     fn renew<'b: 'a>(self) -> &'b mut [T];
    |     -------------------------------------- definition of `renew` from trait
 ...
-19 |     fn renew<'b: 'a>(self) -> &'b mut [T] where 'a: 'b {
+LL |     fn renew<'b: 'a>(self) -> &'b mut [T] where 'a: 'b {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `'a: 'b`
 
 error: aborting due to previous error
diff --git a/src/test/ui/compare-method/region-extra.stderr b/src/test/ui/compare-method/region-extra.stderr
index 8941abb6f16..ce62cc62e22 100644
--- a/src/test/ui/compare-method/region-extra.stderr
+++ b/src/test/ui/compare-method/region-extra.stderr
@@ -1,10 +1,10 @@
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/region-extra.rs:19:5
    |
-15 |     fn foo();
+LL |     fn foo();
    |     --------- definition of `foo` from trait
 ...
-19 |     fn foo() where 'a: 'b { } //~ ERROR impl has stricter
+LL |     fn foo() where 'a: 'b { } //~ ERROR impl has stricter
    |     ^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `'a: 'b`
 
 error: aborting due to previous error
diff --git a/src/test/ui/compare-method/region-unrelated.stderr b/src/test/ui/compare-method/region-unrelated.stderr
index c5e7cad7cfd..2026dd1f1cc 100644
--- a/src/test/ui/compare-method/region-unrelated.stderr
+++ b/src/test/ui/compare-method/region-unrelated.stderr
@@ -1,10 +1,10 @@
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/region-unrelated.rs:19:5
    |
-14 |     fn foo() where T: 'a;
+LL |     fn foo() where T: 'a;
    |     --------------------- definition of `foo` from trait
 ...
-19 |     fn foo() where V: 'a { }
+LL |     fn foo() where V: 'a { }
    |     ^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `V: 'a`
 
 error: aborting due to previous error
diff --git a/src/test/ui/compare-method/reordered-type-param.stderr b/src/test/ui/compare-method/reordered-type-param.stderr
index 9a5cb6267c3..8f0744fa56d 100644
--- a/src/test/ui/compare-method/reordered-type-param.stderr
+++ b/src/test/ui/compare-method/reordered-type-param.stderr
@@ -1,10 +1,10 @@
 error[E0053]: method `b` has an incompatible type for trait
   --> $DIR/reordered-type-param.rs:26:30
    |
-17 |   fn b<C:Clone,D>(&self, x: C) -> C;
+LL |   fn b<C:Clone,D>(&self, x: C) -> C;
    |                             - type in trait
 ...
-26 |   fn b<F:Clone,G>(&self, _x: G) -> G { panic!() } //~ ERROR method `b` has an incompatible type
+LL |   fn b<F:Clone,G>(&self, _x: G) -> G { panic!() } //~ ERROR method `b` has an incompatible type
    |                              ^ expected type parameter, found a different type parameter
    |
    = note: expected type `fn(&E, F) -> F`
diff --git a/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr b/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr
index 84460922b67..53aced771cc 100644
--- a/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr
+++ b/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr
@@ -1,10 +1,10 @@
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/trait-bound-on-type-parameter.rs:25:5
    |
-17 |   fn b<C,D>(&self, x: C) -> C;
+LL |   fn b<C,D>(&self, x: C) -> C;
    |   ---------------------------- definition of `b` from trait
 ...
-25 |     fn b<F: Sync, G>(&self, _x: F) -> F { panic!() } //~ ERROR E0276
+LL |     fn b<F: Sync, G>(&self, _x: F) -> F { panic!() } //~ ERROR E0276
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `F: std::marker::Sync`
 
 error: aborting due to previous error
diff --git a/src/test/ui/compare-method/traits-misc-mismatch-1.stderr b/src/test/ui/compare-method/traits-misc-mismatch-1.stderr
index 74b529aab03..a0c333c3a53 100644
--- a/src/test/ui/compare-method/traits-misc-mismatch-1.stderr
+++ b/src/test/ui/compare-method/traits-misc-mismatch-1.stderr
@@ -1,64 +1,64 @@
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/traits-misc-mismatch-1.rs:36:5
    |
-23 |     fn test_error1_fn<T: Eq>(&self);
+LL |     fn test_error1_fn<T: Eq>(&self);
    |     -------------------------------- definition of `test_error1_fn` from trait
 ...
-36 |     fn test_error1_fn<T: Ord>(&self) {}
+LL |     fn test_error1_fn<T: Ord>(&self) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: std::cmp::Ord`
 
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/traits-misc-mismatch-1.rs:40:5
    |
-24 |     fn test_error2_fn<T: Eq + Ord>(&self);
+LL |     fn test_error2_fn<T: Eq + Ord>(&self);
    |     -------------------------------------- definition of `test_error2_fn` from trait
 ...
-40 |     fn test_error2_fn<T: Eq + B>(&self) {}
+LL |     fn test_error2_fn<T: Eq + B>(&self) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: B`
 
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/traits-misc-mismatch-1.rs:44:5
    |
-25 |     fn test_error3_fn<T: Eq + Ord>(&self);
+LL |     fn test_error3_fn<T: Eq + Ord>(&self);
    |     -------------------------------------- definition of `test_error3_fn` from trait
 ...
-44 |     fn test_error3_fn<T: B + Eq>(&self) {}
+LL |     fn test_error3_fn<T: B + Eq>(&self) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: B`
 
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/traits-misc-mismatch-1.rs:54:5
    |
-28 |     fn test_error5_fn<T: A>(&self);
+LL |     fn test_error5_fn<T: A>(&self);
    |     ------------------------------- definition of `test_error5_fn` from trait
 ...
-54 |     fn test_error5_fn<T: B>(&self) {}
+LL |     fn test_error5_fn<T: B>(&self) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: B`
 
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/traits-misc-mismatch-1.rs:60:5
    |
-30 |     fn test_error7_fn<T: A>(&self);
+LL |     fn test_error7_fn<T: A>(&self);
    |     ------------------------------- definition of `test_error7_fn` from trait
 ...
-60 |     fn test_error7_fn<T: A + Eq>(&self) {}
+LL |     fn test_error7_fn<T: A + Eq>(&self) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: std::cmp::Eq`
 
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/traits-misc-mismatch-1.rs:63:5
    |
-31 |     fn test_error8_fn<T: B>(&self);
+LL |     fn test_error8_fn<T: B>(&self);
    |     ------------------------------- definition of `test_error8_fn` from trait
 ...
-63 |     fn test_error8_fn<T: C>(&self) {}
+LL |     fn test_error8_fn<T: C>(&self) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: C`
 
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/traits-misc-mismatch-1.rs:76:5
    |
-72 |     fn method<G:Getter<isize>>(&self);
+LL |     fn method<G:Getter<isize>>(&self);
    |     ---------------------------------- definition of `method` from trait
 ...
-76 |     fn method<G: Getter<usize>>(&self) {}
+LL |     fn method<G: Getter<usize>>(&self) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `G: Getter<usize>`
 
 error: aborting due to 7 previous errors
diff --git a/src/test/ui/compare-method/traits-misc-mismatch-2.stderr b/src/test/ui/compare-method/traits-misc-mismatch-2.stderr
index 97f96c7a6a5..921b0e5d1c4 100644
--- a/src/test/ui/compare-method/traits-misc-mismatch-2.stderr
+++ b/src/test/ui/compare-method/traits-misc-mismatch-2.stderr
@@ -1,10 +1,10 @@
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/traits-misc-mismatch-2.rs:23:5
    |
-19 |     fn zip<B, U: Iterator<U>>(self, other: U) -> ZipIterator<Self, U>;
+LL |     fn zip<B, U: Iterator<U>>(self, other: U) -> ZipIterator<Self, U>;
    |     ------------------------------------------------------------------ definition of `zip` from trait
 ...
-23 |     fn zip<B, U: Iterator<B>>(self, other: U) -> ZipIterator<T, U> {
+LL |     fn zip<B, U: Iterator<B>>(self, other: U) -> ZipIterator<T, U> {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `U: Iterator<B>`
 
 error: aborting due to previous error