diff options
| author | bors <bors@rust-lang.org> | 2019-05-20 00:37:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-20 00:37:48 +0000 |
| commit | 128b4c8035fc788b78157d4e1975cda0f25ce599 (patch) | |
| tree | 2821ec0ae0c94f2b83d5cf37c68c0ad95220d549 /src/libsyntax_pos | |
| parent | a5000c5098d08d9240d875fcb4231533fb922ead (diff) | |
| parent | 614ffe56c6a0a3bf0dc649388d5cb7d6a3f0d0c1 (diff) | |
| download | rust-128b4c8035fc788b78157d4e1975cda0f25ce599.tar.gz rust-128b4c8035fc788b78157d4e1975cda0f25ce599.zip | |
Auto merge of #60969 - Centril:rollup-3j71mqj, r=Centril
Rollup of 6 pull requests Successful merges: - #60590 (Test interaction of unions with non-zero/niche-filling optimization) - #60745 (Perform constant propagation into terminators) - #60895 (Enable thumbv7a-pc-windows-msvc target build end to end in rust/master) - #60908 (Fix lints handling in rustdoc) - #60960 (Stop using gensyms in HIR lowering) - #60962 (Fix data types indication) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_pos')
| -rw-r--r-- | src/libsyntax_pos/symbol.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index 01b126f48b3..97b22282668 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -229,6 +229,7 @@ symbols! { eh_personality, eh_unwind_resume, enable, + err, Err, except, exclusive_range_pattern, @@ -260,6 +261,7 @@ symbols! { fundamental, future, Future, + gen_future, generators, generic_associated_types, generic_param_attrs, @@ -361,6 +363,7 @@ symbols! { never, never_type, next, + __next, nll, no_builtins, no_core, @@ -406,6 +409,7 @@ symbols! { Pending, pin, Pin, + pinned, platform_intrinsics, plugin, plugin_registrar, @@ -569,6 +573,7 @@ symbols! { trivial_bounds, Try, try_blocks, + try_trait, tuple_indexing, ty, type_alias_enum_variants, @@ -587,6 +592,7 @@ symbols! { uniform_paths, universal_impl_trait, unmarked_api, + unreachable_code, unrestricted_attribute_tokens, unsafe_destructor_blind_to_params, unsafe_no_drop_flag, @@ -601,6 +607,7 @@ symbols! { use_nested_groups, usize, v1, + val, vis, visible_private_types, volatile, |