diff options
| author | bors <bors@rust-lang.org> | 2019-11-21 14:30:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-21 14:30:02 +0000 |
| commit | 35ef33a89dfd8ff8c8a7b3c58fa7136bbcb2f1ed (patch) | |
| tree | 198a52d838a5a90eee1de769a634e6e19c077914 /src/librustc_codegen_ssa/traits | |
| parent | f1b882b55805c342e46ee4ca3beeef1d1fa2044b (diff) | |
| parent | 5ab2bccbcdd48c7055eb77e348486d0bda283a1f (diff) | |
| download | rust-35ef33a89dfd8ff8c8a7b3c58fa7136bbcb2f1ed.tar.gz rust-35ef33a89dfd8ff8c8a7b3c58fa7136bbcb2f1ed.zip | |
Auto merge of #66607 - Centril:rollup-yb7cl73, r=Centril
Rollup of 5 pull requests Successful merges: - #65355 (Stabilize `!` in Rust 1.41.0) - #65730 (Suggest to add lifetime constraint at explicit ouput of functions) - #66468 (Cleanup Miri SIMD intrinsics) - #66515 (Reduce size of `hir::Expr` by boxing more of `hir::InlineAsm`) - #66602 (Revert "Update Source Code Pro and include italics") Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_ssa/traits')
| -rw-r--r-- | src/librustc_codegen_ssa/traits/asm.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_ssa/traits/asm.rs b/src/librustc_codegen_ssa/traits/asm.rs index c9e1ed86e97..612bce2d958 100644 --- a/src/librustc_codegen_ssa/traits/asm.rs +++ b/src/librustc_codegen_ssa/traits/asm.rs @@ -1,13 +1,13 @@ use super::BackendTypes; use crate::mir::place::PlaceRef; -use rustc::hir::{GlobalAsm, InlineAsm}; +use rustc::hir::{GlobalAsm, InlineAsmInner}; use syntax_pos::Span; pub trait AsmBuilderMethods<'tcx>: BackendTypes { /// Take an inline assembly expression and splat it out via LLVM fn codegen_inline_asm( &mut self, - ia: &InlineAsm, + ia: &InlineAsmInner, outputs: Vec<PlaceRef<'tcx, Self::Value>>, inputs: Vec<Self::Value>, span: Span, |