Auto merge of #43532 - petrochenkov:pgargs, r=nikomatsakis

Desugar parenthesized generic arguments in HIR

Fixes ICE in https://github.com/rust-lang/rust/issues/43431 and maybe some other similar issues.

r? @eddyb
This commit is contained in:
bors 2017-08-24 03:48:25 +00:00
commit a12e4f8098
18 changed files with 266 additions and 440 deletions

View file

@ -833,10 +833,6 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session,
})
})?;
time(time_passes,
"early lint checks",
|| lint::check_ast_crate(sess, &krate));
// Lower ast -> hir.
let hir_forest = time(time_passes, "lowering ast -> hir", || {
let hir_crate = lower_crate(sess, &krate, &mut resolver);
@ -848,6 +844,10 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session,
hir_map::Forest::new(hir_crate, &sess.dep_graph)
});
time(time_passes,
"early lint checks",
|| lint::check_ast_crate(sess, &krate));
// Discard hygiene data, which isn't required after lowering to HIR.
if !keep_hygiene_data(sess) {
syntax::ext::hygiene::clear_markings();