Skip to content

Commit

Permalink
ui-fulldeps: make them pass again?
Browse files Browse the repository at this point in the history
  • Loading branch information
Centril committed Oct 16, 2019
1 parent be40bbd commit 1a26fdf
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mod attr;
pub mod attr;
mod expr;
mod pat;
mod item;
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/parse/parser/attr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ impl<'a> Parser<'a> {
///
/// If `permit_inner` is `true`, then a leading `!` indicates an inner
/// attribute.
fn parse_attribute(&mut self, permit_inner: bool) -> PResult<'a, ast::Attribute> {
pub fn parse_attribute(&mut self, permit_inner: bool) -> PResult<'a, ast::Attribute> {
debug!("parse_attribute: permit_inner={:?} self.token={:?}",
permit_inner,
self.token);
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/parse/parser/module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub(super) struct ModulePathSuccess {

impl<'a> Parser<'a> {
/// Parses a source module as a crate. This is the main entry point for the parser.
crate fn parse_crate_mod(&mut self) -> PResult<'a, Crate> {
pub fn parse_crate_mod(&mut self) -> PResult<'a, Crate> {
let lo = self.token.span;
let krate = Ok(ast::Crate {
attrs: self.parse_inner_attributes()?,
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui-fulldeps/ast_stmt_expr_attr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use syntax::parse::new_parser_from_source_str;
use syntax::parse::parser::Parser;
use syntax::parse::token;
use syntax::ptr::P;
use syntax::parse::attr::*;
use syntax::parse::parser::attr::*;
use syntax::print::pprust;
use std::fmt;

Expand Down
3 changes: 2 additions & 1 deletion src/test/ui-fulldeps/auxiliary/attr-plugin-test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@

extern crate rustc_driver;
extern crate syntax;
extern crate syntax_expand;

use rustc_driver::plugin::Registry;
use syntax::ext::base::SyntaxExtension;
use syntax_expand::base::SyntaxExtension;
use syntax::feature_gate::AttributeType;
use syntax::symbol::Symbol;

Expand Down
3 changes: 2 additions & 1 deletion src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
extern crate rustc;
extern crate rustc_driver;
extern crate syntax;
extern crate syntax_expand;

use rustc_driver::plugin::Registry;
use syntax::attr;
use syntax::ext::base::*;
use syntax_expand::base::*;
use syntax::feature_gate::AttributeType::Whitelisted;
use syntax::symbol::Symbol;

Expand Down
5 changes: 3 additions & 2 deletions src/test/ui-fulldeps/auxiliary/plugin-args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
#![feature(box_syntax, rustc_private)]

extern crate syntax;
extern crate syntax_expand;
extern crate syntax_pos;
extern crate rustc;
extern crate rustc_driver;

use std::borrow::ToOwned;
use syntax::ast;
use syntax::ext::base::{SyntaxExtension, SyntaxExtensionKind};
use syntax::ext::base::{TTMacroExpander, ExtCtxt, MacResult, MacEager};
use syntax_expand::base::{SyntaxExtension, SyntaxExtensionKind};
use syntax_expand::base::{TTMacroExpander, ExtCtxt, MacResult, MacEager};
use syntax::print::pprust;
use syntax::symbol::Symbol;
use syntax_pos::Span;
Expand Down
3 changes: 2 additions & 1 deletion src/test/ui-fulldeps/auxiliary/roman-numerals.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
#![feature(plugin_registrar, rustc_private)]

extern crate syntax;
extern crate syntax_expand;
extern crate syntax_pos;
extern crate rustc;
extern crate rustc_driver;

use syntax::parse::token::{self, Token};
use syntax::tokenstream::{TokenTree, TokenStream};
use syntax::ext::base::{ExtCtxt, MacResult, DummyResult, MacEager};
use syntax_expand::base::{ExtCtxt, MacResult, DummyResult, MacEager};
use syntax_pos::Span;
use rustc_driver::plugin::Registry;

Expand Down

0 comments on commit 1a26fdf

Please sign in to comment.