diff options
| author | bors <bors@rust-lang.org> | 2019-09-14 02:19:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-14 02:19:28 +0000 |
| commit | fdd48565d0c8a9e6fedd8c6db951ee46577b5f54 (patch) | |
| tree | 5d5b9d1cae0f42ae984aa492c94d820461e88145 /src/libsyntax_pos | |
| parent | d097af105526a8defe413c64d79766333bb2085b (diff) | |
| parent | e0862784a1550dc1e07249c8967179a09b091141 (diff) | |
Auto merge of #64438 - cuviper:beta-rollup, r=Mark-Simulacrum
[beta] Rollup backports Cherry-picked: - Permit unwinding through FFI by default #62603 - pprust: Do not print spaces before some tokens #63897 - Account for doc comments coming from proc macros without spans #63930 - Support "soft" feature-gating using a lint #64066 - Update xLTO compatibility table in rustc book. #64092 - Include compiler-rt in the source tarball #64240 - Update LLVM submodule #64317 r? @Mark-Simulacrum
Diffstat (limited to 'src/libsyntax_pos')
| -rw-r--r-- | src/libsyntax_pos/symbol.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index 2d9556233d1..e301a069970 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -623,6 +623,7 @@ symbols! { size, slice_patterns, slicing_syntax, + soft, Some, specialization, speed, |