Treat #[path] files as mod.rs files #47298
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kennytm
added
T-lang
|
@bors r+ |
|
📌 Commit 7b420cf has been approved by |
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Jan 11, 2018
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
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
nikomatsakis
added
the
beta-accepted
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Jan 12, 2018
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
|
@bors p=1 (unbreaks ring) |
Mark-Simulacrum
added
S-waiting-on-bors
musoke
added a commit
to musoke/ruma-signatures
that referenced
this pull request
Jan 17, 2018
This reverts commit c415ef2. This was fixed in nightly: rust-lang/rust#47298
alexcrichton
removed
the
beta-nominated
musoke
added a commit
to musoke/olm-rs
that referenced
this pull request
Jan 20, 2018
This reverts commit 853a5bc. Fixed in nightly rust by rust-lang/rust#47298
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #46936, cc @briansmith, @SergioBenitez, @nikomatsakis.
This (insta-stable) change treats files included via
#[path = "bla.rs"] mod foo;as though they weremod.rsfiles. Namely, it allows them to includemodstatements and looks for the child modules in sibling directories, rather than in relativemodname/childmodule.rsfiles as happens for non-mod.rsfiles.This change makes the
non_modrs_modsfeature 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