Merging upstream version 1.68.2+dfsg1.

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

8 files changed, 64 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.rs b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.rs
new file mode 100644
index 000000000..160cfc3d4
--- /dev/null
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let _result = &Some(42).as_deref();
+//~^ ERROR the method
+}
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr
new file mode 100644
index 000000000..ce8173169
--- /dev/null
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr
@@ -0,0 +1,12 @@
+error[E0599]: the method `as_deref` exists for enum `Option<{integer}>`, but its trait bounds were not satisfied
+  --> $DIR/option-as_deref.rs:2:29
+   |
+LL |     let _result = &Some(42).as_deref();
+   |                             ^^^^^^^^
+   |
+   = note: the following trait bounds were not satisfied:
+           `{integer}: Deref`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.rs b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.rs
new file mode 100644
index 000000000..ff5095ce3
--- /dev/null
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let _result = &mut Some(42).as_deref_mut();
+//~^ ERROR the method
+}
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
new file mode 100644
index 000000000..943f77486
--- /dev/null
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
@@ -0,0 +1,12 @@
+error[E0599]: the method `as_deref_mut` exists for enum `Option<{integer}>`, but its trait bounds were not satisfied
+  --> $DIR/option-as_deref_mut.rs:2:33
+   |
+LL |     let _result = &mut Some(42).as_deref_mut();
+   |                                 ^^^^^^^^^^^^
+   |
+   = note: the following trait bounds were not satisfied:
+           `{integer}: Deref`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.rs b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.rs
new file mode 100644
index 000000000..4232f14d2
--- /dev/null
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let _result = &Ok(42).as_deref();
+//~^ ERROR the method
+}
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr
new file mode 100644
index 000000000..a3b9ac677
--- /dev/null
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr
@@ -0,0 +1,12 @@
+error[E0599]: the method `as_deref` exists for enum `Result<{integer}, _>`, but its trait bounds were not satisfied
+  --> $DIR/result-as_deref.rs:2:27
+   |
+LL |     let _result = &Ok(42).as_deref();
+   |                           ^^^^^^^^
+   |
+   = note: the following trait bounds were not satisfied:
+           `{integer}: Deref`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.rs b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.rs
new file mode 100644
index 000000000..3507d1d8e
--- /dev/null
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let _result = &mut Ok(42).as_deref_mut();
+//~^ ERROR the method
+}
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr
new file mode 100644
index 000000000..aa771e4c0
--- /dev/null
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr
@@ -0,0 +1,12 @@
+error[E0599]: the method `as_deref_mut` exists for enum `Result<{integer}, _>`, but its trait bounds were not satisfied
+  --> $DIR/result-as_deref_mut.rs:2:31
+   |
+LL |     let _result = &mut Ok(42).as_deref_mut();
+   |                               ^^^^^^^^^^^^
+   |
+   = note: the following trait bounds were not satisfied:
+           `{integer}: Deref`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.