Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove non-inline modules in blocks #2384

Merged
merged 1 commit into from
Feb 12, 2016
Merged

Conversation

jseyfried
Copy link
Contributor

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

macro_rules! declare_mod {
($name:ident) => ( pub mod $name; )
}
each_subcommand!(declare_mod);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, I'm kinda surprised that this doesn't require the path to the source file to be src/bin/subcommands/foo.rs...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it should require that. Right now, macro-expanded non-inline module declarations are always treated as if they were at the file root due to a bug in the macro expander.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wheeeeeee

@alexcrichton
Copy link
Member

@bors: r+ d521a9a

Also for onlookers, this is to ward of the upcoming breakage of rust-lang/rust#31534

bors added a commit that referenced this pull request Feb 12, 2016
@bors
Copy link
Contributor

bors commented Feb 12, 2016

⌛ Testing commit d521a9a with merge 2e267ec...

@bors
Copy link
Contributor

bors commented Feb 12, 2016

@bors bors merged commit d521a9a into rust-lang:master Feb 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants