Skip to content

Commit c88c950

Browse files
alexcrichtonalexcrichton
committed
Run rustfmt over everything
1 parent ad1bcd2 commit c88c950

28 files changed

+1105
-822
lines changed

‎build.rs

+192-221
Large diffs are not rendered by default.

‎examples/intrinsics.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ extern crate panic_handler;
1717

1818
#[cfg(all(not(thumb), not(windows)))]
1919
#[link(name = "c")]
20-
extern {}
20+
extern "C" {}
2121

2222
// Every function in this module maps will be lowered to an intrinsic by LLVM, if the platform
2323
// doesn't have native support for the operation used in the function. ARM has a naming convention
@@ -340,11 +340,13 @@ fn run() {
340340

341341
something_with_a_dtor(&|| assert_eq!(bb(1), 1));
342342

343-
extern {
343+
extern "C" {
344344
fn rust_begin_unwind();
345345
}
346346
// if bb(false) {
347-
unsafe { rust_begin_unwind(); }
347+
unsafe {
348+
rust_begin_unwind();
349+
}
348350
// }
349351
}
350352

@@ -377,7 +379,7 @@ pub fn _start() -> ! {
377379
#[cfg(windows)]
378380
#[link(name = "kernel32")]
379381
#[link(name = "msvcrt")]
380-
extern {}
382+
extern "C" {}
381383

382384
// ARM targets need these symbols
383385
#[no_mangle]

‎src/arm_linux.rs

+75-23
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ use core::mem;
44
// Kernel-provided user-mode helper functions:
55
// https://www.kernel.org/doc/Documentation/arm/kernel_user_helpers.txt
66
unsafe fn __kuser_cmpxchg(oldval: u32, newval: u32, ptr: *mut u32) -> bool {
7-
let f: extern "C" fn (u32, u32, *mut u32) -> u32 = mem::transmute(0xffff0fc0u32);
7+
let f: extern "C" fn(u32, u32, *mut u32) -> u32 = mem::transmute(0xffff0fc0u32);
88
f(oldval, newval, ptr) == 0
99
}
1010
unsafe fn __kuser_memory_barrier() {
11-
let f: extern "C" fn () = mem::transmute(0xffff0fa0u32);
11+
let f: extern "C" fn() = mem::transmute(0xffff0fa0u32);
1212
f();
1313
}
1414

@@ -94,24 +94,28 @@ macro_rules! atomic_rmw {
9494
pub unsafe extern "C" fn $name(ptr: *mut $ty, val: $ty) -> $ty {
9595
atomic_rmw(ptr, |x| $op(x as $ty, val) as u32) as $ty
9696
}
97-
}
97+
};
9898
}
9999
macro_rules! atomic_cmpxchg {
100100
($name:ident, $ty:ty) => {
101101
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
102102
pub unsafe extern "C" fn $name(ptr: *mut $ty, oldval: $ty, newval: $ty) -> $ty {
103103
atomic_cmpxchg(ptr, oldval as u32, newval as u32) as $ty
104104
}
105-
}
105+
};
106106
}
107107

108108
atomic_rmw!(__sync_fetch_and_add_1, u8, |a: u8, b: u8| a.wrapping_add(b));
109-
atomic_rmw!(__sync_fetch_and_add_2, u16, |a: u16, b: u16| a.wrapping_add(b));
110-
atomic_rmw!(__sync_fetch_and_add_4, u32, |a: u32, b: u32| a.wrapping_add(b));
109+
atomic_rmw!(__sync_fetch_and_add_2, u16, |a: u16, b: u16| a
110+
.wrapping_add(b));
111+
atomic_rmw!(__sync_fetch_and_add_4, u32, |a: u32, b: u32| a
112+
.wrapping_add(b));
111113

112114
atomic_rmw!(__sync_fetch_and_sub_1, u8, |a: u8, b: u8| a.wrapping_sub(b));
113-
atomic_rmw!(__sync_fetch_and_sub_2, u16, |a: u16, b: u16| a.wrapping_sub(b));
114-
atomic_rmw!(__sync_fetch_and_sub_4, u32, |a: u32, b: u32| a.wrapping_sub(b));
115+
atomic_rmw!(__sync_fetch_and_sub_2, u16, |a: u16, b: u16| a
116+
.wrapping_sub(b));
117+
atomic_rmw!(__sync_fetch_and_sub_4, u32, |a: u32, b: u32| a
118+
.wrapping_sub(b));
115119

116120
atomic_rmw!(__sync_fetch_and_and_1, u8, |a: u8, b: u8| a & b);
117121
atomic_rmw!(__sync_fetch_and_and_2, u16, |a: u16, b: u16| a & b);
@@ -129,21 +133,69 @@ atomic_rmw!(__sync_fetch_and_nand_1, u8, |a: u8, b: u8| !(a & b));
129133
atomic_rmw!(__sync_fetch_and_nand_2, u16, |a: u16, b: u16| !(a & b));
130134
atomic_rmw!(__sync_fetch_and_nand_4, u32, |a: u32, b: u32| !(a & b));
131135

