From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../ui/lint/lint-invalid-atomic-ordering-uint.rs   | 129 ---------------------
 1 file changed, 129 deletions(-)
 delete mode 100644 src/test/ui/lint/lint-invalid-atomic-ordering-uint.rs

(limited to 'src/test/ui/lint/lint-invalid-atomic-ordering-uint.rs')

diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-uint.rs b/src/test/ui/lint/lint-invalid-atomic-ordering-uint.rs
deleted file mode 100644
index 80ec3b9ee..000000000
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-uint.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-// only-x86_64
-use std::sync::atomic::{AtomicU16, AtomicU32, AtomicU64, AtomicU8, AtomicUsize, Ordering};
-
-fn main() {
-    // `AtomicU8` test cases
-    let x = AtomicU8::new(0);
-
-    // Allowed load ordering modes
-    let _ = x.load(Ordering::Acquire);
-    let _ = x.load(Ordering::SeqCst);
-    let _ = x.load(Ordering::Relaxed);
-
-    // Allowed store ordering modes
-    x.store(1, Ordering::Release);
-    x.store(1, Ordering::SeqCst);
-    x.store(1, Ordering::Relaxed);
-
-    // Disallowed load ordering modes
-    let _ = x.load(Ordering::Release);
-    //~^ ERROR atomic loads cannot have `Release` or `AcqRel` ordering
-    let _ = x.load(Ordering::AcqRel);
-    //~^ ERROR atomic loads cannot have `Release` or `AcqRel` ordering
-
-    // Disallowed store ordering modes
-    x.store(1, Ordering::Acquire);
-    //~^ ERROR atomic stores cannot have `Acquire` or `AcqRel` ordering
-    x.store(1, Ordering::AcqRel);
-    //~^ ERROR atomic stores cannot have `Acquire` or `AcqRel` ordering
-
-    // `AtomicU16` test cases
-    let x = AtomicU16::new(0);
-
-    // Allowed load ordering modes
-    let _ = x.load(Ordering::Acquire);
-    let _ = x.load(Ordering::SeqCst);
-    let _ = x.load(Ordering::Relaxed);
-
-    // Allowed store ordering modes
-    x.store(1, Ordering::Release);
-    x.store(1, Ordering::SeqCst);
-    x.store(1, Ordering::Relaxed);
-
-    // Disallowed load ordering modes
-    let _ = x.load(Ordering::Release);
-    //~^ ERROR atomic loads cannot have `Release` or `AcqRel` ordering
-    let _ = x.load(Ordering::AcqRel);
-    //~^ ERROR atomic loads cannot have `Release` or `AcqRel` ordering
-
-    // Disallowed store ordering modes
-    x.store(1, Ordering::Acquire);
-    //~^ ERROR atomic stores cannot have `Acquire` or `AcqRel` ordering
-    x.store(1, Ordering::AcqRel);
-    //~^ ERROR atomic stores cannot have `Acquire` or `AcqRel` ordering
-
-    // `AtomicU32` test cases
-    let x = AtomicU32::new(0);
-
-    // Allowed load ordering modes
-    let _ = x.load(Ordering::Acquire);
-    let _ = x.load(Ordering::SeqCst);
-    let _ = x.load(Ordering::Relaxed);
-
-    // Allowed store ordering modes
-    x.store(1, Ordering::Release);
-    x.store(1, Ordering::SeqCst);
-    x.store(1, Ordering::Relaxed);
-
-    // Disallowed load ordering modes
-    let _ = x.load(Ordering::Release);
-    //~^ ERROR atomic loads cannot have `Release` or `AcqRel` ordering
-    let _ = x.load(Ordering::AcqRel);
-    //~^ ERROR atomic loads cannot have `Release` or `AcqRel` ordering
-
-    // Disallowed store ordering modes
-    x.store(1, Ordering::Acquire);
-    //~^ ERROR atomic stores cannot have `Acquire` or `AcqRel` ordering
-    x.store(1, Ordering::AcqRel);
-    //~^ ERROR atomic stores cannot have `Acquire` or `AcqRel` ordering
-
-    // `AtomicU64` test cases
-    let x = AtomicU64::new(0);
-
-    // Allowed load ordering modes
-    let _ = x.load(Ordering::Acquire);
-    let _ = x.load(Ordering::SeqCst);
-    let _ = x.load(Ordering::Relaxed);
-
-    // Allowed store ordering modes
-    x.store(1, Ordering::Release);
-    x.store(1, Ordering::SeqCst);
-    x.store(1, Ordering::Relaxed);
-
-    // Disallowed load ordering modes
-    let _ = x.load(Ordering::Release);
-    //~^ ERROR atomic loads cannot have `Release` or `AcqRel` ordering
-    let _ = x.load(Ordering::AcqRel);
-    //~^ ERROR atomic loads cannot have `Release` or `AcqRel` ordering
-
-    // Disallowed store ordering modes
-    x.store(1, Ordering::Acquire);
-    //~^ ERROR atomic stores cannot have `Acquire` or `AcqRel` ordering
-    x.store(1, Ordering::AcqRel);
-    //~^ ERROR atomic stores cannot have `Acquire` or `AcqRel` ordering
-
-    // `AtomicUsize` test cases
-    let x = AtomicUsize::new(0);
-
-    // Allowed load ordering modes
-    let _ = x.load(Ordering::Acquire);
-    let _ = x.load(Ordering::SeqCst);
-    let _ = x.load(Ordering::Relaxed);
-
-    // Allowed store ordering modes
-    x.store(1, Ordering::Release);
-    x.store(1, Ordering::SeqCst);
-    x.store(1, Ordering::Relaxed);
-
-    // Disallowed load ordering modes
-    let _ = x.load(Ordering::Release);
-    //~^ ERROR atomic loads cannot have `Release` or `AcqRel` ordering
-    let _ = x.load(Ordering::AcqRel);
-    //~^ ERROR atomic loads cannot have `Release` or `AcqRel` ordering
-
-    // Disallowed store ordering modes
-    x.store(1, Ordering::Acquire);
-    //~^ ERROR atomic stores cannot have `Acquire` or `AcqRel` ordering
-    x.store(1, Ordering::AcqRel);
-    //~^ ERROR atomic stores cannot have `Acquire` or `AcqRel` ordering
-}
-- 
cgit v1.2.3