Skip to content

Commit 10f15e7

Browse files
committed
Negative case of len() -> is_empty()
`s/([^\(\s]+\.)len\(\) [(?:!=)>] 0/!$1is_empty()/g`
1 parent 29ac044 commit 10f15e7

File tree

61 files changed

+142
-142
lines changed

Some content is hidden

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

61 files changed

+142
-142
lines changed

src/compiletest/compiletest.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ pub fn make_metrics_test_closure(config: &Config, testfile: &Path) -> test::Test
368368
fn extract_gdb_version(full_version_line: Option<String>) -> Option<String> {
369369
match full_version_line {
370370
Some(ref full_version_line)
371-
if full_version_line.trim().len() > 0 => {
371+
if !full_version_line.trim().is_empty() => {
372372
let full_version_line = full_version_line.trim();
373373

374374
// used to be a regex "(^|[^0-9])([0-9]\.[0-9])([^0-9]|$)"
@@ -408,7 +408,7 @@ fn extract_lldb_version(full_version_line: Option<String>) -> Option<String> {
408408

409409
match full_version_line {
410410
Some(ref full_version_line)
411-
if full_version_line.trim().len() > 0 => {
411+
if !full_version_line.trim().is_empty() => {
412412
let full_version_line = full_version_line.trim();
413413

414414
for (pos, l) in full_version_line.char_indices() {
@@ -426,7 +426,7 @@ fn extract_lldb_version(full_version_line: Option<String>) -> Option<String> {
426426
let vers = full_version_line[pos + 5..].chars().take_while(|c| {
427427
c.is_digit(10)
428428
}).collect::<String>();
429-
if vers.len() > 0 { return Some(vers) }
429+
if !vers.is_empty() { return Some(vers) }
430430
}
431431
println!("Could not extract LLDB version from line '{}'",
432432
full_version_line);

src/libcollections/btree/node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ impl<K, V> Node<K, V> {
12251225
/// because we have one too many, and our parent now has one too few
12261226
fn split(&mut self) -> (K, V, Node<K, V>) {
12271227
// Necessary for correctness, but in a private function
1228-
debug_assert!(self.len() > 0);
1228+
debug_assert!(!self.is_empty());
12291229

12301230
let mut right = if self.is_leaf() {
12311231
Node::new_leaf(self.capacity())

src/libcore/char.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ impl CharExt for char {
227227
#[inline]
228228
pub fn encode_utf8_raw(code: u32, dst: &mut [u8]) -> Option<usize> {
229229
// Marked #[inline] to allow llvm optimizing it away
230-
if code < MAX_ONE_B && dst.len() >= 1 {
230+
if code < MAX_ONE_B && !dst.is_empty() {
231231
dst[0] = code as u8;
232232
Some(1)
233233
} else if code < MAX_TWO_B && dst.len() >= 2 {
@@ -258,7 +258,7 @@ pub fn encode_utf8_raw(code: u32, dst: &mut [u8]) -> Option<usize> {
258258
#[inline]
259259
pub fn encode_utf16_raw(mut ch: u32, dst: &mut [u16]) -> Option<usize> {
260260
// Marked #[inline] to allow llvm optimizing it away
261-
if (ch & 0xFFFF) == ch && dst.len() >= 1 {
261+
if (ch & 0xFFFF) == ch && !dst.is_empty() {
262262
// The BMP falls through (assuming non-surrogate, as it should)
263263
dst[0] = ch as u16;
264264
Some(1)

src/libfmt_macros/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ impl<'a> Parser<'a> {
371371
None => {
372372
let tmp = self.cur.clone();
373373
match self.word() {
374-
word if word.len() > 0 => {
374+
word if !word.is_empty() => {
375375
if self.consume('$') {
376376
CountIsName(word)
377377
} else {
@@ -463,7 +463,7 @@ mod tests {
463463
fn musterr(s: &str) {
464464
let mut p = Parser::new(s);
465465
p.next();
466-
assert!(p.errors.len() != 0);
466+
assert!(!p.errors.is_empty());
467467
}
468468

469469
#[test]

src/libgetopts/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ fn format_option(opt: &OptGroup) -> String {
804804
}
805805

806806
// Use short_name is possible, but fallback to long_name.
807-
if opt.short_name.len() > 0 {
807+
if !opt.short_name.is_empty() {
808808
line.push('-');
809809
line.push_str(&opt.short_name[..]);
810810
} else {

src/librustc/metadata/encoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ fn each_auxiliary_node_id<F>(item: &ast::Item, callback: F) -> bool where
469469
ast::ItemStruct(ref struct_def, _) => {
470470
// If this is a newtype struct, return the constructor.
471471
match struct_def.ctor_id {
472-
Some(ctor_id) if struct_def.fields.len() > 0 &&
472+
Some(ctor_id) if !struct_def.fields.is_empty() &&
473473
struct_def.fields[0].node.kind.is_unnamed() => {
474474
continue_ = callback(ctor_id);
475475
}

src/librustc/metadata/loader.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,13 @@ impl<'a> Context<'a> {
307307
}
308308

309309
pub fn report_load_errs(&mut self) {
310-
let message = if self.rejected_via_hash.len() > 0 {
310+
let message = if !self.rejected_via_hash.is_empty() {
311311
format!("found possibly newer version of crate `{}`",
312312
self.ident)
313-
} else if self.rejected_via_triple.len() > 0 {
313+
} else if !self.rejected_via_triple.is_empty() {
314314
format!("couldn't find crate `{}` with expected target triple {}",
315315
self.ident, self.triple)
316-
} else if self.rejected_via_kind.len() > 0 {
316+
} else if !self.rejected_via_kind.is_empty() {
317317
format!("found staticlib `{}` instead of rlib or dylib", self.ident)
318318
} else {
319319
format!("can't find crate for `{}`", self.ident)
@@ -325,15 +325,15 @@ impl<'a> Context<'a> {
325325
};
326326
self.sess.span_err(self.span, &message[..]);
327327

328-
if self.rejected_via_triple.len() > 0 {
328+
if !self.rejected_via_triple.is_empty() {
329329
let mismatches = self.rejected_via_triple.iter();
330330
for (i, &CrateMismatch{ ref path, ref got }) in mismatches.enumerate() {
331331
self.sess.fileline_note(self.span,
332332
&format!("crate `{}`, path #{}, triple {}: {}",
333333
self.ident, i+1, got, path.display()));
334334
}
335335
}
336-
if self.rejected_via_hash.len() > 0 {
336+
if !self.rejected_via_hash.is_empty() {
337337
self.sess.span_note(self.span, "perhaps this crate needs \
338338
to be recompiled?");
339339
let mismatches = self.rejected_via_hash.iter();
@@ -353,7 +353,7 @@ impl<'a> Context<'a> {
353353
}
354354
}
355355
}
356-
if self.rejected_via_kind.len() > 0 {
356+
if !self.rejected_via_kind.is_empty() {
357357
self.sess.fileline_help(self.span, "please recompile this crate using \
358358
--crate-type lib");
359359
let mismatches = self.rejected_via_kind.iter();

src/librustc/middle/dead.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ impl<'a, 'tcx> MarkSymbolVisitor<'a, 'tcx> {
182182

183183
fn mark_live_symbols(&mut self) {
184184
let mut scanned = HashSet::new();
185-
while self.worklist.len() > 0 {
185+
while !self.worklist.is_empty() {
186186
let id = self.worklist.pop().unwrap();
187187
if scanned.contains(&id) {
188188
continue

src/librustc/middle/infer/error_reporting.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ impl<'a, 'tcx> Rebuilder<'a, 'tcx> {
966966
fn pick_lifetime(&self,
967967
region_names: &HashSet<ast::Name>)
968968
-> (ast::Lifetime, FreshOrKept) {
969-
if region_names.len() > 0 {
969+
if !region_names.is_empty() {
970970
// It's not necessary to convert the set of region names to a
971971
// vector of string and then sort them. However, it makes the
972972
// choice of lifetime name deterministic and thus easier to test.

src/librustc/middle/infer/region_inference/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ impl<'a, 'tcx> RegionVarBindings<'a, 'tcx> {
246246
}
247247

248248
fn in_snapshot(&self) -> bool {
249-
self.undo_log.borrow().len() > 0
249+
!self.undo_log.borrow().is_empty()
250250
}
251251

252252
pub fn start_snapshot(&self) -> RegionSnapshot {

0 commit comments

Comments
 (0)