Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/ui/parser/unclosed-delimiter-in-dep.stderr b/tests/ui/parser/unclosed-delimiter-in-dep.stderr
new file mode 100644
index 000000000..1366ef1bb
--- /dev/null
+++ b/tests/ui/parser/unclosed-delimiter-in-dep.stderr
@@ -0,0 +1,25 @@
+error: mismatched closing delimiter: `}`
+  --> $DIR/unclosed_delim_mod.rs:5:7
+   |
+LL | pub fn new() -> Result<Value, ()> {
+   |                                   - closing delimiter possibly meant for this
+LL |     Ok(Value {
+   |       ^ unclosed delimiter
+LL |     }
+LL | }
+   | ^ mismatched closing delimiter
+
+error[E0308]: mismatched types
+  --> $DIR/unclosed-delimiter-in-dep.rs:4:20
+   |
+LL |     let _: usize = unclosed_delim_mod::new();
+   |            -----   ^^^^^^^^^^^^^^^^^^^^^^^^^ expected `usize`, found enum `Result`
+   |            |
+   |            expected due to this
+   |
+   = note: expected type `usize`
+              found enum `Result<Value, ()>`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0308`.