Add an option to the parser to avoid parsing out of line modules#42071

nrc · 2017-05-17T22:41:32Z

This is useful if parsing from stdin or a String and don't want to try and read in a module from another file. Instead we just leave a stub in the AST.

rust-highfive · 2017-05-17T22:41:41Z

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

This is useful if parsing from stdin or a String and don't want to try and read in a module from another file. Instead we just leave a stub in the AST.

carols10cents · 2017-05-22T16:46:16Z

ping @nikomatsakis, pinging you on IRC too!

nikomatsakis

Looks good. r=me with or without changing the order of the arguments to Parser::new

nikomatsakis · 2017-05-22T17:49:30Z

src/libsyntax/attr.rs

        where F: FnMut(&mut Parser<'a>) -> PResult<'a, T>,
    {
-        let mut parser = Parser::new(sess, self.tokens.clone(), None, false);
+        let mut parser = Parser::new(sess, self.tokens.clone(), None, false, false);


Are you just using false here because we don't expect inline modules in attributes? In other words, we don't expect this option to matter here one way or the other, right?

nikomatsakis · 2017-05-22T17:52:33Z

src/libsyntax/parse/parser.rs

    pub fn new(sess: &'a ParseSess,
               tokens: TokenStream,
               directory: Option<Directory>,
+               recurse_into_file_modules: bool,


I don't really care, but adding the new argument "next-to-last" seems a bit error-prone, as I imagine people may be inclined add the new argument at the end of the list. More generally, having a lot of booleans is a crappy API, it'd be sort of nice to make this a builder-style thing... but I guess that's for another PR.

I put it here to be next to the directory option since they are related. My first attempt tried to combine the two into an enum, but it was really grotty. Builder would be best I guess, but yeah, later.

nrc · 2017-05-24T03:25:36Z

@bors: r=nikomatsakis

bors · 2017-05-24T03:25:37Z

📌 Commit a256630 has been approved by nikomatsakis

Add an option to the parser to avoid parsing out of line modules This is useful if parsing from stdin or a String and don't want to try and read in a module from another file. Instead we just leave a stub in the AST.

Rollup of 16 pull requests - Successful merges: #41700, #41980, #42052, #42071, #42120, #42134, #42141, #42142, #42149, #42150, #42159, #42177, #42186, #42191, #42195, #42198 - Failed merges:

Add an option to the parser to avoid parsing out of line modules This is useful if parsing from stdin or a String and don't want to try and read in a module from another file. Instead we just leave a stub in the AST.

Rollup of 15 pull requests - Successful merges: #41980, #42071, #42120, #42134, #42141, #42142, #42149, #42150, #42159, #42177, #42186, #42191, #42195, #42198, #42211 - Failed merges:

rust-highfive assigned nikomatsakis May 17, 2017

This was referenced May 17, 2017

stdin formatting fails if mod file not found rust-lang/rustfmt#562

Closed

Better Rustfmt integration rust-lang/rls#3

Closed

Add an option to the parser to avoid parsing out of line modules

a256630

This is useful if parsing from stdin or a String and don't want to try and read in a module from another file. Instead we just leave a stub in the AST.

nrc force-pushed the parse-mods branch from 43f311e to a256630 Compare May 17, 2017 23:03

aidanhs added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 18, 2017

nikomatsakis approved these changes May 22, 2017

View reviewed changes

nikomatsakis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 23, 2017

nrc added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 24, 2017

Mark-Simulacrum mentioned this pull request May 24, 2017

Rollup of 14 pull requests #42193

Closed

Mark-Simulacrum mentioned this pull request May 24, 2017

Rollup of 17 pull requests #42199

Closed

Mark-Simulacrum mentioned this pull request May 24, 2017

Rollup of 16 pull requests #42203

Closed

Mark-Simulacrum mentioned this pull request May 25, 2017

Rollup of 16 pull requests #42209

Closed

Mark-Simulacrum mentioned this pull request May 25, 2017

Rollup of 15 pull requests #42212

Merged

bors merged commit a256630 into rust-lang:master May 25, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add an option to the parser to avoid parsing out of line modules#42071