Skip to content

Commit 27e9cfc

Browse files
committed
Rustup to rustc 1.35.0-nightly (9d71ec135 2019-03-10)
1 parent 14d66b2 commit 27e9cfc

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/lib.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ use std::sync::mpsc;
2222
use rustc::dep_graph::DepGraph;
2323
use rustc::middle::cstore::MetadataLoader;
2424
use rustc::mir::mono::{Linkage as RLinkage, Visibility};
25-
use rustc::session::{
26-
config::{DebugInfo, OutputFilenames, OutputType},
27-
CompileIncomplete,
28-
};
25+
use rustc::session::config::{DebugInfo, OutputFilenames, OutputType};
2926
use rustc::ty::query::Providers;
27+
use rustc::util::common::ErrorReported;
3028
use rustc_codegen_ssa::back::linker::LinkerInfo;
3129
use rustc_codegen_ssa::CrateInfo;
3230
use rustc_codegen_utils::codegen_backend::CodegenBackend;
@@ -157,7 +155,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
157155
match *cty {
158156
CrateType::Rlib | CrateType::Dylib | CrateType::Executable => {}
159157
_ => {
160-
sess.err(&format!(
158+
sess.warn(&format!(
161159
"Rustc codegen cranelift doesn't support output type {}",
162160
cty
163161
));
@@ -365,7 +363,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
365363
sess: &Session,
366364
_dep_graph: &DepGraph,
367365
outputs: &OutputFilenames,
368-
) -> Result<(), CompileIncomplete> {
366+
) -> Result<(), ErrorReported> {
369367
let res = *res
370368
.downcast::<CodegenResults>()
371369
.expect("Expected CraneliftCodegenBackend's CodegenResult, found Box<Any>");

0 commit comments

Comments
 (0)