about summary refs log tree commit diff
path: root/src/libsyntax/parse/parser/module.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-09-07 18:02:22 +0000
committerbors <bors@rust-lang.org>2019-09-07 18:02:22 +0000
commit43a5ff4222e1f217ac14331afd59f82ec4204d12 (patch)
tree77d362c6a5a0a963f321158252b7b224ea7acc70 /src/libsyntax/parse/parser/module.rs
parentef54f57c5b9d894a38179d09b00610c1b337b086 (diff)
parent635c3bcc3cd9fcd80380572de0efb905224a8fa0 (diff)
downloadrust-43a5ff4222e1f217ac14331afd59f82ec4204d12.tar.gz
rust-43a5ff4222e1f217ac14331afd59f82ec4204d12.zip
Auto merge of #64264 - Centril:rollup-w1khzun, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #64023 (libstd fuchsia fixes)
 - #64098 (Ensure edition lints and internal lints are enabled with deny-warnings=false)
 - #64139 (Migrate internal diagnostic registration to macro_rules)
 - #64226 (Aggregation of cosmetic changes made during work on REPL PRs: libsyntax)
 - #64227 (Aggregation of cosmetic changes made during work on REPL PRs: librustc)
 - #64235 (Upgrade env_logger to 0.6)
 - #64258 (compiletest: Match suffixed environments)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libsyntax/parse/parser/module.rs')
-rw-r--r--src/libsyntax/parse/parser/module.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser/module.rs b/src/libsyntax/parse/parser/module.rs
index 3f6f87b1c44..2d2fb487d7d 100644
--- a/src/libsyntax/parse/parser/module.rs
+++ b/src/libsyntax/parse/parser/module.rs
@@ -36,12 +36,12 @@ impl<'a> Parser<'a> {
         krate
     }
 
-    /// Parse a `mod <foo> { ... }` or `mod <foo>;` item
+    /// Parses a `mod <foo> { ... }` or `mod <foo>;` item.
     pub(super) fn parse_item_mod(&mut self, outer_attrs: &[Attribute]) -> PResult<'a, ItemInfo> {
         let (in_cfg, outer_attrs) = {
             let mut strip_unconfigured = crate::config::StripUnconfigured {
                 sess: self.sess,
-                features: None, // don't perform gated feature checking
+                features: None, // Don't perform gated feature checking.
             };
             let mut outer_attrs = outer_attrs.to_owned();
             strip_unconfigured.process_cfg_attrs(&mut outer_attrs);
@@ -57,7 +57,7 @@ impl<'a> Parser<'a> {
                     self.submod_path(id, &outer_attrs, id_span)?;
                 let (module, mut attrs) =
                     self.eval_src_mod(path, directory_ownership, id.to_string(), id_span)?;
-                // Record that we fetched the mod from an external file
+                // Record that we fetched the mod from an external file.
                 if warn {
                     let attr = attr::mk_attr_outer(
                         attr::mk_word_item(Ident::with_dummy_span(sym::warn_directory_ownership)));