diff options
| author | bors <bors@rust-lang.org> | 2017-08-24 03:48:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-24 03:48:25 +0000 |
| commit | a12e4f8098438cbfa65361647742e3c026574cb5 (patch) | |
| tree | 3a00c1cf018dfda5e13072f5adf79fb8284edf46 /src/librustc/ich | |
| parent | 560b6ca6c00b1d51aed8ca5b0cf6980b4450e19f (diff) | |
| parent | 000f87ab1eb13b1e743bcb614b8d59463f2efd04 (diff) | |
| download | rust-a12e4f8098438cbfa65361647742e3c026574cb5.tar.gz rust-a12e4f8098438cbfa65361647742e3c026574cb5.zip | |
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
Diffstat (limited to 'src/librustc/ich')
| -rw-r--r-- | src/librustc/ich/impls_hir.rs | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/librustc/ich/impls_hir.rs b/src/librustc/ich/impls_hir.rs index 4c70816c0b8..c5222c2d6cb 100644 --- a/src/librustc/ich/impls_hir.rs +++ b/src/librustc/ich/impls_hir.rs @@ -133,22 +133,12 @@ impl_stable_hash_for!(struct hir::PathSegment { parameters }); -impl_stable_hash_for!(enum hir::PathParameters { - AngleBracketedParameters(data), - ParenthesizedParameters(data) -}); - -impl_stable_hash_for!(struct hir::AngleBracketedParameterData { +impl_stable_hash_for!(struct hir::PathParameters { lifetimes, types, infer_types, - bindings -}); - -impl_stable_hash_for!(struct hir::ParenthesizedParameterData { - span, - inputs, - output + bindings, + parenthesized }); impl_stable_hash_for!(enum hir::TyParamBound { |