Skip to content

Commit 74590be

Browse files
committed
s/(?<!\{ self)(?<=\.)len\(\) == 0/is_empty()/g
1 parent 242ed0b commit 74590be

Some content is hidden

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

69 files changed

+119
-119
lines changed

src/compiletest/runtest.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ fn check_debugger_output(debugger_run_result: &ProcRes, check_lines: &[String])
864864
}
865865
first = false;
866866
}
867-
if !failed && rest.len() == 0 {
867+
if !failed && rest.is_empty() {
868868
i += 1;
869869
}
870870
if i == num_check_lines {
@@ -1645,7 +1645,7 @@ fn _arm_push_aux_shared_library(config: &Config, testfile: &Path) {
16451645
// codegen tests (vs. clang)
16461646

16471647
fn append_suffix_to_stem(p: &Path, suffix: &str) -> PathBuf {
1648-
if suffix.len() == 0 {
1648+
if suffix.is_empty() {
16491649
p.to_path_buf()
16501650
} else {
16511651
let mut stem = p.file_stem().unwrap().to_os_string();

src/doc/reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3853,7 +3853,7 @@ its type parameters are types:
38533853

38543854
```ignore
38553855
fn map<A: Clone, B: Clone>(f: |A| -> B, xs: &[A]) -> Vec<B> {
3856-
if xs.len() == 0 {
3856+
if xs.is_empty() {
38573857
return vec![];
38583858
}
38593859
let first: B = f(xs[0].clone());

src/libcollections/btree/map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ mod stack {
692692
// We've reached the root, so no matter what, we're done. We manually
693693
// access the root via the tree itself to avoid creating any dangling
694694
// pointers.
695-
if self.map.root.len() == 0 && !self.map.root.is_leaf() {
695+
if self.map.root.is_empty() && !self.map.root.is_leaf() {
696696
// We've emptied out the root, so make its only child the new root.
697697
// If it's a leaf, we just let it become empty.
698698
self.map.depth -= 1;

src/libcollections/btree/node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ impl<K, V> Node<K, V> {
10951095
/// When a node has no keys or values and only a single edge, extract that edge.
10961096
pub fn hoist_lone_child(&mut self) {
10971097
// Necessary for correctness, but in a private module
1098-
debug_assert!(self.len() == 0);
1098+
debug_assert!(self.is_empty());
10991099
debug_assert!(!self.is_leaf());
11001100

11011101
unsafe {

src/libcore/slice.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ impl<T> SliceExt for [T] {
204204

205205
#[inline]
206206
fn first(&self) -> Option<&T> {
207-
if self.len() == 0 { None } else { Some(&self[0]) }
207+
if self.is_empty() { None } else { Some(&self[0]) }
208208
}
209209

210210
#[inline]
@@ -217,7 +217,7 @@ impl<T> SliceExt for [T] {
217217

218218
#[inline]
219219
fn last(&self) -> Option<&T> {
220-
if self.len() == 0 { None } else { Some(&self[self.len() - 1]) }
220+
if self.is_empty() { None } else { Some(&self[self.len() - 1]) }
221221
}
222222

223223
#[inline]
@@ -311,7 +311,7 @@ impl<T> SliceExt for [T] {
311311

312312
#[inline]
313313
fn first_mut(&mut self) -> Option<&mut T> {
314-
if self.len() == 0 { None } else { Some(&mut self[0]) }
314+
if self.is_empty() { None } else { Some(&mut self[0]) }
315315
}
316316

317317
#[inline]
@@ -1492,7 +1492,7 @@ impl<'a, T> Iterator for Chunks<'a, T> {
14921492

14931493
#[inline]
14941494
fn next(&mut self) -> Option<&'a [T]> {
1495-
if self.v.len() == 0 {
1495+
if self.v.is_empty() {
14961496
None
14971497
} else {
14981498
let chunksz = cmp::min(self.v.len(), self.size);
@@ -1504,7 +1504,7 @@ impl<'a, T> Iterator for Chunks<'a, T> {
15041504

15051505
#[inline]
15061506
fn size_hint(&self) -> (usize, Option<usize>) {
1507-
if self.v.len() == 0 {
1507+
if self.v.is_empty() {
15081508
(0, Some(0))
15091509
} else {
15101510
let n = self.v.len() / self.size;
@@ -1519,7 +1519,7 @@ impl<'a, T> Iterator for Chunks<'a, T> {
15191519
impl<'a, T> DoubleEndedIterator for Chunks<'a, T> {
15201520
#[inline]
15211521
fn next_back(&mut self) -> Option<&'a [T]> {
1522-
if self.v.len() == 0 {
1522+
if self.v.is_empty() {
15231523
None
15241524
} else {
15251525
let remainder = self.v.len() % self.size;
@@ -1570,7 +1570,7 @@ impl<'a, T> Iterator for ChunksMut<'a, T> {
15701570

15711571
#[inline]
15721572
fn next(&mut self) -> Option<&'a mut [T]> {
1573-
if self.v.len() == 0 {
1573+
if self.v.is_empty() {
15741574
None
15751575
} else {
15761576
let sz = cmp::min(self.v.len(), self.chunk_size);
@@ -1583,7 +1583,7 @@ impl<'a, T> Iterator for ChunksMut<'a, T> {
15831583

15841584
#[inline]
15851585
fn size_hint(&self) -> (usize, Option<usize>) {
1586-
if self.v.len() == 0 {
1586+
if self.v.is_empty() {
15871587
(0, Some(0))
15881588
} else {
15891589
let n = self.v.len() / self.chunk_size;
@@ -1598,7 +1598,7 @@ impl<'a, T> Iterator for ChunksMut<'a, T> {
15981598
impl<'a, T> DoubleEndedIterator for ChunksMut<'a, T> {
15991599
#[inline]
16001600
fn next_back(&mut self) -> Option<&'a mut [T]> {
1601-
if self.v.len() == 0 {
1601+
if self.v.is_empty() {
16021602
None
16031603
} else {
16041604
let remainder = self.v.len() % self.chunk_size;

src/libcore/str/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ enum OldSearcher {
10131013
impl OldSearcher {
10141014
#[allow(dead_code)]
10151015
fn new(haystack: &[u8], needle: &[u8]) -> OldSearcher {
1016-
if needle.len() == 0 {
1016+
if needle.is_empty() {
10171017
// Handle specially
10181018
unimplemented!()
10191019
// FIXME: Tune this.

src/libcore/str/pattern.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ fn str_search_step<F, G>(mut m: &mut StrSearcher,
406406
{
407407
if m.done {
408408
SearchStep::Done
409-
} else if m.needle.len() == 0 && m.start <= m.end {
409+
} else if m.needle.is_empty() && m.start <= m.end {
410410
// Case for needle == ""
411411
if m.start == m.end {
412412
m.done = true;

src/liblog/directive.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub fn parse_logging_spec(spec: &str) -> (Vec<LogDirective>, Option<String>) {
4545
return (dirs, None);
4646
}
4747
mods.map(|m| { for s in m.split(',') {
48-
if s.len() == 0 { continue }
48+
if s.is_empty() { continue }
4949
let mut parts = s.split('=');
5050
let (log_level, name) = match (parts.next(), parts.next().map(|s| s.trim()), parts.next()) {
5151
(Some(part0), None, None) => {

src/librustc/metadata/creader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ pub fn validate_crate_name(sess: Option<&Session>, s: &str, sp: Option<Span>) {
8282
(None, Some(sess)) => sess.err(s),
8383
}
8484
};
85-
if s.len() == 0 {
85+
if s.is_empty() {
8686
say("crate name must not be empty", false);
8787
} else if s.contains("-") {
8888
say(&format!("crate names soon cannot contain hyphens: {}", s), true);

src/librustc/metadata/decoder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ pub fn get_enum_variants<'tcx>(intr: Rc<IdentInterner>, cdata: Cmd, id: ast::Nod
767767
get_type(cdata, field_ty.id.node, tcx).ty
768768
})
769769
.collect();
770-
let arg_names = if arg_names.len() == 0 { None } else { Some(arg_names) };
770+
let arg_names = if arg_names.is_empty() { None } else { Some(arg_names) };
771771

772772
(None, arg_tys, arg_names)
773773
}
@@ -1383,7 +1383,7 @@ pub fn get_dylib_dependency_formats(cdata: Cmd)
13831383

13841384
debug!("found dylib deps: {}", formats.as_str_slice());
13851385
for spec in formats.as_str_slice().split(',') {
1386-
if spec.len() == 0 { continue }
1386+
if spec.is_empty() { continue }
13871387
let cnum = spec.split(':').nth(0).unwrap();
13881388
let link = spec.split(':').nth(1).unwrap();
13891389
let cnum: ast::CrateNum = cnum.parse().unwrap();

0 commit comments

Comments
 (0)