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

Include bounds in generic re-ordering diagnostic #59572

Merged
merged 2 commits into from Mar 31, 2019

Conversation

Projects
None yet
6 participants
@davidtwco
Copy link
Member

davidtwco commented Mar 30, 2019

Fixes #59508.

r? @estebank
cc @varkor

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

rust-highfive commented Mar 30, 2019

The job x86_64-gnu-llvm-6.0 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_time:end:069d02d8:start=1553976020371508047,finish=1553976096154014026,duration=75782505979
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---

[00:04:31] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:31] tidy error: /checkout/src/librustc_passes/ast_validation.rs:357: line longer than 100 chars
[00:04:32] some tidy checks failed
[00:04:32] 
[00:04:32] 
[00:04:32] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:32] 
[00:04:32] 
[00:04:32] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:32] Build completed unsuccessfully in 0:00:47
[00:04:32] Build completed unsuccessfully in 0:00:47
[00:04:32] Makefile:67: recipe for target 'tidy' failed
[00:04:32] make: *** [tidy] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:00f0eece
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sat Mar 30 20:06:18 UTC 2019
---
travis_time:end:106a8e33:start=1553976378968155704,finish=1553976378973239856,duration=5084152
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1f37eee7
$ 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:14b97fd0
travis_time:start:14b97fd0
$ 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:08a8eede
$ 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)

@davidtwco davidtwco force-pushed the davidtwco:issue-59508 branch from 51a5aa1 to d441c99 Mar 30, 2019

@varkor

varkor approved these changes Mar 30, 2019

Copy link
Member

varkor left a comment

Thanks! r=me with typos fixed.

Show resolved Hide resolved src/test/ui/issue-59508-1.rs Outdated
Show resolved Hide resolved src/test/ui/issue-59508.fixed Outdated
Show resolved Hide resolved src/test/ui/issue-59508.rs Outdated

davidtwco added some commits Mar 30, 2019

Include bounds in generic reordering diagnostic.
This commit extends the existing generic re-ordering diagnostic to
include any bounds on the generic parameter, thus producing correct
suggestions.
Only mention const generics if enabled.
This commit updates the generic parameter re-ordering diagnostic to only
mention const generics if the feature is enabled.

@davidtwco davidtwco force-pushed the davidtwco:issue-59508 branch from d441c99 to 0270d56 Mar 30, 2019

@davidtwco

This comment has been minimized.

Copy link
Member Author

davidtwco commented Mar 31, 2019

@bors r=varkor
r? @varkor

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Mar 31, 2019

📌 Commit 0270d56 has been approved by varkor

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Mar 31, 2019

⌛️ Testing commit 0270d56 with merge 0dccd92...

bors added a commit that referenced this pull request Mar 31, 2019

Auto merge of #59572 - davidtwco:issue-59508, r=varkor
Include bounds in generic re-ordering diagnostic

Fixes #59508.

r? @estebank
cc @varkor

Centril added a commit to Centril/rust that referenced this pull request Mar 31, 2019

Rollup merge of rust-lang#59572 - davidtwco:issue-59508, r=varkor
Include bounds in generic re-ordering diagnostic

Fixes rust-lang#59508.

r? @estebank
cc @varkor
@Centril

This comment has been minimized.

Copy link
Contributor

Centril commented Mar 31, 2019

Rolled up into #59579, @bors retry

bors added a commit that referenced this pull request Mar 31, 2019

Auto merge of #59579 - Centril:rollup, r=Centril
Rollup of 4 pull requests

Successful merges:

 - #58828 (libstd: deny(elided_lifetimes_in_paths))
 - #59234 (Mention `no merge policy` in the CONTRIBUTING guide)
 - #59572 (Include bounds in generic re-ordering diagnostic)
 - #59574 (Distinguish message for external macros depending on error level)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Mar 31, 2019

Rollup merge of rust-lang#59572 - davidtwco:issue-59508, r=varkor
Include bounds in generic re-ordering diagnostic

Fixes rust-lang#59508.

r? @estebank
cc @varkor

bors added a commit that referenced this pull request Mar 31, 2019

Auto merge of #59582 - Centril:rollup, r=Centril
Rollup of 5 pull requests

Successful merges:

 - #58828 (libstd: deny(elided_lifetimes_in_paths))
 - #59234 (Mention `no merge policy` in the CONTRIBUTING guide)
 - #59572 (Include bounds in generic re-ordering diagnostic)
 - #59574 (Distinguish message for external macros depending on error level)
 - #59577 (Fix LLVM IR generated for C-variadic arguments)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Mar 31, 2019

Rollup merge of rust-lang#59572 - davidtwco:issue-59508, r=varkor
Include bounds in generic re-ordering diagnostic

Fixes rust-lang#59508.

r? @estebank
cc @varkor

bors added a commit that referenced this pull request Mar 31, 2019

Auto merge of #59584 - Centril:rollup, r=Centril
Rollup of 4 pull requests

Successful merges:

 - #58828 (libstd: deny(elided_lifetimes_in_paths))
 - #59234 (Mention `no merge policy` in the CONTRIBUTING guide)
 - #59572 (Include bounds in generic re-ordering diagnostic)
 - #59574 (Distinguish message for external macros depending on error level)

Failed merges:

r? @ghost

@bors bors merged commit 0270d56 into rust-lang:master Mar 31, 2019

1 check was pending

homu Testing commit 0270d565d9f6287bce6a7e64e55aac245288541e with merge 0dccd9284b4f68a54b6683dd90d687dc4cc1f750...
Details

@davidtwco davidtwco deleted the davidtwco:issue-59508 branch Apr 7, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.