rollup merge of #20563: cmr/macro-input-future-proofing

diff --cc src/libcore/macros.rs
Simple merge

diff --cc src/libcore/str/mod.rs
Simple merge

diff --cc src/librustc_trans/trans/context.rs
Simple merge

diff --cc src/libserialize/serialize.rs
Simple merge

diff --cc src/libsyntax/ext/tt/macro_rules.rs
index fdf749e128566a3762a95b132bd72fb1dc895a12,6a064ec131356911a0e9f902a3b40ff488f7a803..95240cd7a8723703b1b8b50ea3c6b9dbd88096b4
--- 1/src/libsyntax/ext/tt/macro_rules.rs
--- 2/src/libsyntax/ext/tt/macro_rules.rs
+++ b/src/libsyntax/ext/tt/macro_rules.rs
@@@ -16,11 -16,11 +16,11 @@@ use ext::base::{NormalTT, TTMacroExpand
  use ext::tt::macro_parser::{Success, Error, Failure};
  use ext::tt::macro_parser::{NamedMatch, MatchedSeq, MatchedNonterminal};
  use ext::tt::macro_parser::{parse, parse_or_else};
 -use parse::lexer::new_tt_reader;
 +use parse::lexer::{new_tt_reader, new_tt_reader_with_doc_flag};
  use parse::parser::Parser;
  use parse::attr::ParserAttr;
- use parse::token::{special_idents, gensym_ident};
- use parse::token::{MatchNt, NtTT};
+ use parse::token::{special_idents, gensym_ident, NtTT, Token};
+ use parse::token::Token::*;
  use parse::token;
  use print;
  use ptr::P;

diff --cc src/libsyntax/parse/token.rs
Simple merge