about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2020-07-26 17:03:38 +0200
committerOliver Scherer <github35764891676564198441@oli-obk.de>2020-07-26 17:03:38 +0200
commit86ac65c88706bea36f6527f226c31ba8d81aac94 (patch)
treed83bf621c1156cbf9fcf73016fb02149b3c31382
parentb663892e5456bc956600d46d33373f08e2d412ef (diff)
downloadrust-86ac65c88706bea36f6527f226c31ba8d81aac94.tar.gz
rust-86ac65c88706bea36f6527f226c31ba8d81aac94.zip
Bless you
-rw-r--r--src/test/ui/mismatched_types/const-fn-in-trait.stderr4
-rw-r--r--src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/ui/mismatched_types/const-fn-in-trait.stderr b/src/test/ui/mismatched_types/const-fn-in-trait.stderr
index 817582df27d..450981a9183 100644
--- a/src/test/ui/mismatched_types/const-fn-in-trait.stderr
+++ b/src/test/ui/mismatched_types/const-fn-in-trait.stderr
@@ -1,11 +1,11 @@
 error[E0379]: functions in traits cannot be declared const
-  --> $DIR/const-fn-in-trait.rs:7:5
+  --> $DIR/const-fn-in-trait.rs:5:5
    |
 LL |     const fn g();
    |     ^^^^^ functions in traits cannot be const
 
 error[E0379]: functions in traits cannot be declared const
-  --> $DIR/const-fn-in-trait.rs:11:5
+  --> $DIR/const-fn-in-trait.rs:9:5
    |
 LL |     const fn f() -> u32 { 22 }
    |     ^^^^^ functions in traits cannot be const
diff --git a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
index b20fddb05ac..5735120f710 100644
--- a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
+++ b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
@@ -1,5 +1,5 @@
 error[E0053]: method `foo` has an incompatible type for trait
-  --> $DIR/trait-impl-fn-incompatibility.rs:11:15
+  --> $DIR/trait-impl-fn-incompatibility.rs:9:15
    |
 LL |     fn foo(x: u16);
    |               --- type in trait
@@ -11,7 +11,7 @@ LL |     fn foo(x: i16) { }
               found fn pointer `fn(i16)`
 
 error[E0053]: method `bar` has an incompatible type for trait
-  --> $DIR/trait-impl-fn-incompatibility.rs:12:28
+  --> $DIR/trait-impl-fn-incompatibility.rs:10:28
    |
 LL |     fn bar(&mut self, bar: &mut Bar);
    |                            -------- type in trait