diff options
| author | bors <bors@rust-lang.org> | 2019-06-06 03:56:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-06 03:56:22 +0000 |
| commit | 740668dbd99dbf1726bbb0cca6cd0943ea2f7e27 (patch) | |
| tree | 7fcf783b5f92803e8ca4985eaa24097e76b6192c /src/libsyntax_pos | |
| parent | 1bec46c9a5399d5e95c05e3428c3abd264780705 (diff) | |
| parent | ee890331f6e33afe12ef250eb6388db2aab7cbbf (diff) | |
| download | rust-740668dbd99dbf1726bbb0cca6cd0943ea2f7e27.tar.gz rust-740668dbd99dbf1726bbb0cca6cd0943ea2f7e27.zip | |
Auto merge of #57428 - alexreg:associated_type_bounds, r=nikomatsakis,Centril
Implementation of RFC 2289 (associated_type_bounds) This PR implements the [`asociated_type_bounds` feature](https://github.com/rust-lang/rfcs/blob/master/text/2289-associated-type-bounds.md). Associated type bounds are implemented in: - function/method arguments and return types - structs, enums, unions - associated items in traits - type aliases - type parameter defaults - trait objects - let bindings CC @nikomatsakis @centril
Diffstat (limited to 'src/libsyntax_pos')
| -rw-r--r-- | src/libsyntax_pos/hygiene.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax_pos/symbol.rs | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libsyntax_pos/hygiene.rs b/src/libsyntax_pos/hygiene.rs index 213993996a6..b827416ab53 100644 --- a/src/libsyntax_pos/hygiene.rs +++ b/src/libsyntax_pos/hygiene.rs @@ -714,7 +714,7 @@ pub enum CompilerDesugaringKind { /// Desugaring of an `impl Trait` in return type position /// to an `existential type Foo: Trait;` and replacing the /// `impl Trait` with `Foo`. - ExistentialReturnType, + ExistentialType, Async, Await, ForLoop, @@ -728,7 +728,7 @@ impl CompilerDesugaringKind { CompilerDesugaringKind::Await => "await", CompilerDesugaringKind::QuestionMark => "?", CompilerDesugaringKind::TryBlock => "try block", - CompilerDesugaringKind::ExistentialReturnType => "existential type", + CompilerDesugaringKind::ExistentialType => "existential type", CompilerDesugaringKind::ForLoop => "for loop", }) } diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index 8847e94127b..4e080d115d2 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -141,6 +141,7 @@ symbols! { arm_target_feature, asm, associated_consts, + associated_type_bounds, associated_type_defaults, associated_types, async_await, |