diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2021-07-08 18:30:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-08 18:30:33 +0200 |
| commit | d12b16887baa36e6c372d088d3661b4287dc70e1 (patch) | |
| tree | f60492cc691f8d5d85f35ea25c0a16f82dd474c0 /compiler/rustc_span/src | |
| parent | d9297aea101473d2dc59c702f96a02e64772c149 (diff) | |
| parent | cc3af7091caeaf91851f2999dea3225d0d5d39b0 (diff) | |
| download | rust-d12b16887baa36e6c372d088d3661b4287dc70e1.tar.gz rust-d12b16887baa36e6c372d088d3661b4287dc70e1.zip | |
Rollup merge of #86726 - sexxi-goose:use-diagnostic-item-for-rfc2229-migration, r=nikomatsakis
Use diagnostic items instead of lang items for rfc2229 migrations This PR removes the `Send`, `UnwindSafe` and `RefUnwindSafe` lang items introduced in https://github.com/rust-lang/rust/pull/84730, and uses diagnostic items instead to check for `Send`, `UnwindSafe` and `RefUnwindSafe` traits for RFC2229 migrations. r? ```@nikomatsakis```
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index a308d1efca1..edb97d70517 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -947,7 +947,7 @@ symbols! { receiver, recursion_limit, reexport_test_harness_main, - ref_unwind_safe, + ref_unwind_safe_trait, reference, reflect, reg, @@ -1073,7 +1073,6 @@ symbols! { self_in_typedefs, self_struct_ctor, semitransparent, - send, send_trait, shl, shl_assign, @@ -1299,7 +1298,7 @@ symbols! { unused_qualifications, unwind, unwind_attributes, - unwind_safe, + unwind_safe_trait, unwrap, unwrap_or, use_extern_macros, |