Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 43 insertions, 0 deletions

diff --git a/tests/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr b/tests/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr
new file mode 100644
index 000000000..2e697b219
--- /dev/null
+++ b/tests/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr
@@ -0,0 +1,43 @@
+error: `foo` is not yet stable as a const fn
+  --> $DIR/dont_promote_unstable_const_fn.rs:14:25
+   |
+LL | const fn bar() -> u32 { foo() }
+   |                         ^^^^^
+   |
+   = help: add `#![feature(foo)]` to the crate attributes to enable
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/dont_promote_unstable_const_fn.rs:17:28
+   |
+LL |     let _: &'static u32 = &foo();
+   |            ------------    ^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/dont_promote_unstable_const_fn.rs:21:28
+   |
+LL |     let _: &'static u32 = &meh();
+   |            ------------    ^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+...
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/dont_promote_unstable_const_fn.rs:22:26
+   |
+LL |     let x: &'static _ = &std::time::Duration::from_millis(42).subsec_millis();
+   |            ----------    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ creates a temporary value which is freed while still in use
+   |            |
+   |            type annotation requires that borrow lasts for `'static`
+LL |
+LL | }
+   | - temporary value is freed at the end of this statement
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0716`.