From 7f89f04b41d4d1de85df2fd3ede61e4fc97d9e69 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sat, 19 Oct 2019 00:54:17 +0300
Subject: [PATCH] Fix rebase

---
 src/libsyntax/lib.rs                 | 1 -
 src/libsyntax_expand/lib.rs          | 1 +
 src/libsyntax_expand/placeholders.rs | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 261cc53e158c..a68b7fdf931a 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -11,7 +11,6 @@
 #![feature(const_fn)]
 #![feature(const_transmute)]
 #![feature(crate_visibility_modifier)]
-#![feature(decl_macro)]
 #![feature(label_break_value)]
 #![feature(nll)]
 #![feature(try_trait)]
diff --git a/src/libsyntax_expand/lib.rs b/src/libsyntax_expand/lib.rs
index 88e69d793973..db292b619be3 100644
--- a/src/libsyntax_expand/lib.rs
+++ b/src/libsyntax_expand/lib.rs
@@ -1,4 +1,5 @@
 #![feature(crate_visibility_modifier)]
+#![feature(decl_macro)]
 #![feature(proc_macro_diagnostic)]
 #![feature(proc_macro_internals)]
 #![feature(proc_macro_span)]
diff --git a/src/libsyntax_expand/placeholders.rs b/src/libsyntax_expand/placeholders.rs
index 21d8a21aa394..e595888dae7d 100644
--- a/src/libsyntax_expand/placeholders.rs
+++ b/src/libsyntax_expand/placeholders.rs
@@ -1,7 +1,7 @@
 use crate::base::ExtCtxt;
 use crate::expand::{AstFragment, AstFragmentKind};
 
-use syntax::ast::{self, NodeId};
+use syntax::ast;
 use syntax::source_map::{DUMMY_SP, dummy_spanned};
 use syntax::tokenstream::TokenStream;
 use syntax::mut_visit::*;