diff options
| author | bors <bors@rust-lang.org> | 2019-12-02 08:35:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-02 08:35:24 +0000 |
| commit | 4af3ee8ee2a2bc1286b021db7600ba990359cf3f (patch) | |
| tree | 8631bfc4d4f6746bdc573f206f8f5edf4bbdfc74 /src/libsyntax_pos | |
| parent | f5c81e0a986e4285d3d0fd781a1bd475753eb12c (diff) | |
| parent | 910e83eab2f65dd922f8d980c71840a68b3d7c6a (diff) | |
| download | rust-4af3ee8ee2a2bc1286b021db7600ba990359cf3f.tar.gz rust-4af3ee8ee2a2bc1286b021db7600ba990359cf3f.zip | |
Auto merge of #66950 - RalfJung:rollup-12d0zx8, r=RalfJung
Rollup of 5 pull requests Successful merges: - #66245 (Conditional compilation for sanitizers) - #66654 (Handle const-checks for `&mut` outside of `HasMutInterior`) - #66822 (libunwind_panic: adjust miri panic hack) - #66827 (handle diverging functions forwarding their return place) - #66834 (rustbuild fixes) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_pos')
| -rw-r--r-- | src/libsyntax_pos/symbol.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index 7d43c3c8d07..3059b059691 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -177,6 +177,7 @@ symbols! { cfg_attr, cfg_attr_multi, cfg_doctest, + cfg_sanitize, cfg_target_feature, cfg_target_has_atomic, cfg_target_thread_local, @@ -634,6 +635,7 @@ symbols! { rust_eh_unwind_resume, rust_oom, rvalue_static_promotion, + sanitize, sanitizer_runtime, _Self, self_in_typedefs, |