nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 07:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rustup to rustc 1.45.0-nightly (7ced01a73 2020-04-30)

Browse Source
This commit is contained in:
bjorn3 2020-05-01 17:51:51 +02:00
parent 9fb167e711
commit 485e52e153
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-toolchain
View File

@ -1 +1 @@
nightly-2020-04-30
nightly-2020-05-01

6
src/archive.rs
View File

@ -4,7 +4,7 @@ use std::path::{Path, PathBuf};
use crate::prelude::*;
use rustc_codegen_ssa::back::archive::{find_library, ArchiveBuilder};
use rustc_codegen_ssa::{METADATA_FILENAME, RLIB_BYTECODE_EXTENSION};
use rustc_codegen_ssa::METADATA_FILENAME;
struct ArchiveConfig<'a> {
sess: &'a Session,
@ -116,8 +116,8 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
let obj_start = name.to_owned();
self.add_archive(rlib.to_owned(), move |fname: &str| {
// Ignore bytecode/metadata files, no matter the name.
if fname.ends_with(RLIB_BYTECODE_EXTENSION) || fname == METADATA_FILENAME {
// Ignore metadata files, no matter the name.
if fname == METADATA_FILENAME {
return true;
}

5
src/driver/aot.rs
View File

@ -64,7 +64,6 @@ fn emit_module<B: Backend>(
kind,
object: Some(tmp_file),
bytecode: None,
bytecode_compressed: None,
},
work_product,
)
@ -85,7 +84,7 @@ fn reuse_workproduct_for_cgu(
object = Some(path.clone());
path
}
WorkProductFileKind::Bytecode | WorkProductFileKind::BytecodeCompressed => {
WorkProductFileKind::Bytecode => {
panic!("cg_clif doesn't use bytecode");
}
};
@ -107,7 +106,6 @@ fn reuse_workproduct_for_cgu(
kind: ModuleKind::Regular,
object,
bytecode: None,
bytecode_compressed: None,
}
}
@ -239,7 +237,6 @@ pub(super) fn run_aot(
kind: ModuleKind::Metadata,
object: Some(tmp_file),
bytecode: None,
bytecode_compressed: None,
})
} else {
None