about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-02-02 15:41:19 +0000
committerbors <bors@rust-lang.org>2017-02-02 15:41:19 +0000
commit1a2428fc880ba0486f12dd0b59ef6921eb74b9a4 (patch)
treed079e8e97b1d9c7863e6ee97a424b6807b707d6d
parentd5f54743dbad00aa4eb76c557c8d4824a7b770de (diff)
parent701c32ed4ab5014671f7237ab115817b9130d3bb (diff)
Auto merge of #39402 - king6cong:master, r=nrc
comment rewording and argument unifying
-rw-r--r--src/librustc_driver/driver.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs
index a7188f6da1f..a04a5b106b8 100644
--- a/src/librustc_driver/driver.rs
+++ b/src/librustc_driver/driver.rs
@@ -741,15 +741,15 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session,
          "checking for inline asm in case the target doesn't support it",
          || no_asm::check_crate(sess, &krate));
 
-    time(sess.time_passes(),
+    time(time_passes,
          "early lint checks",
          || lint::check_ast_crate(sess, &krate));
 
-    time(sess.time_passes(),
+    time(time_passes,
          "AST validation",
          || ast_validation::check_crate(sess, &krate));
 
-    time(sess.time_passes(), "name resolution", || -> CompileResult {
+    time(time_passes, "name resolution", || -> CompileResult {
         // Since import resolution will eventually happen in expansion,
         // don't perform `after_expand` until after import resolution.
         after_expand(&krate)?;
@@ -770,7 +770,7 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session,
     })?;
 
     // Lower ast -> hir.
-    let hir_forest = time(sess.time_passes(), "lowering ast -> hir", || {
+    let hir_forest = time(time_passes, "lowering ast -> hir", || {
         let hir_crate = lower_crate(sess, &krate, &mut resolver);
 
         if sess.opts.debugging_opts.hir_stats {
@@ -780,7 +780,7 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session,
         hir_map::Forest::new(hir_crate, &sess.dep_graph)
     });
 
-    // Discard hygiene data, which isn't required past lowering to HIR.
+    // Discard hygiene data, which isn't required after lowering to HIR.
     if !keep_hygiene_data(sess) {
         syntax::ext::hygiene::reset_hygiene_data();
     }