132-
atomic_rmw!(__sync_fetch_and_max_1, i8, |a: i8, b: i8| if a > b { a } else { b });
133-
atomic_rmw!(__sync_fetch_and_max_2, i16, |a: i16, b: i16| if a > b { a } else { b });
134-
atomic_rmw!(__sync_fetch_and_max_4, i32, |a: i32, b: i32| if a > b { a } else { b });
135-
136-
atomic_rmw!(__sync_fetch_and_umax_1, u8, |a: u8, b: u8| if a > b { a } else { b });
137-
atomic_rmw!(__sync_fetch_and_umax_2, u16, |a: u16, b: u16| if a > b { a } else { b });
138-
atomic_rmw!(__sync_fetch_and_umax_4, u32, |a: u32, b: u32| if a > b { a } else { b });
139-
140-
atomic_rmw!(__sync_fetch_and_min_1, i8, |a: i8, b: i8| if a < b { a } else { b });
141-
atomic_rmw!(__sync_fetch_and_min_2, i16, |a: i16, b: i16| if a < b { a } else { b });
142-
atomic_rmw!(__sync_fetch_and_min_4, i32, |a: i32, b: i32| if a < b { a } else { b });
143-
144-
atomic_rmw!(__sync_fetch_and_umin_1, u8, |a: u8, b: u8| if a < b { a } else { b });
145-
atomic_rmw!(__sync_fetch_and_umin_2, u16, |a: u16, b: u16| if a < b { a } else { b });
146-
atomic_rmw!(__sync_fetch_and_umin_4, u32, |a: u32, b: u32| if a < b { a } else { b });
136+
atomic_rmw!(__sync_fetch_and_max_1, i8, |a: i8, b: i8| if a > b {
137+
a
138+
} else {
139+
b
140+
});
141+
atomic_rmw!(__sync_fetch_and_max_2, i16, |a: i16, b: i16| if a > b {
142+
a
143+
} else {
144+
b
145+
});
146+
atomic_rmw!(__sync_fetch_and_max_4, i32, |a: i32, b: i32| if a > b {
147+
a
148+
} else {
149+
b
150+
});
151+
152+
atomic_rmw!(__sync_fetch_and_umax_1, u8, |a: u8, b: u8| if a > b {
153+
a
154+
} else {
155+
b
156+
});
157+
atomic_rmw!(__sync_fetch_and_umax_2, u16, |a: u16, b: u16| if a > b {
158+
a
159+
} else {
160+
b
161+
});
162+
atomic_rmw!(__sync_fetch_and_umax_4, u32, |a: u32, b: u32| if a > b {
163+
a
164+
} else {
165+
b
166+
});
167+
168+
atomic_rmw!(__sync_fetch_and_min_1, i8, |a: i8, b: i8| if a < b {
169+
a
170+
} else {
171+
b
172+
});
173+
atomic_rmw!(__sync_fetch_and_min_2, i16, |a: i16, b: i16| if a < b {
174+
a
175+
} else {
176+
b
177+
});
178+
atomic_rmw!(__sync_fetch_and_min_4, i32, |a: i32, b: i32| if a < b {
179+
a
180+
} else {
181+
b
182+
});
183+
184+
atomic_rmw!(__sync_fetch_and_umin_1, u8, |a: u8, b: u8| if a < b {
185+
a
186+
} else {
187+
b
188+
});
189+
atomic_rmw!(__sync_fetch_and_umin_2, u16, |a: u16, b: u16| if a < b {
190+
a
191+
} else {
192+
b
193+
});
194+
atomic_rmw!(__sync_fetch_and_umin_4, u32, |a: u32, b: u32| if a < b {
195+
a
196+
} else {
197+
b
198+
});
147199

148200
atomic_rmw!(__sync_lock_test_and_set_1, u8, |_: u8, b: u8| b);
149201
atomic_rmw!(__sync_lock_test_and_set_2, u16, |_: u16, b: u16| b);

‎src/float/add.rs

+29-21
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
use int::{Int, CastInto};
21
use float::Float;
2+
use int::{CastInto, Int};
33

44
/// Returns `a + b`
5-
fn add<F: Float>(a: F, b: F) -> F where
5+
fn add<F: Float>(a: F, b: F) -> F
6+
where
67
u32: CastInto<F::Int>,
78
F::Int: CastInto<u32>,
89
i32: CastInto<F::Int>,
@@ -11,27 +12,26 @@ fn add<F: Float>(a: F, b: F) -> F where
1112
let one = F::Int::ONE;
1213
let zero = F::Int::ZERO;
1314

