Skip to content

Remove redundant field names in structs #53062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/libcore/cell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1258,7 +1258,7 @@ impl<'b, T: ?Sized> RefMut<'b, T> {
let RefMut { value, borrow } = orig;
RefMut {
value: f(value),
borrow: borrow,
borrow,
}
}

Expand Down Expand Up @@ -1324,7 +1324,7 @@ impl<'b> BorrowRefMut<'b> {
match borrow.get() {
UNUSED => {
borrow.set(UNUSED - 1);
Some(BorrowRefMut { borrow: borrow })
Some(BorrowRefMut { borrow })
},
_ => None,
}
Expand Down Expand Up @@ -1467,7 +1467,7 @@ impl<T> UnsafeCell<T> {
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub const fn new(value: T) -> UnsafeCell<T> {
UnsafeCell { value: value }
UnsafeCell { value }
}

/// Unwraps the value.
Expand Down
18 changes: 9 additions & 9 deletions src/libcore/iter/iterator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ pub trait Iterator {
fn map<B, F>(self, f: F) -> Map<Self, F> where
Self: Sized, F: FnMut(Self::Item) -> B,
{
Map{iter: self, f: f}
Map { iter: self, f }
}

/// Calls a closure on each element of an iterator.
Expand Down Expand Up @@ -618,7 +618,7 @@ pub trait Iterator {
fn filter<P>(self, predicate: P) -> Filter<Self, P> where
Self: Sized, P: FnMut(&Self::Item) -> bool,
{
Filter{iter: self, predicate: predicate}
Filter {iter: self, predicate }
}

/// Creates an iterator that both filters and maps.
Expand Down Expand Up @@ -675,7 +675,7 @@ pub trait Iterator {
fn filter_map<B, F>(self, f: F) -> FilterMap<Self, F> where
Self: Sized, F: FnMut(Self::Item) -> Option<B>,
{
FilterMap { iter: self, f: f }
FilterMap { iter: self, f }
}

/// Creates an iterator which gives the current iteration count as well as
Expand Down Expand Up @@ -828,7 +828,7 @@ pub trait Iterator {
fn skip_while<P>(self, predicate: P) -> SkipWhile<Self, P> where
Self: Sized, P: FnMut(&Self::Item) -> bool,
{
SkipWhile{iter: self, flag: false, predicate: predicate}
SkipWhile { iter: self, flag: false, predicate }
}

/// Creates an iterator that yields elements based on a predicate.
Expand Down Expand Up @@ -908,7 +908,7 @@ pub trait Iterator {
fn take_while<P>(self, predicate: P) -> TakeWhile<Self, P> where
Self: Sized, P: FnMut(&Self::Item) -> bool,
{
TakeWhile{iter: self, flag: false, predicate: predicate}
TakeWhile { iter: self, flag: false, predicate }
}

/// Creates an iterator that skips the first `n` elements.
Expand All @@ -930,7 +930,7 @@ pub trait Iterator {
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
fn skip(self, n: usize) -> Skip<Self> where Self: Sized {
Skip{iter: self, n: n}
Skip { iter: self, n }
}

/// Creates an iterator that yields its first `n` elements.
Expand Down Expand Up @@ -962,7 +962,7 @@ pub trait Iterator {
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
fn take(self, n: usize) -> Take<Self> where Self: Sized, {
Take{iter: self, n: n}
Take { iter: self, n }
}

/// An iterator adaptor similar to [`fold`] that holds internal state and
Expand Down Expand Up @@ -1007,7 +1007,7 @@ pub trait Iterator {
fn scan<St, B, F>(self, initial_state: St, f: F) -> Scan<Self, St, F>
where Self: Sized, F: FnMut(&mut St, Self::Item) -> Option<B>,
{
Scan{iter: self, f: f, state: initial_state}
Scan { iter: self, f, state: initial_state }
}

/// Creates an iterator that works like map, but flattens nested structure.
Expand Down Expand Up @@ -1256,7 +1256,7 @@ pub trait Iterator {
fn inspect<F>(self, f: F) -> Inspect<Self, F> where
Self: Sized, F: FnMut(&Self::Item),
{
Inspect{iter: self, f: f}
Inspect { iter: self, f }
}

/// Borrows an iterator, rather than consuming it.
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/num/dec2flt/parse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub struct Decimal<'a> {

impl<'a> Decimal<'a> {
pub fn new(integral: &'a [u8], fractional: &'a [u8], exp: i64) -> Decimal<'a> {
Decimal { integral: integral, fractional: fractional, exp: exp }
Decimal { integral, fractional, exp }
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/libcore/num/dec2flt/rawfp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub struct Unpacked {

impl Unpacked {
pub fn new(sig: u64, k: i16) -> Self {
Unpacked { sig: sig, k: k }
Unpacked { sig, k }
}
}

Expand Down Expand Up @@ -317,13 +317,13 @@ pub fn big_to_fp(f: &Big) -> Fp {
// We cut off all bits prior to the index `start`, i.e., we effectively right-shift by
// an amount of `start`, so this is also the exponent we need.
let e = start as i16;
let rounded_down = Fp { f: leading, e: e }.normalize();
let rounded_down = Fp { f: leading, e }.normalize();
// Round (half-to-even) depending on the truncated bits.
match num::compare_with_half_ulp(f, start) {
Less => rounded_down,
Equal if leading % 2 == 0 => rounded_down,
Equal | Greater => match leading.checked_add(1) {
Some(f) => Fp { f: f, e: e }.normalize(),
Some(f) => Fp { f, e }.normalize(),
None => Fp { f: 1 << 63, e: e + 1 },
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/libcore/num/diy_float.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ impl Fp {
let tmp = (bd >> 32) + (ad & MASK) + (bc & MASK) + (1 << 31) /* round */;
let f = ac + (ad >> 32) + (bc >> 32) + (tmp >> 32);
let e = self.e + other.e + 64;
Fp { f: f, e: e }
Fp { f, e }
}

/// Normalizes itself so that the resulting mantissa is at least `2^63`.
Expand Down Expand Up @@ -74,7 +74,7 @@ impl Fp {
e -= 1;
}
debug_assert!(f >= (1 >> 63));
Fp { f: f, e: e }
Fp { f, e }
}

/// Normalizes itself to have the shared exponent.
Expand Down
4 changes: 2 additions & 2 deletions src/libcore/num/flt2dec/decoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ pub fn decode<T: DecodableFloat>(v: T) -> (/*negative?*/ bool, FullDecoded) {
// neighbors: (mant - 2, exp) -- (mant, exp) -- (mant + 2, exp)
// Float::integer_decode always preserves the exponent,
// so the mantissa is scaled for subnormals.
FullDecoded::Finite(Decoded { mant: mant, minus: 1, plus: 1,
exp: exp, inclusive: even })
FullDecoded::Finite(Decoded { mant, minus: 1, plus: 1,
exp, inclusive: even })
}
FpCategory::Normal => {
let minnorm = <T as DecodableFloat>::min_pos_norm_value().integer_decode();
Expand Down
36 changes: 18 additions & 18 deletions src/libcore/num/flt2dec/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -424,20 +424,20 @@ pub fn to_shortest_str<'a, T, F>(mut format_shortest: F, v: T,
match full_decoded {
FullDecoded::Nan => {
parts[0] = Part::Copy(b"NaN");
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
FullDecoded::Infinite => {
parts[0] = Part::Copy(b"inf");
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
FullDecoded::Zero => {
if frac_digits > 0 { // [0.][0000]
parts[0] = Part::Copy(b"0.");
parts[1] = Part::Zero(frac_digits);
Formatted { sign: sign, parts: &parts[..2] }
Formatted { sign, parts: &parts[..2] }
} else {
parts[0] = Part::Copy(b"0");
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
}
FullDecoded::Finite(ref decoded) => {
Expand Down Expand Up @@ -480,19 +480,19 @@ pub fn to_shortest_exp_str<'a, T, F>(mut format_shortest: F, v: T,
match full_decoded {
FullDecoded::Nan => {
parts[0] = Part::Copy(b"NaN");
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
FullDecoded::Infinite => {
parts[0] = Part::Copy(b"inf");
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
FullDecoded::Zero => {
parts[0] = if dec_bounds.0 <= 0 && 0 < dec_bounds.1 {
Part::Copy(b"0")
} else {
Part::Copy(if upper { b"0E0" } else { b"0e0" })
};
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
FullDecoded::Finite(ref decoded) => {
let (len, exp) = format_shortest(decoded, buf);
Expand All @@ -502,7 +502,7 @@ pub fn to_shortest_exp_str<'a, T, F>(mut format_shortest: F, v: T,
} else {
digits_to_exp_str(&buf[..len], exp, 0, upper, parts)
};
Formatted { sign: sign, parts: parts }
Formatted { sign, parts }
}
}
}
Expand Down Expand Up @@ -558,21 +558,21 @@ pub fn to_exact_exp_str<'a, T, F>(mut format_exact: F, v: T,
match full_decoded {
FullDecoded::Nan => {
parts[0] = Part::Copy(b"NaN");
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
FullDecoded::Infinite => {
parts[0] = Part::Copy(b"inf");
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
FullDecoded::Zero => {
if ndigits > 1 { // [0.][0000][e0]
parts[0] = Part::Copy(b"0.");
parts[1] = Part::Zero(ndigits - 1);
parts[2] = Part::Copy(if upper { b"E0" } else { b"e0" });
Formatted { sign: sign, parts: &parts[..3] }
Formatted { sign, parts: &parts[..3] }
} else {
parts[0] = Part::Copy(if upper { b"0E0" } else { b"0e0" });
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
}
FullDecoded::Finite(ref decoded) => {
Expand Down Expand Up @@ -613,20 +613,20 @@ pub fn to_exact_fixed_str<'a, T, F>(mut format_exact: F, v: T,
match full_decoded {
FullDecoded::Nan => {
parts[0] = Part::Copy(b"NaN");
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
FullDecoded::Infinite => {
parts[0] = Part::Copy(b"inf");
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
FullDecoded::Zero => {
if frac_digits > 0 { // [0.][0000]
parts[0] = Part::Copy(b"0.");
parts[1] = Part::Zero(frac_digits);
Formatted { sign: sign, parts: &parts[..2] }
Formatted { sign, parts: &parts[..2] }
} else {
parts[0] = Part::Copy(b"0");
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
}
FullDecoded::Finite(ref decoded) => {
Expand All @@ -646,10 +646,10 @@ pub fn to_exact_fixed_str<'a, T, F>(mut format_exact: F, v: T,
if frac_digits > 0 { // [0.][0000]
parts[0] = Part::Copy(b"0.");
parts[1] = Part::Zero(frac_digits);
Formatted { sign: sign, parts: &parts[..2] }
Formatted { sign, parts: &parts[..2] }
} else {
parts[0] = Part::Copy(b"0");
Formatted { sign: sign, parts: &parts[..1] }
Formatted { sign, parts: &parts[..1] }
}
} else {
Formatted { sign,
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/num/flt2dec/strategy/grisu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pub fn cached_power(alpha: i16, gamma: i16) -> (i16, Fp) {
let idx = ((gamma as i32) - offset) * range / domain;
let (f, e, k) = CACHED_POW10[idx as usize];
debug_assert!(alpha <= e && e <= gamma);
(k, Fp { f: f, e: e })
(k, Fp { f, e })
}

/// Given `x > 0`, returns `(k, 10^k)` such that `10^k <= x < 10^(k+1)`.
Expand Down
12 changes: 6 additions & 6 deletions src/libcore/slice/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ impl<T> [T] {
#[inline]
pub fn windows(&self, size: usize) -> Windows<T> {
assert!(size != 0);
Windows { v: self, size: size }
Windows { v: self, size }
}

/// Returns an iterator over `chunk_size` elements of the slice at a
Expand Down Expand Up @@ -652,7 +652,7 @@ impl<T> [T] {
#[inline]
pub fn chunks(&self, chunk_size: usize) -> Chunks<T> {
assert!(chunk_size != 0);
Chunks { v: self, chunk_size: chunk_size }
Chunks { v: self, chunk_size }
}

/// Returns an iterator over `chunk_size` elements of the slice at a time.
Expand Down Expand Up @@ -687,7 +687,7 @@ impl<T> [T] {
#[inline]
pub fn chunks_mut(&mut self, chunk_size: usize) -> ChunksMut<T> {
assert!(chunk_size != 0);
ChunksMut { v: self, chunk_size: chunk_size }
ChunksMut { v: self, chunk_size }
}

/// Returns an iterator over `chunk_size` elements of the slice at a
Expand Down Expand Up @@ -724,7 +724,7 @@ impl<T> [T] {
let rem = self.len() % chunk_size;
let len = self.len() - rem;
let (fst, snd) = self.split_at(len);
ExactChunks { v: fst, rem: snd, chunk_size: chunk_size}
ExactChunks { v: fst, rem: snd, chunk_size }
}

/// Returns an iterator over `chunk_size` elements of the slice at a time.
Expand Down Expand Up @@ -766,7 +766,7 @@ impl<T> [T] {
let rem = self.len() % chunk_size;
let len = self.len() - rem;
let (fst, snd) = self.split_at_mut(len);
ExactChunksMut { v: fst, rem: snd, chunk_size: chunk_size}
ExactChunksMut { v: fst, rem: snd, chunk_size }
}

/// Divides one slice into two at an index.
Expand Down Expand Up @@ -916,7 +916,7 @@ impl<T> [T] {
pub fn split_mut<F>(&mut self, pred: F) -> SplitMut<T, F>
where F: FnMut(&T) -> bool
{
SplitMut { v: self, pred: pred, finished: false }
SplitMut { v: self, pred, finished: false }
}

/// Returns an iterator over subslices separated by elements that match
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/task/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ impl<'a> Context<'a> {
{
Context {
local_waker: self.local_waker,
executor: executor,
executor,
}
}
}
8 changes: 4 additions & 4 deletions src/libcore/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ impl Duration {
let secs = secs.checked_add((nanos / NANOS_PER_SEC) as u64)
.expect("overflow in Duration::new");
let nanos = nanos % NANOS_PER_SEC;
Duration { secs: secs, nanos: nanos }
Duration { secs, nanos }
}

/// Creates a new `Duration` from the specified number of whole seconds.
Expand All @@ -109,7 +109,7 @@ impl Duration {
#[stable(feature = "duration", since = "1.3.0")]
#[inline]
pub const fn from_secs(secs: u64) -> Duration {
Duration { secs: secs, nanos: 0 }
Duration { secs, nanos: 0 }
}

/// Creates a new `Duration` from the specified number of milliseconds.
Expand Down Expand Up @@ -387,7 +387,7 @@ impl Duration {
}
};
debug_assert!(nanos < NANOS_PER_SEC);
Some(Duration { secs: secs, nanos: nanos })
Some(Duration { secs, nanos })
} else {
None
}
Expand Down Expand Up @@ -453,7 +453,7 @@ impl Duration {
let extra_nanos = carry * (NANOS_PER_SEC as u64) / (rhs as u64);
let nanos = self.nanos / rhs + (extra_nanos as u32);
debug_assert!(nanos < NANOS_PER_SEC);
Some(Duration { secs: secs, nanos: nanos })
Some(Duration { secs, nanos })
} else {
None
}
Expand Down