diff options
| author | bors <bors@rust-lang.org> | 2020-11-23 16:33:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-23 16:33:03 +0000 |
| commit | 40624dde6cdfad2576b4d795c97583188a814884 (patch) | |
| tree | 7994ac92e4e2b85ce96de1512eef29e96bfab33d /compiler/rustc_codegen_llvm/src | |
| parent | 40cf72108edb9b8633a9d284b238988309204494 (diff) | |
| parent | ea3c269b70ea9dd77453ab13b9cfec0f4e1df899 (diff) | |
| download | rust-40624dde6cdfad2576b4d795c97583188a814884.tar.gz rust-40624dde6cdfad2576b4d795c97583188a814884.zip | |
Auto merge of #79345 - jonas-schievink:rollup-1yhhzx9, r=jonas-schievink
Rollup of 10 pull requests Successful merges: - #76829 (stabilize const_int_pow) - #79080 (MIR visitor: Don't treat debuginfo field access as a use of the struct) - #79236 (const_generics: assert resolve hack causes an error) - #79287 (Allow using generic trait methods in `const fn`) - #79324 (Use Option::and_then instead of open-coding it) - #79325 (Reduce boilerplate with the `?` operator) - #79330 (Fix typo in comment) - #79333 (doc typo) - #79337 (Use Option::map instead of open coding it) - #79343 (Add my (`@flip1995)` work mail to the mailmap) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs index 5e8ff14f0aa..96484034da7 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs @@ -1152,10 +1152,7 @@ impl<'ll> MemberDescription<'ll> { self.size.bits(), self.align.bits() as u32, self.offset.bits(), - match self.discriminant { - None => None, - Some(value) => Some(cx.const_u64(value)), - }, + self.discriminant.map(|v| cx.const_u64(v)), self.flags, self.type_metadata, ) |