rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove unnecessary channel

Browse Source
This commit is contained in:
Mark Rousskov
2019-08-10 17:16:01 -04:00
parent eea2f879af
commit ade8b02828
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustdoc/lib.rs
View File

@@ -44,7 +44,6 @@ use std::default::Default;
use std::env; use std::env;
use std::panic; use std::panic;
use std::process; use std::process;
use std::sync::mpsc::channel;
use rustc::session::{early_warn, early_error}; use rustc::session::{early_warn, early_error};
use rustc::session::config::{ErrorOutputType, RustcOptGroup}; use rustc::session::config::{ErrorOutputType, RustcOptGroup};
@@ -452,8 +451,6 @@ where R: 'static + Send,
// First, parse the crate and extract all relevant information. // First, parse the crate and extract all relevant information.
info!("starting to run rustc"); info!("starting to run rustc");
let (tx, rx) = channel();
let result = rustc_driver::report_ices_to_stderr_if_any(move || { let result = rustc_driver::report_ices_to_stderr_if_any(move || {
let crate_name = options.crate_name.clone(); let crate_name = options.crate_name.clone();
let crate_version = options.crate_version.clone(); let crate_version = options.crate_version.clone();
@@ -467,15 +464,15 @@ where R: 'static + Send,
krate.version = crate_version; krate.version = crate_version;
tx.send(f(Output { f(Output {
krate: krate, krate: krate,
renderinfo: renderinfo, renderinfo: renderinfo,
renderopts, renderopts,
})).unwrap(); })
}); });
match result { match result {
Ok(()) => rx.recv().unwrap(), Ok(output) => output,
Err(_) => panic::resume_unwind(Box::new(errors::FatalErrorMarker)), Err(_) => panic::resume_unwind(Box::new(errors::FatalErrorMarker)),
} }
} }