diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2016-04-06 17:31:16 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2016-04-06 17:31:16 +0530 |
| commit | 552af51ffb9f4ae08a7ee3bf27b0e8309006ca6f (patch) | |
| tree | 30b2cefa099bea233f2e257116c5ec99589aaa63 /src/libsyntax_ext | |
| parent | af7b00b68fc7960e98fb914be52d9a6a16fe2224 (diff) | |
| parent | e8a8dfb056fb3654bacd6aaa6acbc4536358df23 (diff) | |
| download | rust-552af51ffb9f4ae08a7ee3bf27b0e8309006ca6f.tar.gz rust-552af51ffb9f4ae08a7ee3bf27b0e8309006ca6f.zip | |
Rollup merge of #32570 - eddyb:tis-but-a-front, r=nikomatsakis
r? @nikomatsakis Conflicts: src/librustc_save_analysis/lib.rs src/libsyntax/ast_util.rs
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index a389165f715..b8ba1a58f21 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -193,7 +193,6 @@ use std::vec; use syntax::abi::Abi; use syntax::ast::{self, EnumDef, Expr, Ident, Generics, VariantData, BinOpKind, PatKind}; -use syntax::ast_util; use syntax::attr; use syntax::attr::AttrMetaMethods; use syntax::ext::base::{ExtCtxt, Annotatable}; @@ -619,7 +618,6 @@ impl<'a> TraitDef<'a> { // Just mark it now since we know that it'll end up used downstream attr::mark_used(&attr); let opt_trait_ref = Some(trait_ref); - let ident = ast_util::impl_pretty_name(&opt_trait_ref, Some(&self_type)); let unused_qual = cx.attribute( self.span, cx.meta_list(self.span, @@ -637,7 +635,7 @@ impl<'a> TraitDef<'a> { cx.item( self.span, - ident, + special_idents::invalid, a, ast::ItemKind::Impl(unsafety, ast::ImplPolarity::Positive, |