Skip to content

Commit f9971c5

Browse files
committed
Remove unused feature gates from cg_llvm
Also turns a few `box` into `Box::new`
1 parent 095963f commit f9971c5

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

src/librustc_codegen_llvm/lib.rs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,11 @@
66
77
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
88
#![feature(bool_to_option)]
9-
#![feature(box_patterns)]
10-
#![feature(box_syntax)]
119
#![feature(const_cstr_unchecked)]
1210
#![feature(crate_visibility_modifier)]
1311
#![feature(extern_types)]
1412
#![feature(in_band_lifetimes)]
15-
#![feature(libc)]
1613
#![feature(nll)]
17-
#![feature(optin_builtin_traits)]
18-
#![feature(concat_idents)]
19-
#![feature(link_args)]
20-
#![feature(static_nobundle)]
2114
#![feature(trusted_len)]
2215
#![recursion_limit = "256"]
2316

@@ -196,7 +189,7 @@ unsafe impl Sync for LlvmCodegenBackend {}
196189

197190
impl LlvmCodegenBackend {
198191
pub fn new() -> Box<dyn CodegenBackend> {
199-
box LlvmCodegenBackend(())
192+
Box::new(LlvmCodegenBackend(()))
200193
}
201194
}
202195

@@ -245,7 +238,7 @@ impl CodegenBackend for LlvmCodegenBackend {
245238
}
246239

247240
fn metadata_loader(&self) -> Box<MetadataLoaderDyn> {
248-
box metadata::LlvmMetadataLoader
241+
Box::new(metadata::LlvmMetadataLoader)
249242
}
250243

251244
fn provide(&self, providers: &mut ty::query::Providers<'_>) {
@@ -262,12 +255,12 @@ impl CodegenBackend for LlvmCodegenBackend {
262255
metadata: EncodedMetadata,
263256
need_metadata_module: bool,
264257
) -> Box<dyn Any> {
265-
box rustc_codegen_ssa::base::codegen_crate(
258+
Box::new(rustc_codegen_ssa::base::codegen_crate(
266259
LlvmCodegenBackend(()),
267260
tcx,
268261
metadata,
269262
need_metadata_module,
270-
)
263+
))
271264
}
272265

273266
fn join_codegen(

src/librustc_codegen_llvm/metadata.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl MetadataLoader for LlvmMetadataLoader {
2222
// Use ArchiveRO for speed here, it's backed by LLVM and uses mmap
2323
// internally to read the file. We also avoid even using a memcpy by
2424
// just keeping the archive along while the metadata is in use.
25-
let archive = ArchiveRO::open(filename).map(|ar| OwningRef::new(box ar)).map_err(|e| {
25+
let archive = ArchiveRO::open(filename).map(|ar| OwningRef::new(Box::new(ar))).map_err(|e| {
2626
debug!("llvm didn't like `{}`: {}", filename.display(), e);
2727
format!("failed to read rlib metadata in '{}': {}", filename.display(), e)
2828
})?;
@@ -44,7 +44,7 @@ impl MetadataLoader for LlvmMetadataLoader {
4444
let buf = path_to_c_string(filename);
4545
let mb = llvm::LLVMRustCreateMemoryBufferWithContentsOfFile(buf.as_ptr())
4646
.ok_or_else(|| format!("error reading library: '{}'", filename.display()))?;
47-
let of = ObjectFile::new(mb).map(|of| OwningRef::new(box of)).ok_or_else(|| {
47+
let of = ObjectFile::new(mb).map(|of| OwningRef::new(Box::new(of))).ok_or_else(|| {
4848
format!("provided path not an object file: '{}'", filename.display())
4949
})?;
5050
let buf = of.try_map(|of| search_meta_section(of, target, filename))?;

0 commit comments

Comments
 (0)