diff options
| author | bors <bors@rust-lang.org> | 2019-06-25 18:35:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-25 18:35:41 +0000 |
| commit | 5f9c0448dde167128d668da4555879f64e56af1d (patch) | |
| tree | 6e99033118ee25fc4064c4b2968f43132ac8f67e /src/libsyntax_ext | |
| parent | 303f77ee1d60e1b351ff6478143dd866403c27f5 (diff) | |
| parent | d406d89b3182f05629dd949932bc10a9db28140e (diff) | |
| download | rust-5f9c0448dde167128d668da4555879f64e56af1d.tar.gz rust-5f9c0448dde167128d668da4555879f64e56af1d.zip | |
Auto merge of #62119 - Centril:rollup-el20wu0, r=Centril
Rollup of 7 pull requests Successful merges: - #61814 (Fix an ICE with uninhabited consts) - #61987 (rustc: produce AST instead of HIR from `hir::lowering::Resolver` methods.) - #62055 (Fix error counting) - #62078 (Remove built-in derive macros `Send` and `Sync`) - #62085 (Add test for issue-38591) - #62091 (HirIdification: almost there) - #62096 (Implement From<Local> for Place and PlaceBase) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/deriving/bounds.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax_ext/deriving/mod.rs | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/libsyntax_ext/deriving/bounds.rs b/src/libsyntax_ext/deriving/bounds.rs index c7b805e0bdc..d5b8a00c75b 100644 --- a/src/libsyntax_ext/deriving/bounds.rs +++ b/src/libsyntax_ext/deriving/bounds.rs @@ -6,14 +6,6 @@ use syntax::ast::MetaItem; use syntax::ext::base::{Annotatable, ExtCtxt}; use syntax_pos::Span; -pub fn expand_deriving_unsafe_bound(cx: &mut ExtCtxt<'_>, - span: Span, - _: &MetaItem, - _: &Annotatable, - _: &mut dyn FnMut(Annotatable)) { - cx.span_err(span, "this unsafe trait should be implemented explicitly"); -} - pub fn expand_deriving_copy(cx: &mut ExtCtxt<'_>, span: Span, mitem: &MetaItem, diff --git a/src/libsyntax_ext/deriving/mod.rs b/src/libsyntax_ext/deriving/mod.rs index e75eff2e857..aa9913d436c 100644 --- a/src/libsyntax_ext/deriving/mod.rs +++ b/src/libsyntax_ext/deriving/mod.rs @@ -111,8 +111,6 @@ derive_traits! { "Default" => default::expand_deriving_default, - "Send" => bounds::expand_deriving_unsafe_bound, - "Sync" => bounds::expand_deriving_unsafe_bound, "Copy" => bounds::expand_deriving_copy, // deprecated |