Allow more non-inline modules in blocks#36789

jseyfried · 2016-09-27T21:49:08Z

Currently, non-inline modules without a #[path] attribute are not allowed in blocks.
This PR allows non-inline modules that have an ancestor module with a #[path] attribute, provided there is not a nearer ancestor block.

For example,

fn main() {
    #[path = "..."] mod foo {
        mod bar; //< allowed by this PR
        fn f() {
            mod bar; //< still an error
        }
    }
}

Fixes #36772.
r? @nikomatsakis

jseyfried · 2016-09-27T21:59:33Z

c.f. #31534
cc @matklad

nikomatsakis

r=me with a comment on the field

nikomatsakis · 2016-09-28T19:07:17Z

src/libsyntax/ext/base.rs

I think this field could use a comment. The meaning of its name is not immediately obvious on its own, I'd say...

Good point.

jseyfried · 2016-09-28T22:17:28Z

@bors r=nikomatsakis

bors · 2016-09-28T22:17:29Z

📌 Commit 174f093 has been approved by nikomatsakis

@nikomatsakis

…r=nikomatsakis Allow more non-inline modules in blocks Currently, non-inline modules without a `#[path]` attribute are not allowed in blocks. This PR allows non-inline modules that have an ancestor module with a `#[path]` attribute, provided there is not a nearer ancestor block. For example, ```rust fn main() { #[path = "..."] mod foo { mod bar; //< allowed by this PR fn f() { mod bar; //< still an error } } } ``` Fixes rust-lang#36772. r? @nikomatsakis

Rollup of 12 pull requests - Successful merges: #35286, #35892, #36460, #36704, #36741, #36760, #36787, #36789, #36794, #36803, #36811, #36813 - Failed merges:

@nikomatsakis

parser: simplify directory ownership semantics This PR simplifies the semantics of "directory ownership". After this PR, - a non-inline module without a `#[path]` attribute (e.g. `mod foo;`) is allowed iff its parent module/block (whichever is nearer) is a directory owner, - an non-inline module is a directory owner iff its corresponding file is named `mod.rs` (c.f. [comment](#32401 (comment))), - a block is never a directory owner (c.f. #31534), and - an inline module is a directory owner iff either - its parent module/block is a directory owner (again, c.f. #31534), or - it has a `#[path]` attribute (c.f. #36789). These semantics differ from today's in three orthogonal ways: - `#[path = "foo.rs"] mod foo;` is no longer a directory owner. This is a [breaking-change]. - #36789 is generalized to apply to modules that are not directory owners in addition to blocks. - A macro-expanded non-inline module is only allowed where an ordinary non-inline module would be allowed. Today, we incorrectly allow macro-expanded non-inline modules in modules that are not directory owners (but not in blocks). This is a [breaking-change]. Fixes #32401. r? @nikomatsakis

rust-highfive assigned nikomatsakis Sep 27, 2016

jseyfried force-pushed the non_inline_mod_in_block branch from 23c2976 to 414c52b Compare September 27, 2016 22:00

nikomatsakis approved these changes Sep 28, 2016

View reviewed changes

jseyfried added 2 commits September 28, 2016 22:16

Allow non-inline modules in more places.

ce5ad1d

Add regression test.

174f093

jseyfried force-pushed the non_inline_mod_in_block branch from 414c52b to 174f093 Compare September 28, 2016 22:17

sophiajt mentioned this pull request Sep 29, 2016

Rollup of 12 pull requests #36818

Merged

bors merged commit 174f093 into rust-lang:master Sep 29, 2016

jseyfried deleted the non_inline_mod_in_block branch October 16, 2016 09:31

jseyfried mentioned this pull request Nov 5, 2016

parser: simplify directory ownership semantics #37602

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Allow more non-inline modules in blocks#36789