Skip to content

Commit 5eb4be4

Browse files
committed
Rollup merge of #23803 - richo:unused-braces, r=Manishearth
Pretty much what it says on the tin.
2 parents 4aa17c8 + cbce6bf commit 5eb4be4

File tree

72 files changed

+94
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+94
-94
lines changed

src/liballoc/arc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ use core::prelude::*;
7676
use core::atomic;
7777
use core::atomic::Ordering::{Relaxed, Release, Acquire, SeqCst};
7878
use core::fmt;
79-
use core::cmp::{Ordering};
79+
use core::cmp::Ordering;
8080
use core::default::Default;
8181
use core::mem::{min_align_of, size_of};
8282
use core::mem;

src/libcollections/btree/map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use core::default::Default;
2424
use core::fmt::Debug;
2525
use core::hash::{Hash, Hasher};
2626
use core::iter::{Map, FromIterator, IntoIterator};
27-
use core::ops::{Index};
27+
use core::ops::Index;
2828
use core::{iter, fmt, mem, usize};
2929
use Bound::{self, Included, Excluded, Unbounded};
3030

src/libcollections/vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ use core::prelude::*;
5252
use alloc::boxed::Box;
5353
use alloc::heap::{EMPTY, allocate, reallocate, deallocate};
5454
use core::cmp::max;
55-
use core::cmp::{Ordering};
55+
use core::cmp::Ordering;
5656
use core::default::Default;
5757
use core::fmt;
5858
use core::hash::{self, Hash};

src/libcore/option.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ use self::Option::*;
148148
use clone::Clone;
149149
use cmp::{Eq, Ord};
150150
use default::Default;
151-
use iter::{ExactSizeIterator};
151+
use iter::ExactSizeIterator;
152152
use iter::{Iterator, IteratorExt, DoubleEndedIterator, FromIterator, IntoIterator};
153153
use mem;
154154
use ops::FnOnce;

src/librand/distributions/range.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
// this is surprisingly complicated to be both generic & correct
1414

15-
use core::prelude::{PartialOrd};
15+
use core::prelude::PartialOrd;
1616
use core::num::Int;
1717
use core::num::wrapping::WrappingOps;
1818

src/librustc/metadata/encoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use metadata::cstore;
2222
use metadata::decoder;
2323
use metadata::tyencode;
2424
use middle::def;
25-
use middle::ty::{lookup_item_type};
25+
use middle::ty::lookup_item_type;
2626
use middle::ty::{self, Ty};
2727
use middle::stability;
2828
use util::nodemap::{FnvHashMap, NodeMap, NodeSet};

src/librustc/metadata/loader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
//! no means all of the necessary details. Take a look at the rest of
213213
//! metadata::loader or metadata::creader for all the juicy details!
214214
215-
use back::archive::{METADATA_FILENAME};
215+
use back::archive::METADATA_FILENAME;
216216
use back::svh::Svh;
217217
use session::Session;
218218
use session::search_paths::PathKind;

src/librustc/middle/astencode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ use rbml::writer::Encoder;
5050
use rbml;
5151
use serialize;
5252
use serialize::{Decodable, Decoder, DecoderHelpers, Encodable};
53-
use serialize::{EncoderHelpers};
53+
use serialize::EncoderHelpers;
5454

5555
#[cfg(test)] use std::io::Cursor;
5656
#[cfg(test)] use syntax::parse;

src/librustc/middle/check_match.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use middle::const_eval::{const_expr_to_pat, lookup_const_by_id};
1818
use middle::def::*;
1919
use middle::expr_use_visitor::{ConsumeMode, Delegate, ExprUseVisitor, Init};
2020
use middle::expr_use_visitor::{JustWrite, LoanCause, MutateMode};
21-
use middle::expr_use_visitor::{WriteAndRead};
21+
use middle::expr_use_visitor::WriteAndRead;
2222
use middle::expr_use_visitor as euv;
2323
use middle::mem_categorization::cmt;
2424
use middle::pat_util::*;

src/librustc/middle/infer/bivariate.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
//! In particular, it might be enough to say (A,B) are bivariant for
2626
//! all (A,B).
2727
28-
use middle::ty::{BuiltinBounds};
28+
use middle::ty::BuiltinBounds;
2929
use middle::ty::{self, Ty};
3030
use middle::ty::TyVar;
3131
use middle::infer::combine::*;
32-
use middle::infer::{cres};
33-
use middle::infer::type_variable::{BiTo};
34-
use util::ppaux::{Repr};
32+
use middle::infer::cres;
33+
use middle::infer::type_variable::BiTo;
34+
use util::ppaux::Repr;
3535

3636
pub struct Bivariate<'f, 'tcx: 'f> {
3737
fields: CombineFields<'f, 'tcx>

0 commit comments

Comments
 (0)