diff options
| author | bors <bors@rust-lang.org> | 2023-01-27 17:49:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-27 17:49:56 +0000 |
| commit | ef982929c0b653436a6ea6892a2a839fba7c8b57 (patch) | |
| tree | 6902983da8c04d8a2ffd9779c84a1ea89f78366f /compiler/rustc_codegen_llvm/src | |
| parent | 7919ef0ec5776c72dace7fec1c68551a617505ad (diff) | |
| parent | c64f4c41f76581807bf7e063ded17f7da51b4478 (diff) | |
| download | rust-ef982929c0b653436a6ea6892a2a839fba7c8b57.tar.gz rust-ef982929c0b653436a6ea6892a2a839fba7c8b57.zip | |
Auto merge of #107372 - JohnTitor:rollup-zkl2ges, r=JohnTitor
Rollup of 9 pull requests Successful merges: - #106806 (Replace format flags u32 by enums and bools.) - #107194 (Remove dependency on slice_internals feature in rustc_ast) - #107234 (Revisit fix_is_ci_llvm_available logic) - #107316 (Update snap from `1.0.1` to `1.1.0`) - #107321 (solver comments + remove `TyCtxt::evaluate_goal`) - #107332 (Fix wording from `rustbuild` to `bootstrap`) - #107347 (reduce rightward-drift) - #107352 (compiler: Fix E0587 explanation) - #107357 (Fix infinite loop in rustdoc get_all_import_attributes function) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs b/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs index d9a73c7a5c9..240a9d2f371 100644 --- a/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs +++ b/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs @@ -295,9 +295,8 @@ fn add_unused_functions(cx: &CodegenCx<'_, '_>) { DefKind::Fn | DefKind::AssocFn | DefKind::Closure | DefKind::Generator ) { return None; - } else if ignore_unused_generics - && tcx.generics_of(def_id).requires_monomorphization(tcx) - { + } + if ignore_unused_generics && tcx.generics_of(def_id).requires_monomorphization(tcx) { return None; } Some(local_def_id.to_def_id()) |