diff options
| author | Tamir Duberstein <tamird@gmail.com> | 2015-03-24 16:53:34 -0700 |
|---|---|---|
| committer | Tamir Duberstein <tamird@gmail.com> | 2015-04-14 20:26:03 -0700 |
| commit | 29ac04402d53d358a1f6200bea45a301ff05b2d1 (patch) | |
| tree | b54ff9c5f2b99a0197147875cf3c5377d8a09cf4 /src/librustdoc | |
| parent | 16e1fcead14628701e1b10b9d00c898d748db2ed (diff) | |
| download | rust-29ac04402d53d358a1f6200bea45a301ff05b2d1.tar.gz rust-29ac04402d53d358a1f6200bea45a301ff05b2d1.zip | |
Positive case of `len()` -> `is_empty()`
`s/(?<!\{ self)(?<=\.)len\(\) == 0/is_empty()/g`
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 4 | ||||
| -rw-r--r-- | src/librustdoc/html/format.rs | 4 | ||||
| -rw-r--r-- | src/librustdoc/html/layout.rs | 6 | ||||
| -rw-r--r-- | src/librustdoc/html/markdown.rs | 4 | ||||
| -rw-r--r-- | src/librustdoc/html/render.rs | 12 | ||||
| -rw-r--r-- | src/librustdoc/lib.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/markdown.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/passes.rs | 4 | ||||
| -rw-r--r-- | src/librustdoc/test.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/visit_ast.rs | 2 |
10 files changed, 21 insertions, 21 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 38df0339e42..ff364eb69a8 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1820,7 +1820,7 @@ impl<'tcx> Clean<Item> for ty::VariantInfo<'tcx> { fn clean(&self, cx: &DocContext) -> Item { // use syntax::parse::token::special_idents::unnamed_field; let kind = match self.arg_names.as_ref().map(|s| &**s) { - None | Some([]) if self.args.len() == 0 => CLikeVariant, + None | Some([]) if self.args.is_empty() => CLikeVariant, None | Some([]) => { TupleVariant(self.args.clean(cx)) } @@ -1874,7 +1874,7 @@ impl Clean<VariantKind> for ast::VariantKind { fn clean(&self, cx: &DocContext) -> VariantKind { match self { &ast::TupleVariantKind(ref args) => { - if args.len() == 0 { + if args.is_empty() { CLikeVariant } else { TupleVariant(args.iter().map(|x| x.ty.clean(cx)).collect()) diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index f6215dcb00c..5aded0215e9 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -94,7 +94,7 @@ impl<'a> fmt::Display for TyParamBounds<'a> { impl fmt::Display for clean::Generics { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - if self.lifetimes.len() == 0 && self.type_params.len() == 0 { return Ok(()) } + if self.lifetimes.is_empty() && self.type_params.is_empty() { return Ok(()) } try!(f.write_str("<")); for (i, life) in self.lifetimes.iter().enumerate() { @@ -132,7 +132,7 @@ impl fmt::Display for clean::Generics { impl<'a> fmt::Display for WhereClause<'a> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let &WhereClause(gens) = self; - if gens.where_predicates.len() == 0 { + if gens.where_predicates.is_empty() { return Ok(()); } try!(f.write_str(" <span class='where'>where ")); diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index 3acd17dedd5..a53884ca047 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -130,7 +130,7 @@ r##"<!DOCTYPE html> content = *t, root_path = page.root_path, ty = page.ty, - logo = if layout.logo.len() == 0 { + logo = if layout.logo.is_empty() { "".to_string() } else { format!("<a href='{}{}/index.html'>\ @@ -141,7 +141,7 @@ r##"<!DOCTYPE html> title = page.title, description = page.description, keywords = page.keywords, - favicon = if layout.favicon.len() == 0 { + favicon = if layout.favicon.is_empty() { "".to_string() } else { format!(r#"<link rel="shortcut icon" href="{}">"#, layout.favicon) @@ -152,7 +152,7 @@ r##"<!DOCTYPE html> sidebar = *sidebar, krate = layout.krate, play_url = layout.playground_url, - play_js = if layout.playground_url.len() == 0 { + play_js = if layout.playground_url.is_empty() { "".to_string() } else { format!(r#"<script src="{}playpen.js"></script>"#, page.root_path) diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs index cb80d071ce4..334f05fb36f 100644 --- a/src/librustdoc/html/markdown.rs +++ b/src/librustdoc/html/markdown.rs @@ -305,7 +305,7 @@ pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result { let text = format!(r##"<h{lvl} id="{id}" class='section-header'><a href="#{id}">{sec}{}</a></h{lvl}>"##, s, lvl = level, id = id, - sec = if sec.len() == 0 { + sec = if sec.is_empty() { sec.to_string() } else { format!("{} ", sec) @@ -491,7 +491,7 @@ impl<'a> fmt::Display for Markdown<'a> { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { let Markdown(md) = *self; // This is actually common enough to special-case - if md.len() == 0 { return Ok(()) } + if md.is_empty() { return Ok(()) } render(fmt, md, false) } } diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 8e33a9bd80b..5ee78bf836e 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -912,7 +912,7 @@ impl DocFolder for Cache { false) } clean::MethodItem(..) => { - if self.parent_stack.len() == 0 { + if self.parent_stack.is_empty() { ((None, None), false) } else { let last = self.parent_stack.last().unwrap(); @@ -1115,7 +1115,7 @@ impl Context { fn recurse<T, F>(&mut self, s: String, f: F) -> T where F: FnOnce(&mut Context) -> T, { - if s.len() == 0 { + if s.is_empty() { panic!("Unexpected empty destination: {:?}", self.current); } let prev = self.dst.clone(); @@ -1343,7 +1343,7 @@ impl Context { fn ignore_private_item(&self, it: &clean::Item) -> bool { match it.inner { clean::ModuleItem(ref m) => { - (m.items.len() == 0 && + (m.items.is_empty() && it.doc_value().is_none() && it.visibility != Some(ast::Public)) || (self.passes.contains("strip-private") && it.visibility != Some(ast::Public)) @@ -1690,7 +1690,7 @@ struct Initializer<'a>(&'a str); impl<'a> fmt::Display for Initializer<'a> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let Initializer(s) = *self; - if s.len() == 0 { return Ok(()); } + if s.is_empty() { return Ok(()); } try!(write!(f, "<code> = </code>")); write!(f, "<code>{}</code>", s) } @@ -1766,7 +1766,7 @@ fn item_trait(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, match m.inner { clean::MethodItem(_) => true, _ => false } }).collect::<Vec<_>>(); - if t.items.len() == 0 { + if t.items.is_empty() { try!(write!(w, "{{ }}")); } else { try!(write!(w, "{{\n")); @@ -1986,7 +1986,7 @@ fn item_enum(w: &mut fmt::Formatter, it: &clean::Item, it.name.as_ref().unwrap(), e.generics, WhereClause(&e.generics))); - if e.variants.len() == 0 && !e.variants_stripped { + if e.variants.is_empty() && !e.variants_stripped { try!(write!(w, " {{}}")); } else { try!(write!(w, " {{\n")); diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 1393c39f66c..008da466db0 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -219,7 +219,7 @@ pub fn main_args(args: &[String]) -> isize { return 0; } - if matches.free.len() == 0 { + if matches.free.is_empty() { println!("expected an input file to act on"); return 1; } if matches.free.len() > 1 { diff --git a/src/librustdoc/markdown.rs b/src/librustdoc/markdown.rs index 6541564d8e2..00de4e3ec53 100644 --- a/src/librustdoc/markdown.rs +++ b/src/librustdoc/markdown.rs @@ -74,7 +74,7 @@ pub fn render(input: &str, mut output: PathBuf, matches: &getopts::Matches, }; let (metadata, text) = extract_leading_metadata(&input_str); - if metadata.len() == 0 { + if metadata.is_empty() { let _ = writeln!(&mut io::stderr(), "invalid markdown file: expecting initial line with `% ...TITLE...`"); return 5; diff --git a/src/librustdoc/passes.rs b/src/librustdoc/passes.rs index 953b442bb3c..7b8241e9b5b 100644 --- a/src/librustdoc/passes.rs +++ b/src/librustdoc/passes.rs @@ -215,9 +215,9 @@ impl<'a> fold::DocFolder for Stripper<'a> { match i.inner { // emptied modules/impls have no need to exist clean::ModuleItem(ref m) - if m.items.len() == 0 && + if m.items.is_empty() && i.doc_value().is_none() => None, - clean::ImplItem(ref i) if i.items.len() == 0 => None, + clean::ImplItem(ref i) if i.items.is_empty() => None, _ => { self.retained.insert(i.def_id.node); Some(i) diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 94b521a89cf..449f9c79d1d 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -409,7 +409,7 @@ impl Collector { impl DocFolder for Collector { fn fold_item(&mut self, item: clean::Item) -> Option<clean::Item> { let pushed = match item.name { - Some(ref name) if name.len() == 0 => false, + Some(ref name) if name.is_empty() => false, Some(ref name) => { self.names.push(name.to_string()); true } None => false }; diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs index a1fa96322a4..e4f4dbaafbe 100644 --- a/src/librustdoc/visit_ast.rs +++ b/src/librustdoc/visit_ast.rs @@ -175,7 +175,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> { please_inline) }).collect::<Vec<ast::PathListItem>>(); - if mine.len() == 0 { + if mine.is_empty() { None } else { Some(ast::ViewPathList(p, mine)) |
