Update Cargo.lock and rustup to rustc 1.30.0-nightly (73c78734b 2018-08-05)

This commit is contained in:
bjorn3
2018-08-07 16:34:45 +02:00
parent 0df01fb503
commit e0b1176ae5
2 changed files with 95 additions and 115 deletions

View File

@@ -156,9 +156,9 @@ impl CodegenBackend for CraneliftCodegenBackend {
fn init(&self, sess: &Session) {
for cty in sess.opts.crate_types.iter() {
match *cty {
CrateType::CrateTypeRlib
| CrateType::CrateTypeDylib
| CrateType::CrateTypeExecutable => {}
CrateType::Rlib
| CrateType::Dylib
| CrateType::Executable => {}
_ => {
sess.parse_sess.span_diagnostic.warn(&format!(
"LLVM unsupported, so output type {} is not supported",
@@ -332,8 +332,8 @@ impl CodegenBackend for CraneliftCodegenBackend {
).unwrap();
for &crate_type in sess.opts.crate_types.iter() {
if crate_type != CrateType::CrateTypeRlib
/*&& crate_type != CrateType::CrateTypeDylib*/
if crate_type != CrateType::Rlib
/*&& crate_type != CrateType::Dylib*/
{
sess.fatal(&format!("Unsupported crate type: {:?}", crate_type));
}
@@ -354,8 +354,8 @@ impl CodegenBackend for CraneliftCodegenBackend {
}
sess.abort_if_errors();
if !sess.opts.crate_types.contains(&CrateType::CrateTypeRlib)
&& !sess.opts.crate_types.contains(&CrateType::CrateTypeDylib)
if !sess.opts.crate_types.contains(&CrateType::Rlib)
&& !sess.opts.crate_types.contains(&CrateType::Dylib)
{
sess.fatal("Executables are not supported by the metadata-only backend.");
}