14-
let bits = F::BITS.cast();
15+
let bits = F::BITS.cast();
1516
let significand_bits = F::SIGNIFICAND_BITS;
16-
let max_exponent = F::EXPONENT_MAX;
17+
let max_exponent = F::EXPONENT_MAX;
1718

18-
let implicit_bit = F::IMPLICIT_BIT;
19+
let implicit_bit = F::IMPLICIT_BIT;
1920
let significand_mask = F::SIGNIFICAND_MASK;
20-
let sign_bit = F::SIGN_MASK as F::Int;
21-
let abs_mask = sign_bit - one;
22-
let exponent_mask = F::EXPONENT_MASK;
23-
let inf_rep = exponent_mask;
24-
let quiet_bit = implicit_bit >> 1;
25-
let qnan_rep = exponent_mask | quiet_bit;
21+
let sign_bit = F::SIGN_MASK as F::Int;
22+
let abs_mask = sign_bit - one;
23+
let exponent_mask = F::EXPONENT_MASK;
24+
let inf_rep = exponent_mask;
25+
let quiet_bit = implicit_bit >> 1;
26+
let qnan_rep = exponent_mask | quiet_bit;
2627

2728
let mut a_rep = a.repr();
2829
let mut b_rep = b.repr();
2930
let a_abs = a_rep & abs_mask;
3031
let b_abs = b_rep & abs_mask;
3132

3233
// Detect if a or b is zero, infinity, or NaN.
33-
if a_abs.wrapping_sub(one) >= inf_rep - one ||
34-
b_abs.wrapping_sub(one) >= inf_rep - one {
34+
if a_abs.wrapping_sub(one) >= inf_rep - one || b_abs.wrapping_sub(one) >= inf_rep - one {
3535
// NaN + anything = qNaN
3636
if a_abs > inf_rep {
3737
return F::from_repr(a_abs | quiet_bit);
@@ -68,7 +68,7 @@ fn add<F: Float>(a: F, b: F) -> F where
6868

6969
// anything + zero = anything
7070
if b_abs == Int::ZERO {
71-
return a;
71+
return a;
7272
}
7373
}
7474

@@ -115,7 +115,8 @@ fn add<F: Float>(a: F, b: F) -> F where
115115
let align = a_exponent.wrapping_sub(b_exponent).cast();
116116
if align != Int::ZERO {
117117
if align < bits {
118-
let sticky = F::Int::from_bool(b_significand << bits.wrapping_sub(align).cast() != Int::ZERO);
118+
let sticky =
119+
F::Int::from_bool(b_significand << bits.wrapping_sub(align).cast() != Int::ZERO);
119120
b_significand = (b_significand >> align.cast()) | sticky;
120121
} else {
121122
b_significand = one; // sticky; b is known to be non-zero.
@@ -131,12 +132,14 @@ fn add<F: Float>(a: F, b: F) -> F where
131132
// If partial cancellation occured, we need to left-shift the result
132133
// and adjust the exponent:
133134
if a_significand < implicit_bit << 3 {
134-
let shift = a_significand.leading_zeros() as i32
135-
- (implicit_bit << 3).leading_zeros() as i32;
135+
let shift =
136+
a_significand.leading_zeros() as i32 - (implicit_bit << 3).leading_zeros() as i32;
136137
a_significand <<= shift;
137138
a_exponent -= shift;
138139
}
139-
} else /* addition */ {
140+
} else
141+
/* addition */
142+
{
140143
a_significand += b_significand;
141144

142145
// If the addition carried up, we need to right-shift the result and
@@ -157,7 +160,8 @@ fn add<F: Float>(a: F, b: F) -> F where
157160
// Result is denormal before rounding; the exponent is zero and we
158161
// need to shift the significand.
159162
let shift = (1 - a_exponent).cast();
160-
let sticky = F::Int::from_bool((a_significand << bits.wrapping_sub(shift).cast()) != Int::ZERO);
163+
let sticky =
164+
F::Int::from_bool((a_significand << bits.wrapping_sub(shift).cast()) != Int::ZERO);
161165
a_significand = a_significand >> shift.cast() | sticky;
162166
a_exponent = 0;
163167
}
@@ -175,8 +179,12 @@ fn add<F: Float>(a: F, b: F) -> F where
175179

176180
// Final rounding. The result may overflow to infinity, but that is the
177181
// correct result in that case.
178-
if round_guard_sticky > 0x4 { result += one; }
179-
if round_guard_sticky == 0x4 { result += result & one; }
182+
if round_guard_sticky > 0x4 {
183+
result += one;
184+
}
185+
if round_guard_sticky == 0x4 {
186+
result += result & one;
187+
}
180188

181189
F::from_repr(result)
182190
}

0 commit comments

Comments
 (0)