diff options
| author | Hans Kratz <hans@appfour.com> | 2021-08-09 15:42:37 +0000 |
|---|---|---|
| committer | Hans Kratz <hans@appfour.com> | 2021-08-09 15:42:37 +0000 |
| commit | 02295f464aaf78ece81a80e5b99a034119e74748 (patch) | |
| tree | 211b39883e066ed18521fc97f517fc5d09b23926 /compiler/rustc_codegen_llvm/src | |
| parent | 1d4972e0e923bd5fffb11465373c824be109375f (diff) | |
| download | rust-02295f464aaf78ece81a80e5b99a034119e74748.tar.gz rust-02295f464aaf78ece81a80e5b99a034119e74748.zip | |
Test: Use smallvec directly instead of boxed.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/type_of.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index 225514ea863..5a8aa66c611 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -103,7 +103,7 @@ pub struct TypeLowering<'ll> { /// If padding is used the slice maps fields from source order /// to llvm order. - pub field_remapping: Option<Box<SmallVec<[u32; 4]>>>, + pub field_remapping: Option<SmallVec<[u32; 4]>>, } fn to_llvm_tls_model(tls_model: TlsModel) -> llvm::ThreadLocalMode { diff --git a/compiler/rustc_codegen_llvm/src/type_of.rs b/compiler/rustc_codegen_llvm/src/type_of.rs index 180da1a6046..85efe3e6483 100644 --- a/compiler/rustc_codegen_llvm/src/type_of.rs +++ b/compiler/rustc_codegen_llvm/src/type_of.rs @@ -19,7 +19,7 @@ fn uncached_llvm_type<'a, 'tcx>( cx: &CodegenCx<'a, 'tcx>, layout: TyAndLayout<'tcx>, defer: &mut Option<(&'a Type, TyAndLayout<'tcx>)>, - field_remapping: &mut Option<Box<SmallVec<[u32; 4]>>>, + field_remapping: &mut Option<SmallVec<[u32; 4]>>, ) -> &'a Type { match layout.abi { Abi::Scalar(_) => bug!("handled elsewhere"), @@ -94,7 +94,7 @@ fn uncached_llvm_type<'a, 'tcx>( fn struct_llfields<'a, 'tcx>( cx: &CodegenCx<'a, 'tcx>, layout: TyAndLayout<'tcx>, -) -> (Vec<&'a Type>, bool, Option<Box<SmallVec<[u32; 4]>>>) { +) -> (Vec<&'a Type>, bool, Option<SmallVec<[u32; 4]>>) { debug!("struct_llfields: {:#?}", layout); let field_count = layout.fields.count(); @@ -150,7 +150,7 @@ fn struct_llfields<'a, 'tcx>( } else { debug!("struct_llfields: offset: {:?} stride: {:?}", offset, layout.size); } - let field_remapping = if padding_used { Some(Box::new(field_remapping)) } else { None }; + let field_remapping = if padding_used { Some(field_remapping) } else { None }; (result, packed, field_remapping) } |
