Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 35 insertions, 0 deletions

diff --git a/tests/ui/privacy/privacy2.stderr b/tests/ui/privacy/privacy2.stderr
new file mode 100644
index 000000000..882f31465
--- /dev/null
+++ b/tests/ui/privacy/privacy2.stderr
@@ -0,0 +1,35 @@
+error[E0432]: unresolved import `bar::foo`
+  --> $DIR/privacy2.rs:17:9
+   |
+LL |     use bar::foo;
+   |         ^^^^^^^^ no `foo` in `bar`
+
+error[E0603]: function import `foo` is private
+  --> $DIR/privacy2.rs:23:20
+   |
+LL |     use bar::glob::foo;
+   |                    ^^^ private function import
+   |
+note: the function import `foo` is defined here...
+  --> $DIR/privacy2.rs:10:13
+   |
+LL |         use foo;
+   |             ^^^
+note: ...and refers to the function `foo` which is defined here
+  --> $DIR/privacy2.rs:14:1
+   |
+LL | pub fn foo() {}
+   | ^^^^^^^^^^^^ consider importing it directly
+
+error: requires `sized` lang_item
+
+error: requires `sized` lang_item
+
+error: requires `sized` lang_item
+
+error: requires `sized` lang_item
+
+error: aborting due to 6 previous errors
+
+Some errors have detailed explanations: E0432, E0603.
+For more information about an error, try `rustc --explain E0432`.