review

2 files changed, 10 insertions, 10 deletions

diff --git a/src/test/ui/parser/issues/issue-14303.rs b/src/test/ui/parser/issues/issue-14303.rs
index e44b5774660..82850d77aa9 100644
--- a/src/test/ui/parser/issues/issue-14303.rs
+++ b/src/test/ui/parser/issues/issue-14303.rs
@@ -1,22 +1,22 @@
 enum Enum<'a, T, 'b> {
-//~^ ERROR lifetime parameters must be declared prior to type or const parameters
+//~^ ERROR lifetime parameters must be declared prior to type and const parameters
     A(&'a &'b T)
 }
 
 struct Struct<'a, T, 'b> {
-//~^ ERROR lifetime parameters must be declared prior to type or const parameters
+//~^ ERROR lifetime parameters must be declared prior to type and const parameters
     x: &'a &'b T
 }
 
 trait Trait<'a, T, 'b> {}
-//~^ ERROR lifetime parameters must be declared prior to type or const parameters
+//~^ ERROR lifetime parameters must be declared prior to type and const parameters
 
 fn foo<'a, T, 'b>(x: &'a T) {}
-//~^ ERROR lifetime parameters must be declared prior to type or const parameters
+//~^ ERROR lifetime parameters must be declared prior to type and const parameters
 
 struct Y<T>(T);
 impl<'a, T, 'b> Y<T> {}
-//~^ ERROR lifetime parameters must be declared prior to type or const parameters
+//~^ ERROR lifetime parameters must be declared prior to type and const parameters
 
 mod bar {
     pub struct X<'a, 'b, 'c, T> {
diff --git a/src/test/ui/parser/issues/issue-14303.stderr b/src/test/ui/parser/issues/issue-14303.stderr
index 3579159245a..f121107c095 100644
--- a/src/test/ui/parser/issues/issue-14303.stderr
+++ b/src/test/ui/parser/issues/issue-14303.stderr
@@ -1,28 +1,28 @@
-error: lifetime parameters must be declared prior to type or const parameters
+error: lifetime parameters must be declared prior to type and const parameters
   --> $DIR/issue-14303.rs:1:18
    |
 LL | enum Enum<'a, T, 'b> {
    |          --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
 
-error: lifetime parameters must be declared prior to type or const parameters
+error: lifetime parameters must be declared prior to type and const parameters
   --> $DIR/issue-14303.rs:6:22
    |
 LL | struct Struct<'a, T, 'b> {
    |              --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
 
-error: lifetime parameters must be declared prior to type or const parameters
+error: lifetime parameters must be declared prior to type and const parameters
   --> $DIR/issue-14303.rs:11:20
    |
 LL | trait Trait<'a, T, 'b> {}
    |            --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
 
-error: lifetime parameters must be declared prior to type or const parameters
+error: lifetime parameters must be declared prior to type and const parameters
   --> $DIR/issue-14303.rs:14:15
    |
 LL | fn foo<'a, T, 'b>(x: &'a T) {}
    |       --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
 
-error: lifetime parameters must be declared prior to type or const parameters
+error: lifetime parameters must be declared prior to type and const parameters
   --> $DIR/issue-14303.rs:18:13
    |
 LL | impl<'a, T, 'b> Y<T> {}