Skip to content

fix top level attr spans #36539

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 22, 2016
Merged

fix top level attr spans #36539

merged 1 commit into from
Sep 22, 2016

Conversation

mikhail-m1
Copy link
Contributor

@rust-highfive
Copy link
Contributor

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

@mikhail-m1
Copy link
Contributor Author

r? @jonathandturner

@rust-highfive rust-highfive assigned sophiajt and unassigned pnkfelix Sep 16, 2016
@sophiajt
Copy link
Contributor

LGTM

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Sep 16, 2016

📌 Commit 82639d4 has been approved by jonathandturner

Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 17, 2016
@Manishearth
Rollup merge of rust-lang#36539 - mikhail-m1:36530, r=jonathandturner
d6aee61 
fix top level attr spans

issue rust-lang#36530
?r @jonathandturner
@Manishearth Manishearth mentioned this pull request Sep 17, 2016
Closed
@bors
Copy link
Collaborator

bors commented Sep 19, 2016

⌛ Testing commit 82639d4 with merge 9a760df...

@bors
Copy link
Collaborator

bors commented Sep 19, 2016

💔 Test failed - auto-win-gnu-32-opt-rustbuild

@sophiajt
Copy link
Contributor

@bors retry

Seems like something didn't get cleaned up from a previous build

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Sep 21, 2016
Rollup merge of rust-lang#36539 - mikhail-m1:36530, r=jonathandturner
3f48843 
fix top level attr spans

issue rust-lang#36530
?r @jonathandturner
@sophiajt sophiajt mentioned this pull request Sep 21, 2016
Closed
sophiajt pushed a commit to sophiajt/rust that referenced this pull request Sep 21, 2016
Rollup merge of rust-lang#36539 - mikhail-m1:36530, r=jonathandturner
60d08ea 
fix top level attr spans

issue rust-lang#36530
?r @jonathandturner
@sophiajt sophiajt mentioned this pull request Sep 21, 2016
Closed
@mikhail-m1
Copy link
Contributor Author

@jonathandturner should I do something to merge the PR?

@sophiajt
Copy link
Contributor

@mikhail-m1 - I think you're probably okay. I tried doing a few rollups but they failed because other PRs in the rollup failed.

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Sep 22, 2016
Rollup merge of rust-lang#36539 - mikhail-m1:36530, r=jonathandturner
3056630 
fix top level attr spans

issue rust-lang#36530
?r @jonathandturner
@sophiajt sophiajt mentioned this pull request Sep 22, 2016
Merged
bors added a commit that referenced this pull request Sep 22, 2016
@bors
Auto merge of #36651 - jonathandturner:rollup, r=jonathandturner
4c04e36 
Rollup of 7 pull requests

- Successful merges: #36330, #36423, #36539, #36571, #36589, #36600, #36632
- Failed merges:
@bors bors merged commit 82639d4 into rust-lang:master Sep 22, 2016
@pmarcelll
Copy link
Contributor

The linux buildbot failed today because of this PR.

@TimNN
Copy link
Contributor

TimNN commented Sep 23, 2016

The problem seems to be that the test during distcheck was run with a stable compiler (without a (valid) bootstrap key), I think.

@TimNN
Copy link
Contributor

TimNN commented Sep 23, 2016

Never mind, the actual problem is that the missing lines are not printed when stability is overridden with a bootstrap key, I think.

@TimNN TimNN mentioned this pull request Sep 23, 2016
Merged
@mikhail-m1 mikhail-m1 deleted the 36530 branch September 24, 2016 07:26
bors added a commit that referenced this pull request Sep 27, 2016
@bors
Auto merge of #36678 - TimNN:fix-dist, r=alexcrichton
d0623cf 
emit feature help in cheat mode (fix nightlies)

This should fix the `distcheck` failure in the latest nightly.

cc #36539

It's probably not ideal to check the environment that often and the code ist duplicated from `librustc/session/config.rs` but this was the easiest fix I could think of.

A cleaner solution would probably be to move the `unstable_features` from `Options` to `ParseSess` and change the `diag` parameter of `emit_feature_err` to take `ParseSess` instead of a `Handler`.
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@sophiajt sophiajt

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mikhail-m1 @rust-highfive @sophiajt @bors @pmarcelll @TimNN @pnkfelix