Skip to content

Commit

Permalink
Auto merge of #39402 - king6cong:master, r=nrc
Browse files Browse the repository at this point in the history
comment rewording and argument unifying
  • Loading branch information
bors committed Feb 2, 2017
2 parents d5f5474 + 701c32e commit 1a2428f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/librustc_driver/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)?;
Expand All @@ -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 {
Expand All @@ -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();
}
Expand Down

0 comments on commit 1a2428f

Please sign in to comment.