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.

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

[MIR] Change "scopes" from "visibility scopes" to "source scopes". #51182

Merged
merged 7 commits into from
May 31, 2018

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented May 29, 2018

These scopes are already used for source-oriented diagnostics, lint levels and unsafety checks.
This PR generalizes the naming around scopes, making the type SourceScope, and flips (across several commits) the relationship/priority between LocalDecl's "visibility" and "syntactic" scopes.

r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 29, 2018
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 29, 2018

📌 Commit b79c898 has been approved by nikomatsakis

@bors bors 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 May 29, 2018
@nikomatsakis
Copy link
Contributor

beautiful little windy path :)

@bors
Copy link
Contributor

bors commented May 30, 2018

🔒 Merge conflict

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 30, 2018
@eddyb eddyb force-pushed the not-just-visibility branch from b79c898 to 06d88cd Compare May 30, 2018 17:30
@eddyb
Copy link
Member Author

eddyb commented May 30, 2018

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented May 30, 2018

📌 Commit 06d88cd has been approved by nikomatsakis

@bors bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 30, 2018
@bors
Copy link
Contributor

bors commented May 31, 2018

⌛ Testing commit 06d88cd with merge badfd1765de7d46edd6f0f7ccf0a102245fc3d33...

@bors
Copy link
Contributor

bors commented May 31, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 31, 2018
@rust-highfive
Copy link
Collaborator

The job dist-x86_64-linux-alt of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[01:05:28] [TIMING] Analysis { compiler: Compiler { stage: 2, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu" } -- 2.633
[01:05:28] Dist src
[01:05:39] [TIMING] Src -- 10.642
[01:05:39] Create plain source tarball
[01:06:23] curl: (6) Couldn't resolve host 's3-us-west-1.amazonaws.com'
[01:07:03] curl: (6) Couldn't resolve host 's3-us-west-1.amazonaws.com'
[01:07:43] curl: (6) Couldn't resolve host 's3-us-west-1.amazonaws.com'
[01:07:43] thread 'main' panicked at 'failed to download openssl source: exit code: 6', bootstrap/native.rs:575:17
[01:07:43] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
[01:07:43] Build completed unsuccessfully in 1:02:43
travis_time:end:056ba009:start=1527744597679454020,finish=1527748661807448482,duration=4064127994462

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

1 similar comment
@rust-highfive
Copy link
Collaborator

The job dist-x86_64-linux-alt of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[01:05:28] [TIMING] Analysis { compiler: Compiler { stage: 2, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu" } -- 2.633
[01:05:28] Dist src
[01:05:39] [TIMING] Src -- 10.642
[01:05:39] Create plain source tarball
[01:06:23] curl: (6) Couldn't resolve host 's3-us-west-1.amazonaws.com'
[01:07:03] curl: (6) Couldn't resolve host 's3-us-west-1.amazonaws.com'
[01:07:43] curl: (6) Couldn't resolve host 's3-us-west-1.amazonaws.com'
[01:07:43] thread 'main' panicked at 'failed to download openssl source: exit code: 6', bootstrap/native.rs:575:17
[01:07:43] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
[01:07:43] Build completed unsuccessfully in 1:02:43
travis_time:end:056ba009:start=1527744597679454020,finish=1527748661807448482,duration=4064127994462

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@eddyb
Copy link
Member Author

eddyb commented May 31, 2018

@bors retry

  • network issues

@bors bors 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 May 31, 2018
@bors
Copy link
Contributor

bors commented May 31, 2018

⌛ Testing commit 06d88cd with merge 30cae58...

bors added a commit that referenced this pull request May 31, 2018
[MIR] Change "scopes" from "visibility scopes" to "source scopes".

These scopes are already used for source-oriented diagnostics, lint levels and unsafety checks.
This PR generalizes the naming around scopes, making the type `SourceScope`, and flips (across several commits) the relationship/priority between `LocalDecl`'s "visibility" and "syntactic" scopes.

r? @nikomatsakis
@bors
Copy link
Contributor

bors commented May 31, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 30cae58 to master...

@bors bors merged commit 06d88cd into rust-lang:master May 31, 2018
@bors bors mentioned this pull request May 31, 2018
11 tasks
@eddyb eddyb deleted the not-just-visibility branch May 31, 2018 11:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants