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.

Sign up for GitHub

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

Jump to bottom

Treat #[path] files as mod.rs files #47298

Merged
merged 1 commit into from
Jan 12, 2018
Merged

Treat #[path] files as mod.rs files #47298

merged 1 commit into from
Jan 12, 2018

Conversation

cramertj
Copy link
Member

@cramertj cramertj commented Jan 9, 2018 •
edited
Loading

Fixes #46936, cc @briansmith, @SergioBenitez, @nikomatsakis.

This (insta-stable) change treats files included via #[path = "bla.rs"] mod foo; as though they were mod.rs files. Namely, it allows them to include mod statements and looks for the child modules in sibling directories, rather than in relative modname/childmodule.rs files as happens for non-mod.rs files.

This change makes the non_modrs_mods feature backwards compatible with the existing usage in https://github.com/briansmith/ring, several versions of which are currently broken in beta. If we decide to merge, this change should be backported to beta.

cc #37872

r? @jseyfried

@kennytm kennytm added T-lang Relevant to the language team, which will review and decide on the PR/issue. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jan 10, 2018
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jan 10, 2018

📌 Commit 7b420cf has been approved by nikomatsakis

@kennytm kennytm mentioned this pull request Jan 10, 2018
Closed
kennytm added a commit to kennytm/rust that referenced this pull request Jan 11, 2018
@kennytm
Rollup merge of rust-lang#47298 - cramertj:path-as-modrs, r=nikomatsakis
0323654 
Treat #[path] files as mod.rs files

Fixes rust-lang#46936, cc @briansmith, @SergioBenitez, @nikomatsakis.

This (insta-stable) change treats files included via `#[path = "bla.rs"] mod foo;` as though they were `mod.rs` files. Namely, it allows them to include `mod` statements and looks for the child modules in sibling directories, rather than in relative `modname/childmodule.rs` files as happens for non-`mod.rs` files.

This change makes the `non_modrs_mods` feature backwards compatible with the existing usage in https://github.com/briansmith/ring, several versions of which are currently broken in beta. If we decide to merge, this change should be backported to beta.

cc rust-lang#37872

r? @jseyfried
kennytm added a commit to kennytm/rust that referenced this pull request Jan 11, 2018
@kennytm
Rollup merge of rust-lang#47298 - cramertj:path-as-modrs, r=nikomatsakis
530c155 
Treat #[path] files as mod.rs files

Fixes rust-lang#46936, cc @briansmith, @SergioBenitez, @nikomatsakis.

This (insta-stable) change treats files included via `#[path = "bla.rs"] mod foo;` as though they were `mod.rs` files. Namely, it allows them to include `mod` statements and looks for the child modules in sibling directories, rather than in relative `modname/childmodule.rs` files as happens for non-`mod.rs` files.

This change makes the `non_modrs_mods` feature backwards compatible with the existing usage in https://github.com/briansmith/ring, several versions of which are currently broken in beta. If we decide to merge, this change should be backported to beta.

cc rust-lang#37872

r? @jseyfried
@kennytm kennytm mentioned this pull request Jan 11, 2018
Closed
bors added a commit that referenced this pull request Jan 11, 2018
@bors
Auto merge of #47350 - kennytm:rollup, r=kennytm
27270e6 
Rollup of 12 pull requests

- Successful merges: #47283, #47288, #47289, #47298, #47305, #47307, #47310, #47322, #47324, #47328, #47340, #47344
- Failed merges:
@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 11, 2018
bors added a commit that referenced this pull request Jan 12, 2018
@bors
Auto merge of #47350 - kennytm:rollup, r=kennytm
712e755 
Rollup of 12 pull requests

- Successful merges: #47283, #47288, #47289, #47298, #47305, #47307, #47310, #47322, #47324, #47328, #47340, #47344
- Failed merges:
kennytm added a commit to kennytm/rust that referenced this pull request Jan 12, 2018
@kennytm
Rollup merge of rust-lang#47298 - cramertj:path-as-modrs, r=nikomatsakis
e40a6fb 
Treat #[path] files as mod.rs files

Fixes rust-lang#46936, cc @briansmith, @SergioBenitez, @nikomatsakis.

This (insta-stable) change treats files included via `#[path = "bla.rs"] mod foo;` as though they were `mod.rs` files. Namely, it allows them to include `mod` statements and looks for the child modules in sibling directories, rather than in relative `modname/childmodule.rs` files as happens for non-`mod.rs` files.

This change makes the `non_modrs_mods` feature backwards compatible with the existing usage in https://github.com/briansmith/ring, several versions of which are currently broken in beta. If we decide to merge, this change should be backported to beta.

cc rust-lang#37872

r? @jseyfried
@kennytm kennytm mentioned this pull request Jan 12, 2018
Merged
bors added a commit that referenced this pull request Jan 12, 2018
@bors
Auto merge of #47392 - kennytm:rollup, r=kennytm
51b0b37 
Rollup of 24 pull requests

- Successful merges: #46985, #47069, #47081, #47185, #47282, #47283, #47288, #47289, #47298, #47305, #47306, #47307, #47310, #47324, #47328, #47331, #47340, #47343, #47344, #47352, #47357, #47365, #47375, #47382
- Failed merges: #47334
@Mark-Simulacrum
Copy link
Member

@bors p=1 (unbreaks ring)

@Mark-Simulacrum Mark-Simulacrum 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 12, 2018
@cramertj cramertj mentioned this pull request Jan 12, 2018
Merged
bors added a commit that referenced this pull request Jan 12, 2018
@bors
Auto merge of #47399 - cramertj:modrs-backport, r=Mark-Simulacrum
bb9be9e 
Backport #47298 to beta

#47298
@bors bors merged commit 7b420cf into rust-lang:master Jan 12, 2018
@cramertj cramertj deleted the path-as-modrs branch January 12, 2018 23:34
@mati865 mati865 mentioned this pull request Jan 12, 2018
Merged
@SergioBenitez SergioBenitez mentioned this pull request Jan 13, 2018
Closed
musoke added a commit to musoke/ruma-signatures that referenced this pull request Jan 17, 2018
@musoke
Revert "Update ring to work with latest nightly rust"
adc7e56 
This reverts commit c415ef2.

This was fixed in nightly:
rust-lang/rust#47298
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 18, 2018
musoke added a commit to musoke/olm-rs that referenced this pull request Jan 20, 2018
@musoke
Revert "fix(ring): Upgrade to patched version on ring"
84e7da2 
This reverts commit 853a5bc.

Fixed in nightly rust by rust-lang/rust#47298
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jan 28, 2018
Closed
@cramertj cramertj mentioned this pull request Oct 19, 2018
Merged
@ehuss ehuss mentioned this pull request Aug 3, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jseyfried jseyfried

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-lang Relevant to the language team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@cramertj @nikomatsakis @bors @Mark-Simulacrum @alexcrichton @kennytm @jseyfried