diff options
Diffstat (limited to 'src/librustc')
| -rw-r--r-- | src/librustc/metadata/creader.rs | 2 | ||||
| -rw-r--r-- | src/librustc/metadata/decoder.rs | 4 | ||||
| -rw-r--r-- | src/librustc/metadata/encoder.rs | 4 | ||||
| -rw-r--r-- | src/librustc/metadata/loader.rs | 14 | ||||
| -rw-r--r-- | src/librustc/middle/check_match.rs | 8 | ||||
| -rw-r--r-- | src/librustc/middle/dead.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/infer/error_reporting.rs | 6 | ||||
| -rw-r--r-- | src/librustc/middle/infer/region_inference/graphviz.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/infer/region_inference/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/liveness.rs | 6 | ||||
| -rw-r--r-- | src/librustc/middle/resolve_lifetime.rs | 4 | ||||
| -rw-r--r-- | src/librustc/middle/subst.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/traits/fulfill.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/traits/select.rs | 4 | ||||
| -rw-r--r-- | src/librustc/middle/ty.rs | 16 | ||||
| -rw-r--r-- | src/librustc/middle/ty_relate/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustc/session/config.rs | 2 | ||||
| -rw-r--r-- | src/librustc/util/ppaux.rs | 4 |
18 files changed, 43 insertions, 43 deletions
diff --git a/src/librustc/metadata/creader.rs b/src/librustc/metadata/creader.rs index a2028c5ae72..802c5815398 100644 --- a/src/librustc/metadata/creader.rs +++ b/src/librustc/metadata/creader.rs @@ -80,7 +80,7 @@ pub fn validate_crate_name(sess: Option<&Session>, s: &str, sp: Option<Span>) { (None, Some(sess)) => sess.err(s), } }; - if s.len() == 0 { + if s.is_empty() { say("crate name must not be empty"); } for c in s.chars() { diff --git a/src/librustc/metadata/decoder.rs b/src/librustc/metadata/decoder.rs index a659a93aef3..6b3bde409f5 100644 --- a/src/librustc/metadata/decoder.rs +++ b/src/librustc/metadata/decoder.rs @@ -767,7 +767,7 @@ pub fn get_enum_variants<'tcx>(intr: Rc<IdentInterner>, cdata: Cmd, id: ast::Nod get_type(cdata, field_ty.id.node, tcx).ty }) .collect(); - let arg_names = if arg_names.len() == 0 { None } else { Some(arg_names) }; + let arg_names = if arg_names.is_empty() { None } else { Some(arg_names) }; (None, arg_tys, arg_names) } @@ -1383,7 +1383,7 @@ pub fn get_dylib_dependency_formats(cdata: Cmd) debug!("found dylib deps: {}", formats.as_str_slice()); for spec in formats.as_str_slice().split(',') { - if spec.len() == 0 { continue } + if spec.is_empty() { continue } let cnum = spec.split(':').nth(0).unwrap(); let link = spec.split(':').nth(1).unwrap(); let cnum: ast::CrateNum = cnum.parse().unwrap(); diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs index f9d3d707bb5..29270bd6c62 100644 --- a/src/librustc/metadata/encoder.rs +++ b/src/librustc/metadata/encoder.rs @@ -469,7 +469,7 @@ fn each_auxiliary_node_id<F>(item: &ast::Item, callback: F) -> bool where ast::ItemStruct(ref struct_def, _) => { // If this is a newtype struct, return the constructor. match struct_def.ctor_id { - Some(ctor_id) if struct_def.fields.len() > 0 && + Some(ctor_id) if !struct_def.fields.is_empty() && struct_def.fields[0].node.kind.is_unnamed() => { continue_ = callback(ctor_id); } @@ -1751,7 +1751,7 @@ fn encode_codemap(ecx: &EncodeContext, rbml_w: &mut Encoder) { for filemap in &codemap.files.borrow()[..] { - if filemap.lines.borrow().len() == 0 || filemap.is_imported() { + if filemap.lines.borrow().is_empty() || filemap.is_imported() { // No need to export empty filemaps, as they can't contain spans // that need translation. // Also no need to re-export imported filemaps, as any downstream diff --git a/src/librustc/metadata/loader.rs b/src/librustc/metadata/loader.rs index 4a77f80d3b8..398e4cd33b9 100644 --- a/src/librustc/metadata/loader.rs +++ b/src/librustc/metadata/loader.rs @@ -307,13 +307,13 @@ impl<'a> Context<'a> { } pub fn report_load_errs(&mut self) { - let message = if self.rejected_via_hash.len() > 0 { + let message = if !self.rejected_via_hash.is_empty() { format!("found possibly newer version of crate `{}`", self.ident) - } else if self.rejected_via_triple.len() > 0 { + } else if !self.rejected_via_triple.is_empty() { format!("couldn't find crate `{}` with expected target triple {}", self.ident, self.triple) - } else if self.rejected_via_kind.len() > 0 { + } else if !self.rejected_via_kind.is_empty() { format!("found staticlib `{}` instead of rlib or dylib", self.ident) } else { format!("can't find crate for `{}`", self.ident) @@ -325,7 +325,7 @@ impl<'a> Context<'a> { }; self.sess.span_err(self.span, &message[..]); - if self.rejected_via_triple.len() > 0 { + if !self.rejected_via_triple.is_empty() { let mismatches = self.rejected_via_triple.iter(); for (i, &CrateMismatch{ ref path, ref got }) in mismatches.enumerate() { self.sess.fileline_note(self.span, @@ -333,7 +333,7 @@ impl<'a> Context<'a> { self.ident, i+1, got, path.display())); } } - if self.rejected_via_hash.len() > 0 { + if !self.rejected_via_hash.is_empty() { self.sess.span_note(self.span, "perhaps this crate needs \ to be recompiled?"); let mismatches = self.rejected_via_hash.iter(); @@ -353,7 +353,7 @@ impl<'a> Context<'a> { } } } - if self.rejected_via_kind.len() > 0 { + if !self.rejected_via_kind.is_empty() { self.sess.fileline_help(self.span, "please recompile this crate using \ --crate-type lib"); let mismatches = self.rejected_via_kind.iter(); @@ -517,7 +517,7 @@ impl<'a> Context<'a> { // library's metadata sections. In theory we should // read both, but reading dylib metadata is quite // slow. - if m.len() == 0 { + if m.is_empty() { return None } else if m.len() == 1 { return Some(m.into_iter().next().unwrap()) diff --git a/src/librustc/middle/check_match.rs b/src/librustc/middle/check_match.rs index 14df040fb79..912854a6d7d 100644 --- a/src/librustc/middle/check_match.rs +++ b/src/librustc/middle/check_match.rs @@ -239,7 +239,7 @@ fn check_for_bindings_named_the_same_as_variants(cx: &MatchCheckCtxt, pat: &Pat) if let Some(DefLocal(_)) = def { if ty::enum_variants(cx.tcx, def_id).iter().any(|variant| token::get_name(variant.name) == token::get_name(ident.node.name) - && variant.args.len() == 0 + && variant.args.is_empty() ) { span_warn!(cx.tcx.sess, p.span, E0170, "pattern binding `{}` is named the same as one \ @@ -636,19 +636,19 @@ fn is_useful(cx: &MatchCheckCtxt, -> Usefulness { let &Matrix(ref rows) = matrix; debug!("{:?}", matrix); - if rows.len() == 0 { + if rows.is_empty() { return match witness { ConstructWitness => UsefulWithWitness(vec!()), LeaveOutWitness => Useful }; } - if rows[0].len() == 0 { + if rows[0].is_empty() { return NotUseful; } assert!(rows.iter().all(|r| r.len() == v.len())); let real_pat = match rows.iter().find(|r| (*r)[0].id != DUMMY_NODE_ID) { Some(r) => raw_pat(r[0]), - None if v.len() == 0 => return NotUseful, + None if v.is_empty() => return NotUseful, None => v[0] }; let left_ty = if real_pat.id == DUMMY_NODE_ID { diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs index b3188f260b9..2befbf99245 100644 --- a/src/librustc/middle/dead.rs +++ b/src/librustc/middle/dead.rs @@ -182,7 +182,7 @@ impl<'a, 'tcx> MarkSymbolVisitor<'a, 'tcx> { fn mark_live_symbols(&mut self) { let mut scanned = HashSet::new(); - while self.worklist.len() > 0 { + while !self.worklist.is_empty() { let id = self.worklist.pop().unwrap(); if scanned.contains(&id) { continue diff --git a/src/librustc/middle/infer/error_reporting.rs b/src/librustc/middle/infer/error_reporting.rs index 03e76f5ee25..3dbbcce27b6 100644 --- a/src/librustc/middle/infer/error_reporting.rs +++ b/src/librustc/middle/infer/error_reporting.rs @@ -966,7 +966,7 @@ impl<'a, 'tcx> Rebuilder<'a, 'tcx> { fn pick_lifetime(&self, region_names: &HashSet<ast::Name>) -> (ast::Lifetime, FreshOrKept) { - if region_names.len() > 0 { + if !region_names.is_empty() { // It's not necessary to convert the set of region names to a // vector of string and then sort them. However, it makes the // choice of lifetime name deterministic and thus easier to test. @@ -1241,7 +1241,7 @@ impl<'a, 'tcx> Rebuilder<'a, 'tcx> { let lifetimes = path.segments.last().unwrap().parameters.lifetimes(); let mut insert = Vec::new(); - if lifetimes.len() == 0 { + if lifetimes.is_empty() { let anon = self.cur_anon.get(); for (i, a) in (anon..anon+expected).enumerate() { if anon_nums.contains(&a) { @@ -1361,7 +1361,7 @@ impl<'a, 'tcx> Rebuilder<'a, 'tcx> { ast::AngleBracketedParameters(ref data) => { let mut new_lts = Vec::new(); - if data.lifetimes.len() == 0 { + if data.lifetimes.is_empty() { // traverse once to see if there's a need to insert lifetime let need_insert = (0..expected).any(|i| { indexes.contains(&i) diff --git a/src/librustc/middle/infer/region_inference/graphviz.rs b/src/librustc/middle/infer/region_inference/graphviz.rs index 1fcbf80c904..054cec68745 100644 --- a/src/librustc/middle/infer/region_inference/graphviz.rs +++ b/src/librustc/middle/infer/region_inference/graphviz.rs @@ -88,7 +88,7 @@ pub fn maybe_print_constraints_for<'a, 'tcx>(region_vars: &RegionVarBindings<'a, Err(_) => "/tmp/constraints.node%.dot".to_string(), }; - if output_template.len() == 0 { + if output_template.is_empty() { tcx.sess.bug("empty string provided as RUST_REGION_GRAPH"); } diff --git a/src/librustc/middle/infer/region_inference/mod.rs b/src/librustc/middle/infer/region_inference/mod.rs index d41fdc5f09a..c6be97e6dbe 100644 --- a/src/librustc/middle/infer/region_inference/mod.rs +++ b/src/librustc/middle/infer/region_inference/mod.rs @@ -246,7 +246,7 @@ impl<'a, 'tcx> RegionVarBindings<'a, 'tcx> { } fn in_snapshot(&self) -> bool { - self.undo_log.borrow().len() > 0 + !self.undo_log.borrow().is_empty() } pub fn start_snapshot(&self) -> RegionSnapshot { diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs index 786cd902c53..d4136637e58 100644 --- a/src/librustc/middle/liveness.rs +++ b/src/librustc/middle/liveness.rs @@ -716,7 +716,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> { None => { // Vanilla 'break' or 'loop', so use the enclosing // loop scope - if self.loop_scope.len() == 0 { + if self.loop_scope.is_empty() { self.ir.tcx.sess.span_bug(sp, "break outside loop"); } else { *self.loop_scope.last().unwrap() @@ -1527,7 +1527,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> { // for nil return types, it is ok to not return a value expl. } else { let ends_with_stmt = match body.expr { - None if body.stmts.len() > 0 => + None if !body.stmts.is_empty() => match body.stmts.first().unwrap().node { ast::StmtSemi(ref e, _) => { ty::expr_ty(self.ir.tcx, &**e) == t_ret @@ -1586,7 +1586,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> { fn should_warn(&self, var: Variable) -> Option<String> { let name = self.ir.variable_name(var); - if name.len() == 0 || name.as_bytes()[0] == ('_' as u8) { + if name.is_empty() || name.as_bytes()[0] == ('_' as u8) { None } else { Some(name) diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index 53ed3b91948..a9da92a768f 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -227,7 +227,7 @@ impl<'a, 'v> Visitor<'v> for LifetimeContext<'a> { ref bounds, ref bound_lifetimes, .. }) => { - if bound_lifetimes.len() > 0 { + if !bound_lifetimes.is_empty() { self.trait_ref_hack = true; let result = self.with(LateScope(bound_lifetimes, self.scope), |old_scope, this| { @@ -267,7 +267,7 @@ impl<'a, 'v> Visitor<'v> for LifetimeContext<'a> { _modifier: &ast::TraitBoundModifier) { debug!("visit_poly_trait_ref trait_ref={:?}", trait_ref); - if !self.trait_ref_hack || trait_ref.bound_lifetimes.len() > 0 { + if !self.trait_ref_hack || !trait_ref.bound_lifetimes.is_empty() { if self.trait_ref_hack { println!("{:?}", trait_ref.span); span_err!(self.sess, trait_ref.span, E0316, diff --git a/src/librustc/middle/subst.rs b/src/librustc/middle/subst.rs index e2ebe2bc0f1..d9cdf0fa1cb 100644 --- a/src/librustc/middle/subst.rs +++ b/src/librustc/middle/subst.rs @@ -361,7 +361,7 @@ impl<T> VecPerParamSpace<T> { pub fn get_self<'a>(&'a self) -> Option<&'a T> { let v = self.get_slice(SelfSpace); assert!(v.len() <= 1); - if v.len() == 0 { None } else { Some(&v[0]) } + if v.is_empty() { None } else { Some(&v[0]) } } pub fn len(&self, space: ParamSpace) -> usize { diff --git a/src/librustc/middle/traits/fulfill.rs b/src/librustc/middle/traits/fulfill.rs index ffd3299175d..5938c6df92a 100644 --- a/src/librustc/middle/traits/fulfill.rs +++ b/src/librustc/middle/traits/fulfill.rs @@ -298,7 +298,7 @@ impl<'tcx> FulfillmentContext<'tcx> { self.predicates.len(), errors.len()); - if errors.len() == 0 { + if errors.is_empty() { Ok(()) } else { Err(errors) diff --git a/src/librustc/middle/traits/select.rs b/src/librustc/middle/traits/select.rs index 08357084bb2..ed8a6fb0200 100644 --- a/src/librustc/middle/traits/select.rs +++ b/src/librustc/middle/traits/select.rs @@ -698,7 +698,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> { // is checked for in `evaluate_stack` (and hence users // who might care about this case, like coherence, should use // that function). - if candidates.len() == 0 { + if candidates.is_empty() { return Err(Unimplemented); } @@ -873,7 +873,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> { try!(self.assemble_candidates_from_caller_bounds(stack, &mut candidates)); // Default implementations have lower priority, so we only // consider triggering a default if there is no other impl that can apply. - if candidates.vec.len() == 0 { + if candidates.vec.is_empty() { try!(self.assemble_candidates_from_default_impls(obligation, &mut candidates)); } debug!("candidate list size: {}", candidates.vec.len()); diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index be126b0b54c..1e817890440 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -3036,7 +3036,7 @@ pub fn mk_trait<'tcx>(cx: &ctxt<'tcx>, } fn bound_list_is_sorted(bounds: &[ty::PolyProjectionPredicate]) -> bool { - bounds.len() == 0 || + bounds.is_empty() || bounds[1..].iter().enumerate().all( |(index, bound)| bounds[index].sort_key() <= bound.sort_key()) } @@ -3665,7 +3665,7 @@ pub fn type_contents<'tcx>(cx: &ctxt<'tcx>, ty: Ty<'tcx>) -> TypeContents { res = res | TC::OwnsDtor; } - if variants.len() != 0 { + if !variants.is_empty() { let repr_hints = lookup_repr_hints(cx, did); if repr_hints.len() > 1 { // this is an error later on, but this type isn't safe @@ -3687,7 +3687,7 @@ pub fn type_contents<'tcx>(cx: &ctxt<'tcx>, ty: Ty<'tcx>) -> TypeContents { if variants.len() == 2 { let mut data_idx = 0; - if variants[0].args.len() == 0 { + if variants[0].args.is_empty() { data_idx = 1; } @@ -4200,10 +4200,10 @@ pub fn type_is_c_like_enum(cx: &ctxt, ty: Ty) -> bool { match ty.sty { ty_enum(did, _) => { let variants = enum_variants(cx, did); - if variants.len() == 0 { + if variants.is_empty() { false } else { - variants.iter().all(|v| v.args.len() == 0) + variants.iter().all(|v| v.args.is_empty()) } } _ => false @@ -4654,7 +4654,7 @@ pub fn expr_kind(tcx: &ctxt, expr: &ast::Expr) -> ExprKind { match resolve_expr(tcx, expr) { def::DefVariant(tid, vid, _) => { let variant_info = enum_variant_with_id(tcx, tid, vid); - if variant_info.args.len() > 0 { + if !variant_info.args.is_empty() { // N-ary variant. RvalueDatumExpr } else { @@ -5259,7 +5259,7 @@ impl<'tcx> VariantInfo<'tcx> { match ast_variant.node.kind { ast::TupleVariantKind(ref args) => { - let arg_tys = if args.len() > 0 { + let arg_tys = if !args.is_empty() { // the regions in the argument types come from the // enum def'n, and hence will all be early bound ty::no_late_bound_regions(cx, &ty_fn_args(ctor_ty)).unwrap() @@ -5280,7 +5280,7 @@ impl<'tcx> VariantInfo<'tcx> { ast::StructVariantKind(ref struct_def) => { let fields: &[StructField] = &struct_def.fields; - assert!(fields.len() > 0); + assert!(!fields.is_empty()); let arg_tys = struct_def.fields.iter() .map(|field| node_id_to_type(cx, field.node.id)).collect(); diff --git a/src/librustc/middle/ty_relate/mod.rs b/src/librustc/middle/ty_relate/mod.rs index 3a55a64314e..1c414d3d5f3 100644 --- a/src/librustc/middle/ty_relate/mod.rs +++ b/src/librustc/middle/ty_relate/mod.rs @@ -544,7 +544,7 @@ pub fn super_relate_tys<'a,'tcx:'a,R>(relation: &mut R, .map(|(a, b)| relation.relate(a, b)) .collect::<Result<_, _>>()); Ok(ty::mk_tup(tcx, ts)) - } else if as_.len() != 0 && bs.len() != 0 { + } else if !(as_.is_empty() || bs.is_empty()) { Err(ty::terr_tuple_size( expected_found(relation, &as_.len(), &bs.len()))) } else { diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index a7d608d2c87..3fb6c191f6c 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -902,7 +902,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options { }; output_types.sort(); output_types.dedup(); - if output_types.len() == 0 { + if output_types.is_empty() { output_types.push(OutputTypeExe); } diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs index 7358b4cc0f6..fe076b904ca 100644 --- a/src/librustc/util/ppaux.rs +++ b/src/librustc/util/ppaux.rs @@ -558,7 +558,7 @@ pub fn parameterized<'tcx,GG>(cx: &ctxt<'tcx>, &strs[0][..] }, tail) - } else if strs.len() > 0 { + } else if !strs.is_empty() { format!("{}<{}>", base, strs.connect(", ")) } else { format!("{}", base) @@ -1269,7 +1269,7 @@ impl<'tcx, T> UserString<'tcx> for ty::Binder<T> let names: Vec<_> = names.iter().map(|s| &s[..]).collect(); let value_str = unbound_value.user_string(tcx); - if names.len() == 0 { + if names.is_empty() { value_str } else { format!("for<{}> {}", names.connect(","), value_str) |
