Merge tag 'debian/1.52.1+dfsg1-1_exp2' into proxmox/buster

[rustc.git] / src / test / ui / issues / issue-27033.stderr

diff --git a/src/test/ui/issues/issue-27033.stderr b/src/test/ui/issues/issue-27033.stderr
index ad48fc23a386bf35976b87210c5c99fa836fa5a2..fa42611d0b32e656f904ff9d7adeeab33ace2314 100644 (file)
--- a/src/test/ui/issues/issue-27033.stderr
+++ b/src/test/ui/issues/issue-27033.stderr
@@ -4,10 +4,10 @@ error[E0530]: match bindings cannot shadow unit variants
 LL |         None @ _ => {}
    |         ^^^^ cannot be named the same as a unit variant
    | 
-  ::: $SRC_DIR/std/src/prelude/v1.rs:LL:COL
+  ::: $SRC_DIR/std/src/prelude/mod.rs:LL:COL
    |
-LL | pub use crate::option::Option::{self, None, Some};
-   |                                       ---- the unit variant `None` is defined here
+LL |     pub use super::v1::*;
+   |             ------------ the unit variant `None` is defined here
 
 error[E0530]: match bindings cannot shadow constants
   --> $DIR/issue-27033.rs:7:9