diff --git a/src/librustc_trans/back/write.rs b/src/librustc_trans/back/write.rs index 6c12a4989f5b2..f792da01cde89 100644 --- a/src/librustc_trans/back/write.rs +++ b/src/librustc_trans/back/write.rs @@ -341,7 +341,7 @@ pub struct CodegenContext { // compiling incrementally pub incr_comp_session_dir: Option, // Channel back to the main control thread to send messages to - pub coordinator_send: Sender, + coordinator_send: Sender, } impl CodegenContext { @@ -660,17 +660,17 @@ fn need_crate_bitcode_for_rlib(sess: &Session) -> bool { sess.opts.output_types.contains_key(&OutputType::Exe) } -pub fn run_passes(sess: &Session, - crate_output: &OutputFilenames, - crate_name: Symbol, - link: LinkMeta, - metadata: EncodedMetadata, - exported_symbols: Arc, - no_builtins: bool, - windows_subsystem: Option, - linker_info: LinkerInfo, - no_integrated_as: bool) - -> OngoingCrateTranslation { +pub fn start_async_translation(sess: &Session, + crate_output: &OutputFilenames, + crate_name: Symbol, + link: LinkMeta, + metadata: EncodedMetadata, + exported_symbols: Arc, + no_builtins: bool, + windows_subsystem: Option, + linker_info: LinkerInfo, + no_integrated_as: bool) + -> OngoingCrateTranslation { let output_types_override = if no_integrated_as { OutputTypes::new(&[(OutputType::Assembly, None)]) } else { @@ -1061,7 +1061,7 @@ fn execute_work_item(cgcx: &CodegenContext, work_item: WorkItem) } #[derive(Debug)] -pub enum Message { +enum Message { Token(io::Result), Done { result: Result }, WorkItem(WorkItem), @@ -1069,8 +1069,7 @@ pub enum Message { TranslationDone, } - -pub struct Diagnostic { +struct Diagnostic { msg: String, code: Option, lvl: Level, @@ -1519,14 +1518,14 @@ impl SharedEmitterMain { } pub struct OngoingCrateTranslation { - pub crate_name: Symbol, - pub link: LinkMeta, - pub metadata: EncodedMetadata, - pub exported_symbols: Arc, - pub no_builtins: bool, - pub windows_subsystem: Option, - pub linker_info: LinkerInfo, - pub no_integrated_as: bool, + crate_name: Symbol, + link: LinkMeta, + metadata: EncodedMetadata, + exported_symbols: Arc, + no_builtins: bool, + windows_subsystem: Option, + linker_info: LinkerInfo, + no_integrated_as: bool, output_filenames: OutputFilenames, regular_module_config: ModuleConfig, diff --git a/src/librustc_trans/base.rs b/src/librustc_trans/base.rs index 0137fa086932c..2e6093eb1ca37 100644 --- a/src/librustc_trans/base.rs +++ b/src/librustc_trans/base.rs @@ -962,7 +962,7 @@ pub fn trans_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, !tcx.sess.opts.output_types.should_trans() { let empty_exported_symbols = ExportedSymbols::empty(); let linker_info = LinkerInfo::new(&shared_ccx, &empty_exported_symbols); - let ongoing_translation = write::run_passes( + let ongoing_translation = write::start_async_translation( tcx.sess, output_filenames, tcx.crate_name(LOCAL_CRATE), @@ -1012,7 +1012,7 @@ pub fn trans_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, (output_filenames.outputs.contains_key(&OutputType::Object) || output_filenames.outputs.contains_key(&OutputType::Exe))); - let ongoing_translation = write::run_passes( + let ongoing_translation = write::start_async_translation( tcx.sess, output_filenames, tcx.crate_name(LOCAL_CRATE),