diff options
| author | bors <bors@rust-lang.org> | 2019-11-10 02:15:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-10 02:15:28 +0000 |
| commit | 57a5f92bef4b459005920f1aeff05a52c7e356b0 (patch) | |
| tree | c35f9a7411db7dce9f6dda1a6d75c19775ee8fce /src/libsyntax_pos | |
| parent | c296b2d8309100b27a89707b29f2583aa17e0d3e (diff) | |
| parent | 0fec5ab2bbebbff9dab927133ed9b2dc972b6ab2 (diff) | |
| download | rust-57a5f92bef4b459005920f1aeff05a52c7e356b0.tar.gz rust-57a5f92bef4b459005920f1aeff05a52c7e356b0.zip | |
Auto merge of #66259 - JohnTitor:rollup-x9nk1e2, r=JohnTitor
Rollup of 7 pull requests Successful merges: - #65719 (Refactor sync::Once) - #65831 (Don't cast directly from &[T; N] to *const T) - #66048 (Correct error in documentation for Ipv4Addr method) - #66058 (Correct deprecated `is_global` IPv6 documentation) - #66216 ([mir-opt] Handle return place in ConstProp and improve SimplifyLocals pass) - #66217 (invalid_value lint: use diagnostic items) - #66235 (rustc_metadata: don't let LLVM confuse rmeta blobs for COFF object files.) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_pos')
| -rw-r--r-- | src/libsyntax_pos/symbol.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index ae82ffd6383..f07d56e7ea2 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -418,9 +418,10 @@ symbols! { match_beginning_vert, match_default_bindings, may_dangle, - maybe_uninit, - MaybeUninit, - mem, + maybe_uninit_uninit, + maybe_uninit_zeroed, + mem_uninitialized, + mem_zeroed, member_constraints, message, meta, @@ -713,8 +714,6 @@ symbols! { underscore_imports, underscore_lifetimes, uniform_paths, - uninit, - uninitialized, universal_impl_trait, unmarked_api, unreachable_code, @@ -745,7 +744,6 @@ symbols! { windows, windows_subsystem, Yield, - zeroed, } } |