about summary refs log tree commit diff
path: root/compiler/rustc_span
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-05-12 13:33:32 +0000
committerbors <bors@rust-lang.org>2021-05-12 13:33:32 +0000
commit28e2b29b8952485679367cc05699fb5154f4e5c3 (patch)
tree54280248509a198ecaa895cea214166b7a5cb6eb /compiler/rustc_span
parente1ff91f439bc09f566da211c6449821b4e949279 (diff)
parent564b4de626d9fa68ce10a0e792c1d329d3225d08 (diff)
downloadrust-28e2b29b8952485679367cc05699fb5154f4e5c3.tar.gz
rust-28e2b29b8952485679367cc05699fb5154f4e5c3.zip
Auto merge of #84730 - sexxi-goose:rox-auto-trait, r=nikomatsakis
Add auto traits and clone trait migrations for RFC2229

This PR
- renames the existent RFC2229 migration `disjoint_capture_drop_reorder` to `disjoint_capture_migration`
- add additional migrations for auto traits and clone trait

Closes rust-lang/project-rfc-2229#29
Closes rust-lang/project-rfc-2229#28

r? `@nikomatsakis`
Diffstat (limited to 'compiler/rustc_span')
-rw-r--r--compiler/rustc_span/src/symbol.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs
index 4c80b84e3d2..6ed29f92415 100644
--- a/compiler/rustc_span/src/symbol.rs
+++ b/compiler/rustc_span/src/symbol.rs
@@ -939,6 +939,7 @@ symbols! {
         receiver,
         recursion_limit,
         reexport_test_harness_main,
+        ref_unwind_safe,
         reference,
         reflect,
         reg,
@@ -1060,6 +1061,7 @@ symbols! {
         self_in_typedefs,
         self_struct_ctor,
         semitransparent,
+        send,
         send_trait,
         shl,
         shl_assign,
@@ -1281,6 +1283,7 @@ symbols! {
         unused_qualifications,
         unwind,
         unwind_attributes,
+        unwind_safe,
         unwrap,
         unwrap_or,
         use_extern_macros,