Skip to content

Commit 29ac044

Browse files
committed
Positive case of len() -> is_empty()
`s/(?<!\{ self)(?<=\.)len\(\) == 0/is_empty()/g`
1 parent 16e1fce commit 29ac044

Some content is hidden

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

67 files changed

+117
-117
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 {
@@ -1662,7 +1662,7 @@ fn _arm_push_aux_shared_library(config: &Config, testfile: &Path) {
16621662
// codegen tests (vs. clang)
16631663

16641664
fn append_suffix_to_stem(p: &Path, suffix: &str) -> PathBuf {
1665-
if suffix.len() == 0 {
1665+
if suffix.is_empty() {
16661666
p.to_path_buf()
16671667
} else {
16681668
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
@@ -3788,7 +3788,7 @@ its type parameters are types:
37883788

37893789
```ignore
37903790
fn map<A: Clone, B: Clone>(f: |A| -> B, xs: &[A]) -> Vec<B> {
3791-
if xs.len() == 0 {
3791+
if xs.is_empty() {
37923792
return vec![];
37933793
}
37943794
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
@@ -1097,7 +1097,7 @@ impl<K, V> Node<K, V> {
10971097
/// When a node has no keys or values and only a single edge, extract that edge.
10981098
pub fn hoist_lone_child(&mut self) {
10991099
// Necessary for correctness, but in a private module
1100-
debug_assert!(self.len() == 0);
1100+
debug_assert!(self.is_empty());
11011101
debug_assert!(!self.is_leaf());
11021102

11031103
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]
@@ -296,7 +296,7 @@ impl<T> SliceExt for [T] {
296296

297297
#[inline]
298298
fn first_mut(&mut self) -> Option<&mut T> {
299-
if self.len() == 0 { None } else { Some(&mut self[0]) }
299+
if self.is_empty() { None } else { Some(&mut self[0]) }
300300
}
301301

302302
#[inline]
@@ -1306,7 +1306,7 @@ impl<'a, T> Iterator for Chunks<'a, T> {
13061306

13071307
#[inline]
13081308
fn next(&mut self) -> Option<&'a [T]> {
1309-
if self.v.len() == 0 {
1309+
if self.v.is_empty() {
13101310
None
13111311
} else {
13121312
let chunksz = cmp::min(self.v.len(), self.size);
@@ -1318,7 +1318,7 @@ impl<'a, T> Iterator for Chunks<'a, T> {
13181318

13191319
#[inline]
13201320
fn size_hint(&self) -> (usize, Option<usize>) {
1321-
if self.v.len() == 0 {
1321+
if self.v.is_empty() {
13221322
(0, Some(0))
13231323
} else {
13241324
let n = self.v.len() / self.size;
@@ -1333,7 +1333,7 @@ impl<'a, T> Iterator for Chunks<'a, T> {
13331333
impl<'a, T> DoubleEndedIterator for Chunks<'a, T> {
13341334
#[inline]
13351335
fn next_back(&mut self) -> Option<&'a [T]> {
1336-
if self.v.len() == 0 {
1336+
if self.v.is_empty() {
13371337
None
13381338
} else {
13391339
let remainder = self.v.len() % self.size;
@@ -1384,7 +1384,7 @@ impl<'a, T> Iterator for ChunksMut<'a, T> {
13841384

13851385
#[inline]
13861386
fn next(&mut self) -> Option<&'a mut [T]> {
1387-
if self.v.len() == 0 {
1387+
if self.v.is_empty() {
13881388
None
13891389
} else {
13901390
let sz = cmp::min(self.v.len(), self.chunk_size);
@@ -1397,7 +1397,7 @@ impl<'a, T> Iterator for ChunksMut<'a, T> {
13971397

13981398
#[inline]
13991399
fn size_hint(&self) -> (usize, Option<usize>) {
1400-
if self.v.len() == 0 {
1400+
if self.v.is_empty() {
14011401
(0, Some(0))
14021402
} else {
14031403
let n = self.v.len() / self.chunk_size;
@@ -1412,7 +1412,7 @@ impl<'a, T> Iterator for ChunksMut<'a, T> {
14121412
impl<'a, T> DoubleEndedIterator for ChunksMut<'a, T> {
14131413
#[inline]
14141414
fn next_back(&mut self) -> Option<&'a mut [T]> {
1415-
if self.v.len() == 0 {
1415+
if self.v.is_empty() {
14161416
None
14171417
} else {
14181418
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
@@ -1119,7 +1119,7 @@ enum OldSearcher {
11191119
impl OldSearcher {
11201120
#[allow(dead_code)]
11211121
fn new(haystack: &[u8], needle: &[u8]) -> OldSearcher {
1122-
if needle.len() == 0 {
1122+
if needle.is_empty() {
11231123
// Handle specially
11241124
unimplemented!()
11251125
// FIXME: Tune this.

src/libcore/str/pattern.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ fn str_search_step<F, G>(mut m: &mut StrSearcher,
457457
{
458458
if m.state.done() {
459459
SearchStep::Done
460-
} else if m.needle.len() == 0 && m.start <= m.end {
460+
} else if m.needle.is_empty() && m.start <= m.end {
461461
// Case for needle == ""
462462
if let State::Reject(a, b) = m.state.take() {
463463
SearchStep::Reject(a, b)

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
@@ -80,7 +80,7 @@ pub fn validate_crate_name(sess: Option<&Session>, s: &str, sp: Option<Span>) {
8080
(None, Some(sess)) => sess.err(s),
8181
}
8282
};
83-
if s.len() == 0 {
83+
if s.is_empty() {
8484
say("crate name must not be empty");
8585
}
8686
for c in s.chars() {

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)