diff options
| author | bors <bors@rust-lang.org> | 2019-05-28 17:38:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-28 17:38:01 +0000 |
| commit | 721268583759224d0f6476e0b8b196cc8afbdea0 (patch) | |
| tree | 0a5675a306b09a5e80f121006f409095f97305dd /src/librustc_codegen_utils | |
| parent | a6ce9b312354cadb046be40398b7e28b616bad28 (diff) | |
| parent | e06547fe8db5e9596de780197c7bcba09b3c9039 (diff) | |
| download | rust-721268583759224d0f6476e0b8b196cc8afbdea0.tar.gz rust-721268583759224d0f6476e0b8b196cc8afbdea0.zip | |
Auto merge of #61274 - Centril:rollup-23dekk4, r=Centril
Rollup of 4 pull requests Successful merges: - #61123 (Allow to specify profiling data output directory as -Zself-profile argument.) - #61159 (split core::ptr module into multiple files) - #61164 (rename Scalar::Bits to Scalar::Raw and bits field to data) - #61250 (Remove special case for *ios* builds in run-make-fulldeps/print-target-list Makefile) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_utils')
| -rw-r--r-- | src/librustc_codegen_utils/symbol_names.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_utils/symbol_names.rs b/src/librustc_codegen_utils/symbol_names.rs index 86407162907..bf81b7f0da5 100644 --- a/src/librustc_codegen_utils/symbol_names.rs +++ b/src/librustc_codegen_utils/symbol_names.rs @@ -443,7 +443,7 @@ impl Printer<'tcx, 'tcx> for SymbolPrinter<'_, 'tcx> { ct: &'tcx ty::Const<'tcx>, ) -> Result<Self::Const, Self::Error> { // only print integers - if let ConstValue::Scalar(Scalar::Bits { .. }) = ct.val { + if let ConstValue::Scalar(Scalar::Raw { .. }) = ct.val { if ct.ty.is_integral() { return self.pretty_print_const(ct); } |