diff options
| author | bors <bors@rust-lang.org> | 2019-11-07 22:02:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-07 22:02:41 +0000 |
| commit | e8f43b72eb2596f360004f6cdf9cdde4b9e789e1 (patch) | |
| tree | 4e437fd2ceb9b0c236f649563c15e016816853ff /src/libsyntax/parse/parser/module.rs | |
| parent | 50f8aadd746ebc929a752e5ffb133936ee75c52f (diff) | |
| parent | 333899a736cc5a4c8cb5cd6585fea7395c9b160c (diff) | |
| download | rust-e8f43b72eb2596f360004f6cdf9cdde4b9e789e1.tar.gz rust-e8f43b72eb2596f360004f6cdf9cdde4b9e789e1.zip | |
Auto merge of #66189 - Centril:rollup-3bsf45s, r=Centril
Rollup of 5 pull requests Successful merges: - #63793 (Have tidy ensure that we document all `unsafe` blocks in libcore) - #64696 ([rustdoc] add sub settings) - #65916 (syntax: move stuff around) - #66087 (Update some build-pass ui tests to use check-pass where applicable) - #66182 (invalid_value lint: fix help text) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/parse/parser/module.rs')
| -rw-r--r-- | src/libsyntax/parse/parser/module.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser/module.rs b/src/libsyntax/parse/parser/module.rs index 242a17659a0..72049daaed3 100644 --- a/src/libsyntax/parse/parser/module.rs +++ b/src/libsyntax/parse/parser/module.rs @@ -1,14 +1,16 @@ -use super::{Parser, PResult}; +use super::Parser; use super::item::ItemInfo; use super::diagnostics::Error; use crate::attr; use crate::ast::{self, Ident, Attribute, ItemKind, Mod, Crate}; use crate::parse::{new_sub_parser_from_file, DirectoryOwnership}; -use crate::parse::token::{self, TokenKind}; +use crate::token::{self, TokenKind}; use crate::source_map::{SourceMap, Span, DUMMY_SP, FileName}; use crate::symbol::sym; +use errors::PResult; + use std::path::{self, Path, PathBuf}; /// Information about the path to a module. |
