From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/ui/statics/static-promotion.rs | 34 --------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 src/test/ui/statics/static-promotion.rs (limited to 'src/test/ui/statics/static-promotion.rs') diff --git a/src/test/ui/statics/static-promotion.rs b/src/test/ui/statics/static-promotion.rs deleted file mode 100644 index b9eff4691..000000000 --- a/src/test/ui/statics/static-promotion.rs +++ /dev/null @@ -1,34 +0,0 @@ -// run-pass - -// Use of global static variables in literal values should be allowed for -// promotion. -// This test is to demonstrate the issue raised in -// https://github.com/rust-lang/rust/issues/70584 - -// Literal values were previously promoted into local static values when -// other global static variables are used. - -struct A(&'static T); -struct B { - x: &'static T, -} -static STR: &'static [u8] = b"hi"; -static C: A>> = { - A(&B { - x: &B { x: STR }, - }) -}; - -pub struct Slice(&'static [i32]); - -static CONTENT: i32 = 42; -pub static CONTENT_MAP: Slice = Slice(&[CONTENT]); - -pub static FOO: (i32, i32) = (42, 43); -pub static CONTENT_MAP2: Slice = Slice(&[FOO.0]); - -fn main() { - assert_eq!(b"hi", C.0.x.x); - assert_eq!(&[42], CONTENT_MAP.0); - assert_eq!(&[42], CONTENT_MAP2.0); -} -- cgit v1.2.3