Update ui tests to nightly-2020-09-05

dtolnay · Sep 5, 2020 · 9e9cae1 · 9e9cae1
1 parent cd2ab06
commit 9e9cae1
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/tests/ui/does-not-have-iter-interpolated-dup.stderr b/tests/ui/does-not-have-iter-interpolated-dup.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 8 |     quote!(#(#nonrep #nonrep)*);
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |     |
-  |     expected struct `quote::__private::HasIterator`, found struct `quote::__private::ThereIsNoIteratorInRepetition`
+  |     expected struct `HasIterator`, found struct `ThereIsNoIteratorInRepetition`
   |     expected due to this
   |
   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/tests/ui/does-not-have-iter-interpolated.stderr b/tests/ui/does-not-have-iter-interpolated.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 8 |     quote!(#(#nonrep)*);
   |     ^^^^^^^^^^^^^^^^^^^^
   |     |
-  |     expected struct `quote::__private::HasIterator`, found struct `quote::__private::ThereIsNoIteratorInRepetition`
+  |     expected struct `HasIterator`, found struct `ThereIsNoIteratorInRepetition`
   |     expected due to this
   |
   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/tests/ui/does-not-have-iter-separated.stderr b/tests/ui/does-not-have-iter-separated.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 4 |     quote!(#(a b),*);
   |     ^^^^^^^^^^^^^^^^^
   |     |
-  |     expected struct `quote::__private::HasIterator`, found struct `quote::__private::ThereIsNoIteratorInRepetition`
+  |     expected struct `HasIterator`, found struct `ThereIsNoIteratorInRepetition`
   |     expected due to this
   |
   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/tests/ui/does-not-have-iter.stderr b/tests/ui/does-not-have-iter.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 4 |     quote!(#(a b)*);
   |     ^^^^^^^^^^^^^^^^
   |     |
-  |     expected struct `quote::__private::HasIterator`, found struct `quote::__private::ThereIsNoIteratorInRepetition`
+  |     expected struct `HasIterator`, found struct `ThereIsNoIteratorInRepetition`
   |     expected due to this
   |
   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/tests/ui/not-quotable.stderr b/tests/ui/not-quotable.stderr
@@ -1,8 +1,8 @@
-error[E0277]: the trait bound `std::net::Ipv4Addr: quote::ToTokens` is not satisfied
+error[E0277]: the trait bound `Ipv4Addr: ToTokens` is not satisfied
  --> $DIR/not-quotable.rs:6:13
   |
 6 |     let _ = quote! { #ip };
-  |             ^^^^^^^^^^^^^^ the trait `quote::ToTokens` is not implemented for `std::net::Ipv4Addr`
+  |             ^^^^^^^^^^^^^^ the trait `ToTokens` is not implemented for `Ipv4Addr`
   |
-  = note: required by `quote::ToTokens::to_tokens`
+  = note: required by `to_tokens`
   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/tests/ui/not-repeatable.stderr b/tests/ui/not-repeatable.stderr
@@ -5,21 +5,21 @@ error[E0599]: no method named `quote_into_iter` found for struct `Ipv4Addr` in t
   | ----------------
   | |
   | method `quote_into_iter` not found for this
-  | doesn't satisfy `Ipv4Addr: quote::ToTokens`
+  | doesn't satisfy `Ipv4Addr: Iterator`
+  | doesn't satisfy `Ipv4Addr: ToTokens`
   | doesn't satisfy `Ipv4Addr: quote::__private::ext::RepIteratorExt`
   | doesn't satisfy `Ipv4Addr: quote::__private::ext::RepToTokensExt`
-  | doesn't satisfy `Ipv4Addr: std::iter::Iterator`
 ...
 7 |     let _ = quote! { #(#ip)* };
   |             ^^^^^^^^^^^^^^^^^^ method not found in `Ipv4Addr`
   |
   = note: the method `quote_into_iter` exists but the following trait bounds were not satisfied:
-          `Ipv4Addr: std::iter::Iterator`
+          `Ipv4Addr: Iterator`
           which is required by `Ipv4Addr: quote::__private::ext::RepIteratorExt`
-          `&Ipv4Addr: std::iter::Iterator`
+          `&Ipv4Addr: Iterator`
           which is required by `&Ipv4Addr: quote::__private::ext::RepIteratorExt`
-          `Ipv4Addr: quote::ToTokens`
+          `Ipv4Addr: ToTokens`
           which is required by `Ipv4Addr: quote::__private::ext::RepToTokensExt`
-          `&mut Ipv4Addr: std::iter::Iterator`
+          `&mut Ipv4Addr: Iterator`
           which is required by `&mut Ipv4Addr: quote::__private::ext::RepIteratorExt`
   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/tests/ui/wrong-type-span.stderr b/tests/ui/wrong-type-span.stderr
@@ -4,5 +4,5 @@ error[E0308]: mismatched types
 6 |     quote_spanned!(span=> #x);
   |     ---------------^^^^-------
   |     |              |
-  |     |              expected struct `quote::__private::Span`, found `&str`
+  |     |              expected struct `Span`, found `&str`
   |     expected due to this