Rollup merge of rust-lang#39693 - durka:patch-36, r=petrochenkov

frewsxcv · web-flow · commit ae5d8fc929d7 · 2017-02-09T19:43:23.000-05:00
driver: restore partially deleted comment Fixes rust-lang#39689. Comment was lost in commit 811b874 (rust-lang#31916 @nagisa).
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs
@@ -1000,6 +1000,7 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session,
 }
 
 /// Run the translation phase to LLVM, after which the AST and analysis can
+/// be discarded.
 pub fn phase_4_translate_to_llvm<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
                                            analysis: ty::CrateAnalysis,
                                            incremental_hashes_map: &IncrementalHashesMap)

Original file line number	Diff line number	Diff line change
`@@ -1000,6 +1000,7 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session,`
`1000`	`1000`	`}`
`1001`	`1001`
`1002`	`1002`	`/// Run the translation phase to LLVM, after which the AST and analysis can`
	`1003`	`+/// be discarded.`
`1003`	`1004`	`pub fn phase_4_translate_to_llvm<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,`
`1004`	`1005`	`analysis: ty::CrateAnalysis,`
`1005`	`1006`	`incremental_hashes_map: &IncrementalHashesMap)`