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

macros: fix the expected paths for a non-inline module matched by an item fragment #38205

Merged
merged 1 commit into from
Dec 17, 2016
Merged

macros: fix the expected paths for a non-inline module matched by an item fragment #38205

merged 1 commit into from
Dec 17, 2016

Conversation

jseyfried
Copy link
Contributor

Fixes #38190.
r? @nrc

@jseyfried
Copy link
Contributor Author

c.f. #38190 (comment) and #38190 (comment)

@jseyfried jseyfried mentioned this pull request Dec 7, 2016
Closed
@jseyfried jseyfried force-pushed the fix_module_directory_regression branch from a3f1fa2 to 19d47c5 Compare December 7, 2016 03:59
@jseyfried jseyfried force-pushed the fix_module_directory_regression branch from 19d47c5 to fd98a8d Compare December 7, 2016 10:57
@jseyfried jseyfried added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 16, 2016
@eddyb
Copy link
Member

eddyb commented Dec 16, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Dec 16, 2016

📌 Commit fd98a8d has been approved by eddyb

@alexcrichton
Copy link
Member

@bors: p=10

fixing a regression

@bors
Copy link
Contributor

bors commented Dec 17, 2016

⌛ Testing commit fd98a8d with merge f99d4df...

bors added a commit that referenced this pull request Dec 17, 2016
@bors
Auto merge of #38205 - jseyfried:fix_module_directory_regression, r=e…
f99d4df 
…ddyb

macros: fix the expected paths for a non-inline module matched by an `item` fragment

Fixes #38190.
r? @nrc
@bors
Copy link
Contributor

bors commented Dec 17, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: eddyb
Pushing f99d4df to master...

@bors bors merged commit fd98a8d into rust-lang:master Dec 17, 2016
@brson brson added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Dec 17, 2016
@brson
Copy link
Contributor

brson commented Dec 17, 2016

Discussed with @eddyb and @jseyfried on IRC the risk is expected to be low, so I'm pulling this into the beta and stable branches then immediately starting a stable build.

@brson
Copy link
Contributor

brson commented Dec 17, 2016

cc @rust-lang/compiler

@brson
Copy link
Contributor

brson commented Dec 17, 2016

This does not apply cleanly. Not backporting.

@jseyfried jseyfried deleted the fix_module_directory_regression branch December 18, 2016 05:57
@jseyfried
Copy link
Contributor Author

@brson
The regression that this fixes, #38190, was introduced in e2b3fec.
Could we instead revert e2b3fec for the next release? It should apply cleanly, and I am very confident that there will not be unintended consequences.

@alexcrichton
Copy link
Member

This didn't make it into 1.14, but it's on the 1.15 beta branch, so de-nominating.

@alexcrichton alexcrichton removed beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Dec 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddyb eddyb eddyb approved these changes

Assignees

@nrc nrc

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jseyfried @eddyb @bors @alexcrichton @brson @nrc