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>2017-06-25 05:30:20 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2017-07-08 01:56:27 +0300
commit96bcdac9e483e0e7d8a02f82c0ab961a536cafc4 (patch)
tree008bb8627d6179ea901734ded8806ff6bfdac268 /src/test/ui/compare-method
parentaffb8ee8316c7720a1f752d70d3fa2542100f425 (diff)
Make sufficiently old or low-impact compatibility lints deny-by-default
Diffstat (limited to 'src/test/ui/compare-method')
-rw-r--r--src/test/ui/compare-method/proj-outlives-region.rs3
-rw-r--r--src/test/ui/compare-method/proj-outlives-region.stderr6
-rw-r--r--src/test/ui/compare-method/region-extra.rs3
-rw-r--r--src/test/ui/compare-method/region-extra.stderr6
-rw-r--r--src/test/ui/compare-method/region-unrelated.rs3
-rw-r--r--src/test/ui/compare-method/region-unrelated.stderr6
6 files changed, 9 insertions, 18 deletions
diff --git a/src/test/ui/compare-method/proj-outlives-region.rs b/src/test/ui/compare-method/proj-outlives-region.rs
index 54cfe4be9c1..eab01e9e982 100644
--- a/src/test/ui/compare-method/proj-outlives-region.rs
+++ b/src/test/ui/compare-method/proj-outlives-region.rs
@@ -8,9 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![allow(dead_code)]
-#![deny(extra_requirement_in_impl)]
-
 // Test that we elaborate `Type: 'region` constraints and infer various important things.
 
 trait Master<'a, T: ?Sized, U> {
diff --git a/src/test/ui/compare-method/proj-outlives-region.stderr b/src/test/ui/compare-method/proj-outlives-region.stderr
index 2a707c6eb8b..b1b5aedea70 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:22:5
+  --> $DIR/proj-outlives-region.rs:19:5
    |
-17 |     fn foo() where T: 'a;
+14 |     fn foo() where T: 'a;
    |     --------------------- definition of `foo` from trait
 ...
-22 |     fn foo() where U: 'a { } //~ ERROR E0276
+19 |     fn foo() where U: 'a { } //~ ERROR E0276
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `U: 'a`
    |
    = note: #[deny(extra_requirement_in_impl)] on by default
diff --git a/src/test/ui/compare-method/region-extra.rs b/src/test/ui/compare-method/region-extra.rs
index d61d0250211..e359f080968 100644
--- a/src/test/ui/compare-method/region-extra.rs
+++ b/src/test/ui/compare-method/region-extra.rs
@@ -8,9 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![allow(dead_code)]
-#![deny(extra_requirement_in_impl)]
-
 // Test that you cannot add an extra where clause in the impl relating
 // two regions.
 
diff --git a/src/test/ui/compare-method/region-extra.stderr b/src/test/ui/compare-method/region-extra.stderr
index e657813221a..bc42b505818 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:22:5
+  --> $DIR/region-extra.rs:19:5
    |
-18 |     fn foo();
+15 |     fn foo();
    |     --------- definition of `foo` from trait
 ...
-22 |     fn foo() where 'a: 'b { }
+19 |     fn foo() where 'a: 'b { }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `'a: 'b`
 
 error: aborting due to previous error
diff --git a/src/test/ui/compare-method/region-unrelated.rs b/src/test/ui/compare-method/region-unrelated.rs
index 8f79b30bd5f..719e15fdb61 100644
--- a/src/test/ui/compare-method/region-unrelated.rs
+++ b/src/test/ui/compare-method/region-unrelated.rs
@@ -8,9 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![allow(dead_code)]
-#![deny(extra_requirement_in_impl)]
-
 // Test that we elaborate `Type: 'region` constraints and infer various important things.
 
 trait Master<'a, T: ?Sized, U> {
diff --git a/src/test/ui/compare-method/region-unrelated.stderr b/src/test/ui/compare-method/region-unrelated.stderr
index 9e822bd8b07..b02aa5eeb2f 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:22:5
+  --> $DIR/region-unrelated.rs:19:5
    |
-17 |     fn foo() where T: 'a;
+14 |     fn foo() where T: 'a;
    |     --------------------- definition of `foo` from trait
 ...
-22 |     fn foo() where V: 'a { }
+19 |     fn foo() where V: 'a { }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `V: 'a`
    |
    = note: #[deny(extra_requirement_in_impl)] on by default