Skip to content

Commit bd30a9d

Browse files
committed
Auto merge of #2096 - dtolnay-contrib:whitespace, r=RalfJung
Clean up all trailing whitespace Editors commonly strip trailing whitespace from source code on save, because it's almost always undesired, and that leads to spurious diffs in these files when working with them in such an editor.
2 parents e1068cf + b994148 commit bd30a9d

File tree

15 files changed

+34
-34
lines changed

15 files changed

+34
-34
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ rustc_version = "0.4"
4242
colored = "2"
4343

4444
[package.metadata.rust-analyzer]
45-
# This crate uses #[feature(rustc_private)].
45+
# This crate uses #[feature(rustc_private)].
4646
# See https://github.com/rust-analyzer/rust-analyzer/pull/7891
4747
rustc_private = true
4848

bench-cargo-miri/mse/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ static PCM: &[i16] = &[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
44
fn main() {
55
#[cfg(increase_thread_usage)]
66
let thread = std::thread::spawn(|| 4);
7-
7+
88
for _ in 0..2 {
99
mse(PCM.len(), PCM, EXPECTED);
1010
}

rustup-toolchain

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ set -e
88
# USAGE:
99
#
1010
# ./rustup-toolchain: Update "miri" toolchain to match `rust-version` (the known-good version for this commit).
11-
#
11+
#
1212
# ./rustup-toolchain HEAD: Update "miri" toolchain and `rust-version` file to latest rustc HEAD.
13-
#
13+
#
1414
# ./rustup-toolchain $COMMIT: Update "miri" toolchain and `rust-version` file to match that commit.
1515

1616
# Make sure rustup-toolchain-install-master is installed.

tests/compile-fail/data_race/dangling_thread_async_race.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fn main() {
3636

3737
let join2 = unsafe {
3838
spawn(move || {
39-
*c.0 = 64; //~ ERROR Data race detected between Write on Thread(id = 3) and Write on Thread(id = 1)
39+
*c.0 = 64; //~ ERROR Data race detected between Write on Thread(id = 3) and Write on Thread(id = 1)
4040
})
4141
};
4242

tests/compile-fail/data_race/dealloc_read_race2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub fn main() {
2323
});
2424

2525
let j2 = spawn(move || {
26-
// Also an error of the form: Data race detected between Read on Thread(id = 2) and Deallocate on Thread(id = 1)
26+
// Also an error of the form: Data race detected between Read on Thread(id = 2) and Deallocate on Thread(id = 1)
2727
// but the invalid allocation is detected first.
2828
*ptr.0 //~ ERROR dereferenced after this allocation got freed
2929
});

tests/compile-fail/data_race/read_write_race_stack.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub fn main() {
4040
let mut stack_var = 0usize;
4141

4242
pointer.store(&mut stack_var as *mut _, Ordering::Release);
43-
43+
4444
sleep(Duration::from_millis(200));
4545

4646
stack_var //~ ERROR Data race detected between Read on Thread(id = 1) and Write on Thread(id = 2)

tests/compile-fail/data_race/write_write_race_stack.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ pub fn main() {
3737
let mut stack_var = 0usize;
3838

3939
pointer.store(&mut stack_var as *mut _, Ordering::Release);
40-
40+
4141
sleep(Duration::from_millis(200));
4242

4343
stack_var = 1usize; //~ ERROR Data race detected between Write on Thread(id = 1) and Write on Thread(id = 2)
44-
44+
4545
// read to silence errors
4646
stack_var
4747
});

tests/compile-fail/panic/double_panic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ impl Drop for Foo {
88
}
99
fn main() {
1010
let _foo = Foo;
11-
panic!("first");
11+
panic!("first");
1212
}

tests/compile-fail/rc_as_ptr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn main() {
1212
assert!(ptr::eq(&*strong, Weak::as_ptr(&weak)));
1313
// The strong here keeps it alive, so we can still access the object.
1414
assert_eq!(42, **unsafe { &*Weak::as_ptr(&weak) });
15-
15+
1616
drop(strong);
1717
// But not any more. We can do Weak::as_raw(&weak), but accessing the pointer would lead to
1818
// undefined behaviour.

tests/run-pass/backtrace-api-v1.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fn main() {
2424
unsafe {
2525
miri_resolve_frame_names(*frame, 0, name.as_mut_ptr(), filename.as_mut_ptr());
2626
}
27-
27+
2828
let name = String::from_utf8(name).unwrap();
2929
let filename = String::from_utf8(filename).unwrap();
3030

@@ -62,4 +62,4 @@ struct MiriFrame {
6262
lineno: u32,
6363
colno: u32,
6464
fn_ptr: *mut (),
65-
}
65+
}

0 commit comments

Comments
 (0)