Skip to content

Commit

Permalink
Rollup merge of rust-lang#68135 - calebcartwright:rustc-parse-visibil…
Browse files Browse the repository at this point in the history
…ities, r=Centril

restore some rustc_parse visibilities for rustfmt

In rust-lang@c189565 some visibilities were reduced on the parse mod (which now resides in the rustc_parse crate) as part of some refactoring and splitting up of libsyntax. However, rustfmt needs access to a few of those items that are no longer visible.

This restores the visibility on those items rustfmt depends on.

rust-lang/rustfmt#3903 (comment)
rust-lang/rustfmt#4009

cc @topecongiro
  • Loading branch information
JohnTitor authored Jan 13, 2020
2 parents 7d3fa29 + ed039e8 commit ca806cf
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
13 changes: 9 additions & 4 deletions src/librustc_parse/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pub mod attr;
mod expr;
mod item;
mod module;
pub use module::{ModulePath, ModulePathSuccess};
mod pat;
mod path;
mod ty;
Expand Down Expand Up @@ -117,7 +118,8 @@ pub struct Parser<'a> {
/// Used to determine the path to externally loaded source files.
pub(super) directory: Directory<'a>,
/// `true` to parse sub-modules in other files.
pub(super) recurse_into_file_modules: bool,
// Public for rustfmt usage.
pub recurse_into_file_modules: bool,
/// Name of the root module this parser originated from. If `None`, then the
/// name is not known. This does not change while the parser is descending
/// into modules, and sub-parsers have new values for this name.
Expand All @@ -126,7 +128,8 @@ pub struct Parser<'a> {
token_cursor: TokenCursor,
desugar_doc_comments: bool,
/// `true` we should configure out of line modules as we parse.
cfg_mods: bool,
// Public for rustfmt usage.
pub cfg_mods: bool,
/// This field is used to keep track of how many left angle brackets we have seen. This is
/// required in order to detect extra leading left angle brackets (`<` characters) and error
/// appropriately.
Expand Down Expand Up @@ -483,7 +486,8 @@ impl<'a> Parser<'a> {
}
}

fn parse_ident(&mut self) -> PResult<'a, ast::Ident> {
// Public for rustfmt usage.
pub fn parse_ident(&mut self) -> PResult<'a, ast::Ident> {
self.parse_ident_common(true)
}

Expand Down Expand Up @@ -540,7 +544,8 @@ impl<'a> Parser<'a> {

/// If the next token is the given keyword, eats it and returns `true`.
/// Otherwise, returns `false`. An expectation is also added for diagnostics purposes.
fn eat_keyword(&mut self, kw: Symbol) -> bool {
// Public for rustfmt usage.
pub fn eat_keyword(&mut self, kw: Symbol) -> bool {
if self.check_keyword(kw) {
self.bump();
true
Expand Down
12 changes: 8 additions & 4 deletions src/librustc_parse/parser/module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ use syntax::token::{self, TokenKind};
use std::path::{self, Path, PathBuf};

/// Information about the path to a module.
pub(super) struct ModulePath {
// Public for rustfmt usage.
pub struct ModulePath {
name: String,
path_exists: bool,
pub result: Result<ModulePathSuccess, Error>,
}

pub(super) struct ModulePathSuccess {
// Public for rustfmt usage.
pub struct ModulePathSuccess {
pub path: PathBuf,
pub directory_ownership: DirectoryOwnership,
}
Expand Down Expand Up @@ -177,7 +179,8 @@ impl<'a> Parser<'a> {
}
}

pub(super) fn submod_path_from_attr(attrs: &[Attribute], dir_path: &Path) -> Option<PathBuf> {
// Public for rustfmt usage.
pub fn submod_path_from_attr(attrs: &[Attribute], dir_path: &Path) -> Option<PathBuf> {
if let Some(s) = attr::first_attr_value_str_by_name(attrs, sym::path) {
let s = s.as_str();

Expand All @@ -194,7 +197,8 @@ impl<'a> Parser<'a> {
}

/// Returns a path to a module.
pub(super) fn default_submod_path(
// Public for rustfmt usage.
pub fn default_submod_path(
id: ast::Ident,
relative: Option<ast::Ident>,
dir_path: &Path,
Expand Down

0 comments on commit ca806cf

Please sign in to comment.