about summary refs log tree commit diff
path: root/src/libsyntax_pos
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-08-16 18:35:17 +0000
committerbors <bors@rust-lang.org>2019-08-16 18:35:17 +0000
commitbdfd698f37184da42254a03ed466ab1f90e6fb6c (patch)
tree43da66e41e36d1b5f1b460ef1e7a1875e506e846 /src/libsyntax_pos
parent9a32ad0dd51f8451aa6e39d7e9ea89483cb8fcfa (diff)
parent6b0a83862ce7f0fa0bd5d729b3b89b6ad25f8221 (diff)
downloadrust-bdfd698f37184da42254a03ed466ab1f90e6fb6c.tar.gz
rust-bdfd698f37184da42254a03ed466ab1f90e6fb6c.zip
Auto merge of #63640 - Centril:rollup-yeb8o66, r=Centril
Rollup of 10 pull requests

Successful merges:

 - #60492 (Add custom nth_back for Chain)
 - #61780 (Finalize the error type for `try_reserve`)
 - #63495 ( Remove redundant `ty` fields from `mir::Constant` and `hair::pattern::PatternRange`.)
 - #63525 (Make sure that all file loading happens via SourceMap)
 - #63595 (add sparc64-unknown-openbsd target)
 - #63604 (Some update for vxWorks)
 - #63613 (Hygienize use of built-in macros in the standard library)
 - #63632 (A couple of comment fixes.)
 - #63634 (ci: properly set the job name in CPU stats)
 - #63636 (ci: move linkcheck from mingw-2 to mingw-1)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libsyntax_pos')
-rw-r--r--src/libsyntax_pos/symbol.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs
index e2d1635f312..27fc66d3b09 100644
--- a/src/libsyntax_pos/symbol.rs
+++ b/src/libsyntax_pos/symbol.rs
@@ -609,7 +609,6 @@ symbols! {
         rust_eh_personality,
         rust_eh_unwind_resume,
         rust_oom,
-        __rust_unstable_column,
         rvalue_static_promotion,
         sanitizer_runtime,
         _Self,