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

rustc: keep a Span for each predicate in ty::GenericPredicates. #54278

Merged
merged 1 commit into from
Sep 29, 2018
Merged

rustc: keep a Span for each predicate in ty::GenericPredicates. #54278

merged 1 commit into from
Sep 29, 2018

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Sep 16, 2018

This should allow finer-grained diagnostics, including migration suggestions for #54090.
(Note that I haven't changed most of the users of predicates_of to use the new spans)

r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 16, 2018
@eddyb
Copy link
Member Author

eddyb commented Sep 16, 2018

@bors try (for perf)

@bors
Copy link
Contributor

bors commented Sep 16, 2018

⌛ Trying commit 7317a8733798b56191d44722a5ae603ae3bf25cd with merge b52271b1bac1d1dcc839f7242fd40a5264df021a...

@bors
Copy link
Contributor

bors commented Sep 16, 2018

☀️ Test successful - status-travis
State: approved= try=True

@eddyb
Copy link
Member Author

eddyb commented Sep 16, 2018

@rust-timer build b52271b1bac1d1dcc839f7242fd40a5264df021a

@rust-timer
Copy link
Collaborator

Success: Queued b52271b1bac1d1dcc839f7242fd40a5264df021a with parent 32dc5a0, comparison URL.

@eddyb
Copy link
Member Author

eddyb commented Sep 17, 2018

Results are in, and it looks mostly like noise, AFAICT.

@Mark-Simulacrum
Copy link
Member

Yes, this is probably just noise.

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 17, 2018

📌 Commit 7317a8733798b56191d44722a5ae603ae3bf25cd 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 Sep 17, 2018
@bors
Copy link
Contributor

bors commented Sep 21, 2018

☔ The latest upstream changes (presumably #54389) made this pull request unmergeable. Please resolve the merge conflicts.

@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 Sep 21, 2018
@nikomatsakis
Copy link
Contributor

@eddyb (needs rebase)

@eddyb

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@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 Sep 28, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
@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 Sep 28, 2018
@eddyb
Copy link
Member Author

eddyb commented Sep 28, 2018

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Sep 28, 2018

📌 Commit 7020326 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 Sep 28, 2018
@bors
Copy link
Contributor

bors commented Sep 28, 2018

⌛ Testing commit 7020326 with merge 1808374...

bors added a commit that referenced this pull request Sep 28, 2018
@bors
Auto merge of #54278 - eddyb:spanned-generic-predicates, r=nikomatsakis
1808374 
rustc: keep a Span for each predicate in ty::GenericPredicates.

This should allow finer-grained diagnostics, including migration suggestions for #54090.
(Note that I haven't changed most of the users of `predicates_of` to use the new spans)

r? @nikomatsakis
@bors
Copy link
Contributor

bors commented Sep 28, 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 Sep 28, 2018
@rust-highfive
Copy link
Collaborator

The job dist-armhf-linux 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. 
travis_fold:end:system_info

Network availability confirmed.
Setting APT mirror in /etc/apt/sources.list: http://us-central1.gce.archive.ubuntu.com/ubuntu/
travis_fold:start:update_heroku
Updating Heroku
$ heroku version
heroku/7.16.0 linux-x64 node-v10.10.0
travis_fold:end:update_heroku
Installing APT Packages
travis_time:start:04c4a430
$ travis_apt_get_update
travis_time:end:04c4a430:start=1538151962239924161,finish=1538151967100646550,duration=4860722389
---
travis_time:end:180884c3:start=1538153320768074543,finish=1538153320772725633,duration=4651090
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:264e255c
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:2226de24
travis_time:start:2226de24
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0b436af8
$ dmesg | grep -i kill

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 Sep 28, 2018

@bors retry (looks spurious)

@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 Sep 28, 2018
@bors
Copy link
Contributor

bors commented Sep 28, 2018

⌛ Testing commit 7020326 with merge a062cc3138ee0f3ca09e5a05bbb41048512bfdc4...

@bors
Copy link
Contributor

bors commented Sep 28, 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 Sep 28, 2018
@rust-highfive
Copy link
Collaborator

The job armhf-gnu 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. 
travis_fold:end:system_info

Network availability confirmed.
Setting APT mirror in /etc/apt/sources.list: http://us-central1.gce.archive.ubuntu.com/ubuntu/
travis_fold:start:update_heroku
Updating Heroku
$ heroku version
heroku/7.16.0 linux-x64 node-v10.10.0
travis_fold:end:update_heroku
Installing APT Packages
travis_time:start:1d7443cd
$ travis_apt_get_update
travis_time:end:1d7443cd:start=1538155513587701318,finish=1538155518650530375,duration=5062829057
---
travis_time:end:2d20ceb0:start=1538156950544824010,finish=1538156950549677645,duration=4853635
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:07cf7e12
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:02028ca5
travis_time:start:02028ca5
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:02c28c0d
$ dmesg | grep -i kill

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 Sep 28, 2018

Okay this keeps happening, am I missing something in the logs?
cc @rust-lang/infra

@alexcrichton
Copy link
Member

@bors: retry

@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 Sep 28, 2018
@bors
Copy link
Contributor

bors commented Sep 29, 2018

⌛ Testing commit 7020326 with merge 6622172...

bors added a commit that referenced this pull request Sep 29, 2018
@bors
Auto merge of #54278 - eddyb:spanned-generic-predicates, r=nikomatsakis
6622172 
rustc: keep a Span for each predicate in ty::GenericPredicates.

This should allow finer-grained diagnostics, including migration suggestions for #54090.
(Note that I haven't changed most of the users of `predicates_of` to use the new spans)

r? @nikomatsakis
@bors
Copy link
Contributor

bors commented Sep 29, 2018

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

@bors bors merged commit 7020326 into rust-lang:master Sep 29, 2018
This was referenced Sep 29, 2018
Merged
Merged
@eddyb eddyb deleted the spanned-generic-predicates branch September 29, 2018 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@eddyb @bors @rust-timer @Mark-Simulacrum @nikomatsakis @rust-highfive @alexcrichton