expand_include: set .directory to dir of included file.
#70184
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
rust-highfive
added
the
S-waiting-on-review
Centril
commented
Mar 20, 2020
| // If in the included file we have e.g., `mod bar;`, | ||
| // then the path of `bar.rs` should be relative to the directory of `file`. | ||
| // See https://github.com/rust-lang/rust/pull/69838/files#r395217057 for a discussion. | ||
| // `MacroExpander::fully_expand_fragment` later restores, so "stack discipline" is maintained. |
There was a problem hiding this comment.
This claim is a bit subtle, but this is what I inferred when reading the code in fully_expand_fragment. If this is not correct, then the alternative would be to add a flag to SyntaxExtension or something and deal with it in rustc_expand::expand.
Centril
force-pushed
the
include-mod-relativism
branch
from
41ddf8a
to
b005129
Compare
|
Since this broke perfbot, let's @bors try @rust-timer queue |
|
Awaiting bors try build completion |
|
⌛ Trying commit b00512957b66787288b5fcf6b038c62fdecb5c1c with merge 91eb0046f6433c4fa57c9f13e06b1f1a40a8afbe... |
This comment has been minimized.
This comment has been minimized.
Centril
force-pushed
the
include-mod-relativism
branch
from
b005129
to
0d018a5
Compare
|
@bors try |
|
⌛ Trying commit 0d018a5 with merge 901fd06b9208132d8546785157f8425b29097c36... |
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-author
|
@bors try |
|
⌛ Trying commit 0d018a5 with merge 259aa700bfbc530eb7162b752413d53edc80c060... |
|
💔 Test failed - checks-azure |
|
LGTM, r=me if all the necessary testing passes. |
|
The PR builder is passing, and the try builder doesn't want to start due to overbooked CI. So I guess we can just find out by checking the status of perf.rl.o a day later instead. @bors r=petrochenkov |
|
📌 Commit 0d018a5 has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 21, 2020
…etrochenkov expand_include: set `.directory` to dir of included file. Resolves the regression noted in rust-lang#69838. r? @petrochenkov cc @eddyb @Mark-Simulacrum
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 21, 2020
…etrochenkov expand_include: set `.directory` to dir of included file. Resolves the regression noted in rust-lang#69838. r? @petrochenkov cc @eddyb @Mark-Simulacrum
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 21, 2020
Rollup of 16 pull requests Successful merges: - rust-lang#65097 (Make std::sync::Arc compatible with ThreadSanitizer) - rust-lang#69033 (Use generator resume arguments in the async/await lowering) - rust-lang#69997 (add `Option::{zip,zip_with}` methods under "option_zip" gate) - rust-lang#70038 (Remove the call that makes miri fail) - rust-lang#70058 (can_begin_literal_maybe_minus: `true` on `"-"? lit` NTs.) - rust-lang#70111 (BTreeMap: remove shared root) - rust-lang#70139 (add delay_span_bug to TransmuteSizeDiff, just to be sure) - rust-lang#70165 (Remove the erase regions MIR transform) - rust-lang#70166 (Derive PartialEq, Eq and Hash for RangeInclusive) - rust-lang#70176 (Add tests for rust-lang#58319 and rust-lang#65131) - rust-lang#70177 (Fix oudated comment for NamedRegionMap) - rust-lang#70184 (expand_include: set `.directory` to dir of included file.) - rust-lang#70187 (more clippy fixes) - rust-lang#70188 (Clean up E0439 explanation) - rust-lang#70189 (Abi::is_signed: assert that we are a Scalar) - rust-lang#70194 (#[must_use] on split_off()) Failed merges: r? @ghost
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.
Resolves the regression noted in #69838.
r? @petrochenkov
cc @eddyb @Mark-Simulacrum