diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-02-29 02:16:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 02:16:21 +0100 |
| commit | c8db7dcc1cd91366dda9bea92e38b5d215ede1f1 (patch) | |
| tree | 30b13312973df647f11481151c9fc7bea077479a /src/librustc_codegen_llvm | |
| parent | ba2df27525ab535aa600cd25fda4aa7f0f13a2aa (diff) | |
| parent | 1622b6ef7372c40381914facf8794d851fcd9eb1 (diff) | |
| download | rust-c8db7dcc1cd91366dda9bea92e38b5d215ede1f1.tar.gz rust-c8db7dcc1cd91366dda9bea92e38b5d215ede1f1.zip | |
Rollup merge of #69551 - matthiaskrgr:len_zero, r=Mark-Simulacrum
use is_empty() instead of len() == x to determine if structs are empty.
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/back/lto.rs | 2 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/llvm_util.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/back/lto.rs b/src/librustc_codegen_llvm/back/lto.rs index 6b136aeb8d9..a39c25f6693 100644 --- a/src/librustc_codegen_llvm/back/lto.rs +++ b/src/librustc_codegen_llvm/back/lto.rs @@ -237,7 +237,7 @@ fn fat_lto( let module: ModuleCodegen<ModuleLlvm> = match costliest_module { Some((_cost, i)) => in_memory.remove(i), None => { - assert!(serialized_modules.len() > 0, "must have at least one serialized module"); + assert!(!serialized_modules.is_empty(), "must have at least one serialized module"); let (buffer, name) = serialized_modules.remove(0); info!("no in-memory regular modules to choose from, parsing {:?}", name); ModuleCodegen { diff --git a/src/librustc_codegen_llvm/llvm_util.rs b/src/librustc_codegen_llvm/llvm_util.rs index 6d3498f8b80..0081a75a4da 100644 --- a/src/librustc_codegen_llvm/llvm_util.rs +++ b/src/librustc_codegen_llvm/llvm_util.rs @@ -61,7 +61,7 @@ unsafe fn configure_llvm(sess: &Session) { let sess_args = cg_opts.chain(tg_opts); let user_specified_args: FxHashSet<_> = - sess_args.clone().map(|s| llvm_arg_to_arg_name(s)).filter(|s| s.len() > 0).collect(); + sess_args.clone().map(|s| llvm_arg_to_arg_name(s)).filter(|s| !s.is_empty()).collect(); { // This adds the given argument to LLVM. Unless `force` is true |
