diff --git a/compiler/rustc_codegen_llvm/src/abi.rs b/compiler/rustc_codegen_llvm/src/abi.rs index 8e5904a54f8..f8f6956c47e 100644 --- a/compiler/rustc_codegen_llvm/src/abi.rs +++ b/compiler/rustc_codegen_llvm/src/abi.rs @@ -51,13 +51,10 @@ const OPTIMIZATION_ATTRIBUTES: [(ArgAttribute, llvm::AttributeKind); 5] = [ (ArgAttribute::NoUndef, llvm::AttributeKind::NoUndef), ]; -fn get_attrs<'ll>( - this: &ArgAttributes, - cx: &CodegenCx<'ll, '_>, -) -> SmallVec> { +fn get_attrs<'ll>(this: &ArgAttributes, cx: &CodegenCx<'ll, '_>) -> SmallVec<[&'ll Attribute; 8]> { let mut regular = this.regular; - let mut attrs = SmallVec::<[_; 8]>::new(); + let mut attrs = SmallVec::new(); // ABI-affecting attributes must always be applied for (attr, llattr) in ABI_AFFECTING_ATTRIBUTES { diff --git a/compiler/rustc_codegen_llvm/src/attributes.rs b/compiler/rustc_codegen_llvm/src/attributes.rs index bc67ab17703..13a41388f5e 100644 --- a/compiler/rustc_codegen_llvm/src/attributes.rs +++ b/compiler/rustc_codegen_llvm/src/attributes.rs @@ -62,8 +62,8 @@ fn inline_attr<'ll>(cx: &CodegenCx<'ll, '_>, inline: InlineAttr) -> Option<&'ll pub fn sanitize_attrs<'ll>( cx: &CodegenCx<'ll, '_>, no_sanitize: SanitizerSet, -) -> SmallVec> { - let mut attrs = SmallVec::<[_; 4]>::new(); +) -> SmallVec<[&'ll Attribute; 4]> { + let mut attrs = SmallVec::new(); let enabled = cx.tcx.sess.opts.debugging_opts.sanitizer - no_sanitize; if enabled.contains(SanitizerSet::ADDRESS) { attrs.push(llvm::AttributeKind::SanitizeAddress.create_attr(cx.llcx)); @@ -224,12 +224,12 @@ pub(crate) fn default_optimisation_attrs<'ll>( cx: &CodegenCx<'ll, '_>, ) -> ( // Attributes to remove - SmallVec>, + SmallVec<[AttributeKind; 3]>, // Attributes to add - SmallVec>, + SmallVec<[&'ll Attribute; 2]>, ) { - let mut to_remove = SmallVec::<[_; 3]>::new(); - let mut to_add = SmallVec::<[_; 2]>::new(); + let mut to_remove = SmallVec::new(); + let mut to_add = SmallVec::new(); match cx.sess().opts.optimize { OptLevel::Size => { to_remove.push(llvm::AttributeKind::MinSize);