Auto merge of #61421 - vorner:string-in-rc-into-raw-docs, r=RalfJung

[rust.git] / src / librustc_codegen_llvm / type_.rs

diff --git a/src/librustc_codegen_llvm/type_.rs b/src/librustc_codegen_llvm/type_.rs
index a5ed64a66a39da1ebdf3fce19c258a8559516b04..2c167256ad56c5280ff2887cede1e6f6b8a0e1d7 100644 (file)
--- a/src/librustc_codegen_llvm/type_.rs
+++ b/src/librustc_codegen_llvm/type_.rs
@@ -10,7 +10,7 @@
 
 use crate::common;
 use crate::type_of::LayoutLlvmExt;
-use crate::abi::{LlvmType, FnTypeExt};
+use crate::abi::{LlvmType, FnTypeLlvmExt};
 use syntax::ast;
 use rustc::ty::Ty;
 use rustc::ty::layout::{self, Align, Size, TyLayout};
@@ -327,7 +327,7 @@ fn is_backend_scalar_pair(&self, layout: TyLayout<'tcx>) -> bool {
     fn backend_field_index(&self, layout: TyLayout<'tcx>, index: usize) -> u64 {
         layout.llvm_field_index(index)
     }
-    fn scalar_pair_element_backend_type<'a>(
+    fn scalar_pair_element_backend_type(
         &self,
         layout: TyLayout<'tcx>,
         index: usize,