Skip to content

Commit 5d59e7a

Browse files
committed
Truncate overlong error lines for tidy's sake
1 parent 5d8c4be commit 5d59e7a

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

src/test/ui/lint/lint-invalid-atomic-ordering-exchange-weak.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ fn main() {
4343

4444
// Release success order forbids failure order of Acquire or SeqCst
4545
let _ = x.compare_exchange_weak(ptr2, ptr, Ordering::Release, Ordering::Acquire);
46-
//~^ ERROR compare_exchange_weak's failure ordering may not be stronger than the success ordering of `Release`
46+
//~^ ERROR compare_exchange_weak's failure ordering may not be stronger
4747
let _ = x.compare_exchange_weak(ptr2, ptr, Ordering::Release, Ordering::SeqCst);
48-
//~^ ERROR compare_exchange_weak's failure ordering may not be stronger than the success ordering of `Release`
48+
//~^ ERROR compare_exchange_weak's failure ordering may not be stronger
4949

5050
// Relaxed success order also forbids failure order of Acquire or SeqCst
5151
let _ = x.compare_exchange_weak(ptr, ptr2, Ordering::Relaxed, Ordering::SeqCst);
52-
//~^ ERROR compare_exchange_weak's failure ordering may not be stronger than the success ordering of `Relaxed`
52+
//~^ ERROR compare_exchange_weak's failure ordering may not be stronger
5353
let _ = x.compare_exchange_weak(ptr, ptr2, Ordering::Relaxed, Ordering::Acquire);
54-
//~^ ERROR compare_exchange_weak's failure ordering may not be stronger than the success ordering of `Relaxed`
54+
//~^ ERROR compare_exchange_weak's failure ordering may not be stronger
5555

5656
// Acquire/AcqRel forbids failure order of SeqCst
5757
let _ = x.compare_exchange_weak(ptr2, ptr, Ordering::Acquire, Ordering::SeqCst);
58-
//~^ ERROR compare_exchange_weak's failure ordering may not be stronger than the success ordering of `Acquire`
58+
//~^ ERROR compare_exchange_weak's failure ordering may not be stronger
5959
let _ = x.compare_exchange_weak(ptr2, ptr, Ordering::AcqRel, Ordering::SeqCst);
60-
//~^ ERROR compare_exchange_weak's failure ordering may not be stronger than the success ordering of `AcqRel`
60+
//~^ ERROR compare_exchange_weak's failure ordering may not be stronger
6161
}

src/test/ui/lint/lint-invalid-atomic-ordering-exchange.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ fn main() {
4141

4242
// Release success order forbids failure order of Acquire or SeqCst
4343
let _ = x.compare_exchange(0, 0, Ordering::Release, Ordering::Acquire);
44-
//~^ ERROR compare_exchange's failure ordering may not be stronger than the success ordering of `Release`
44+
//~^ ERROR compare_exchange's failure ordering may not be stronger
4545
let _ = x.compare_exchange(0, 0, Ordering::Release, Ordering::SeqCst);
46-
//~^ ERROR compare_exchange's failure ordering may not be stronger than the success ordering of `Release`
46+
//~^ ERROR compare_exchange's failure ordering may not be stronger
4747

4848
// Relaxed success order also forbids failure order of Acquire or SeqCst
4949
let _ = x.compare_exchange(0, 0, Ordering::Relaxed, Ordering::SeqCst);
50-
//~^ ERROR compare_exchange's failure ordering may not be stronger than the success ordering of `Relaxed`
50+
//~^ ERROR compare_exchange's failure ordering may not be stronger
5151
let _ = x.compare_exchange(0, 0, Ordering::Relaxed, Ordering::Acquire);
52-
//~^ ERROR compare_exchange's failure ordering may not be stronger than the success ordering of `Relaxed`
52+
//~^ ERROR compare_exchange's failure ordering may not be stronger
5353

5454
// Acquire/AcqRel forbids failure order of SeqCst
5555
let _ = x.compare_exchange(0, 0, Ordering::Acquire, Ordering::SeqCst);
56-
//~^ ERROR compare_exchange's failure ordering may not be stronger than the success ordering of `Acquire`
56+
//~^ ERROR compare_exchange's failure ordering may not be stronger
5757
let _ = x.compare_exchange(0, 0, Ordering::AcqRel, Ordering::SeqCst);
58-
//~^ ERROR compare_exchange's failure ordering may not be stronger than the success ordering of `AcqRel`
58+
//~^ ERROR compare_exchange's failure ordering may not be stronger
5959
}

src/test/ui/lint/lint-invalid-atomic-ordering-fetch-update.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ fn main() {
4141

4242
// Release success order forbids failure order of Acquire or SeqCst
4343
let _ = x.fetch_update(Ordering::Release, Ordering::Acquire, |old| Some(old + 1));
44-
//~^ ERROR fetch_update's failure ordering may not be stronger than the success ordering of `Release`
44+
//~^ ERROR fetch_update's failure ordering may not be stronger
4545
let _ = x.fetch_update(Ordering::Release, Ordering::SeqCst, |old| Some(old + 1));
46-
//~^ ERROR fetch_update's failure ordering may not be stronger than the success ordering of `Release`
46+
//~^ ERROR fetch_update's failure ordering may not be stronger
4747

4848
// Relaxed success order also forbids failure order of Acquire or SeqCst
4949
let _ = x.fetch_update(Ordering::Relaxed, Ordering::SeqCst, |old| Some(old + 1));
50-
//~^ ERROR fetch_update's failure ordering may not be stronger than the success ordering of `Relaxed`
50+
//~^ ERROR fetch_update's failure ordering may not be stronger
5151
let _ = x.fetch_update(Ordering::Relaxed, Ordering::Acquire, |old| Some(old + 1));
52-
//~^ ERROR fetch_update's failure ordering may not be stronger than the success ordering of `Relaxed`
52+
//~^ ERROR fetch_update's failure ordering may not be stronger
5353

5454
// Acquire/AcqRel forbids failure order of SeqCst
5555
let _ = x.fetch_update(Ordering::Acquire, Ordering::SeqCst, |old| Some(old + 1));
56-
//~^ ERROR fetch_update's failure ordering may not be stronger than the success ordering of `Acquire`
56+
//~^ ERROR fetch_update's failure ordering may not be stronger
5757
let _ = x.fetch_update(Ordering::AcqRel, Ordering::SeqCst, |old| Some(old + 1));
58-
//~^ ERROR fetch_update's failure ordering may not be stronger than the success ordering of `AcqRel`
58+
//~^ ERROR fetch_update's failure ordering may not be stronger
5959
}

0 commit comments

Comments
 (0)