use syntax::attr;
use syntax::errors::DiagnosticBuilder;
use syntax::ext::base::{self, Determinacy};
-use syntax::ext::base::{Annotatable, MacroKind, SyntaxExtension};
+use syntax::ext::base::{MacroKind, SyntaxExtension};
use syntax::ext::expand::{AstFragment, Invocation, InvocationKind};
use syntax::ext::hygiene::{self, Mark};
use syntax::ext::tt::macro_rules;
mark
}
- fn resolve_dollar_crates(&mut self, annotatable: &Annotatable) {
- pub struct ResolveDollarCrates<'a, 'b: 'a> {
- pub resolver: &'a mut Resolver<'b>,
+ fn resolve_dollar_crates(&mut self, fragment: &AstFragment) {
+ struct ResolveDollarCrates<'a, 'b: 'a> {
+ resolver: &'a mut Resolver<'b>
}
impl<'a> Visitor<'a> for ResolveDollarCrates<'a, '_> {
fn visit_ident(&mut self, ident: Ident) {
fn visit_mac(&mut self, _: &ast::Mac) {}
}
- annotatable.visit_with(&mut ResolveDollarCrates { resolver: self });
+ fragment.visit_with(&mut ResolveDollarCrates { resolver: self });
}
fn visit_ast_fragment_with_placeholders(&mut self, mark: Mark, fragment: &AstFragment,
primary_binding: &'a NameBinding<'a>, secondary_binding: &'a NameBinding<'a>)
-> &'a NameBinding<'a> {
self.arenas.alloc_name_binding(NameBinding {
- kind: primary_binding.kind.clone(),
ambiguity: Some((secondary_binding, kind)),
- vis: primary_binding.vis,
- span: primary_binding.span,
- expansion: primary_binding.expansion,
+ ..primary_binding.clone()
})
}
use ptr::P;
use smallvec::SmallVec;
use symbol::{keywords, Ident, Symbol};
-use visit::Visitor;
use ThinVec;
use rustc_data_structures::fx::FxHashMap;
_ => false,
}
}
-
- pub fn visit_with<'a, V: Visitor<'a>>(&'a self, visitor: &mut V) {
- match self {
- Annotatable::Item(item) => visitor.visit_item(item),
- Annotatable::TraitItem(trait_item) => visitor.visit_trait_item(trait_item),
- Annotatable::ImplItem(impl_item) => visitor.visit_impl_item(impl_item),
- Annotatable::ForeignItem(foreign_item) => visitor.visit_foreign_item(foreign_item),
- Annotatable::Stmt(stmt) => visitor.visit_stmt(stmt),
- Annotatable::Expr(expr) => visitor.visit_expr(expr),
- }
- }
}
// A more flexible ItemDecorator.
fn next_node_id(&mut self) -> ast::NodeId;
fn get_module_scope(&mut self, id: ast::NodeId) -> Mark;
- fn resolve_dollar_crates(&mut self, annotatable: &Annotatable);
+ fn resolve_dollar_crates(&mut self, fragment: &AstFragment);
fn visit_ast_fragment_with_placeholders(&mut self, mark: Mark, fragment: &AstFragment,
derives: &[Mark]);
fn add_builtin(&mut self, ident: ast::Ident, ext: Lrc<SyntaxExtension>);
fn next_node_id(&mut self) -> ast::NodeId { ast::DUMMY_NODE_ID }
fn get_module_scope(&mut self, _id: ast::NodeId) -> Mark { Mark::root() }
- fn resolve_dollar_crates(&mut self, _annotatable: &Annotatable) {}
+ fn resolve_dollar_crates(&mut self, _fragment: &AstFragment) {}
fn visit_ast_fragment_with_placeholders(&mut self, _invoc: Mark, _fragment: &AstFragment,
_derives: &[Mark]) {}
fn add_builtin(&mut self, _ident: ast::Ident, _ext: Lrc<SyntaxExtension>) {}
/// prepares data for resolving paths of macro invocations.
fn collect_invocations(&mut self, fragment: AstFragment, derives: &[Mark])
-> (AstFragment, Vec<Invocation>) {
+ // Resolve `$crate`s in the fragment for pretty-printing.
+ self.cx.resolver.resolve_dollar_crates(&fragment);
+
let (fragment_with_placeholders, invocations) = {
let mut collector = InvocationCollector {
cfg: StripUnconfigured {
Some(invoc.fragment_kind.expect_from_annotatables(items))
}
AttrProcMacro(ref mac, ..) => {
- // Resolve `$crate`s in case we have to go though stringification.
- self.cx.resolver.resolve_dollar_crates(&item);
self.gate_proc_macro_attr_item(attr.span, &item);
let item_tok = TokenTree::Token(DUMMY_SP, Token::interpolated(match item {
Annotatable::Item(item) => token::NtItem(item),
match *ext {
ProcMacroDerive(ref ext, ..) => {
- // Resolve `$crate`s in case we have to go though stringification.
- self.cx.resolver.resolve_dollar_crates(&item);
invoc.expansion_data.mark.set_expn_info(expn_info);
let span = span.with_ctxt(self.cx.backtrace());
let dummy = ast::MetaItem { // FIXME(jseyfried) avoid this
--- /dev/null
+#![feature(prelude_import)]
+#![no_std]
+#[prelude_import]
+use ::std::prelude::v1::*;
+#[macro_use]
+extern crate std;
+// pretty-compare-only
+// pretty-mode:expanded
+// pp-exact:dollar-crate.pp
+
+fn main() {
+ {
+ ::std::io::_print(::std::fmt::Arguments::new_v1(&["rust\n"],
+ &match () {
+ () => [],
+ }));
+ };
+}
--- /dev/null
+// pretty-compare-only
+// pretty-mode:expanded
+// pp-exact:dollar-crate.pp
+
+fn main() {
+ println!("rust");
+}