Apply proper commit from PR #63934 #66590

Aaron1011 · 2019-11-20T22:17:53Z

While working on PR #63934, I accidentally reverted to an older version
of the PR while working on a rebase. The PR was then merged, not with
the later, approved changes, but with earlier, unapproved changes.

This PR applies the changes that were suppoesd to be mereged in
PR #63934. All of the proper tests appear to have been merged
in PR #63934, so this PR adds no new tests

rust-highfive · 2019-11-20T22:17:57Z

r? @petrochenkov

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

Centril · 2019-11-20T22:23:01Z

r? @varkor or maybe @nikomatsakis

Aaron1011 · 2019-11-20T22:25:21Z

@Centril: Added

rust-highfive · 2019-11-20T22:37:26Z

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, 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.

2019-11-20T22:25:46.8668907Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-20T22:25:46.8865123Z ##[command]git config gc.auto 0
2019-11-20T22:25:46.8973537Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-20T22:25:46.9067982Z ##[command]git config --get-all http.proxy
2019-11-20T22:25:46.9277939Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66590/merge:refs/remotes/pull/66590/merge
---
2019-11-20T22:37:03.8313587Z     |
2019-11-20T22:37:03.8314621Z 532 |             false
2019-11-20T22:37:03.8315094Z     |             ^^^^^ expected enum `std::option::Option`, found bool
2019-11-20T22:37:03.8315330Z     |
2019-11-20T22:37:03.8315653Z     = note: expected type `std::option::Option<&'tcx ty::TyS<'tcx>>`
2019-11-20T22:37:03.8315963Z 
2019-11-20T22:37:10.6203681Z error: aborting due to previous error
2019-11-20T22:37:10.6203784Z 
2019-11-20T22:37:10.6204088Z For more information about this error, try `rustc --explain E0308`.
---
2019-11-20T22:37:18.3653101Z   local time: Wed Nov 20 22:37:18 UTC 2019
2019-11-20T22:37:18.4176308Z   network time: Wed, 20 Nov 2019 22:37:18 GMT
2019-11-20T22:37:18.4176389Z == end clock drift check ==
2019-11-20T22:37:19.3606268Z 
2019-11-20T22:37:19.3746150Z ##[error]Bash exited with code '1'.
2019-11-20T22:37:19.3780073Z ##[section]Starting: Checkout
2019-11-20T22:37:19.3783501Z ==============================================================================
2019-11-20T22:37:19.3783561Z Task         : Get sources
2019-11-20T22:37:19.3783608Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

rust-highfive · 2019-11-20T22:47:19Z

Your PR failed (pretty log, 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.

2019-11-20T22:45:47.7700590Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-20T22:45:48.3641871Z ##[command]git config gc.auto 0
2019-11-20T22:45:48.3644989Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-20T22:45:48.3647613Z ##[command]git config --get-all http.proxy
2019-11-20T22:45:48.3653700Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66590/merge:refs/remotes/pull/66590/merge

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)

rust-highfive · 2019-11-20T22:59:46Z

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, 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.

2019-11-20T22:49:12.1655171Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-20T22:49:12.1843070Z ##[command]git config gc.auto 0
2019-11-20T22:49:12.1904120Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-20T22:49:12.1960672Z ##[command]git config --get-all http.proxy
2019-11-20T22:49:12.2095924Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66590/merge:refs/remotes/pull/66590/merge
---
2019-11-20T22:58:17.5425093Z    Compiling fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
2019-11-20T22:58:55.2604265Z error: unused variable: `did`
2019-11-20T22:58:55.2612023Z    --> src/librustc/traits/coherence.rs:506:20
2019-11-20T22:58:55.2612541Z     |
2019-11-20T22:58:55.2612987Z 506 |         ty::Opaque(did, _) => {
2019-11-20T22:58:55.2613465Z     |                    ^^^ help: consider prefixing with an underscore: `_did`
2019-11-20T22:58:55.2614315Z     = note: `-D unused-variables` implied by `-D warnings`
2019-11-20T22:58:55.2614483Z 
2019-11-20T22:58:55.2614836Z error: unused variable: `tcx`
2019-11-20T22:58:55.2615229Z    --> src/librustc/traits/coherence.rs:463:5
---
2019-11-20T22:59:25.2426718Z   local time: Wed Nov 20 22:59:25 UTC 2019
2019-11-20T22:59:25.2652815Z   network time: Wed, 20 Nov 2019 22:59:25 GMT
2019-11-20T22:59:25.2654555Z == end clock drift check ==
2019-11-20T22:59:26.1936364Z 
2019-11-20T22:59:26.2027474Z ##[error]Bash exited with code '1'.
2019-11-20T22:59:26.2059141Z ##[section]Starting: Checkout
2019-11-20T22:59:26.2061021Z ==============================================================================
2019-11-20T22:59:26.2061077Z Task         : Get sources
2019-11-20T22:59:26.2061140Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

rust-highfive · 2019-11-20T23:03:05Z

Your PR failed (pretty log, 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.

2019-11-20T23:01:31.6317146Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-20T23:01:31.6540035Z ##[command]git config gc.auto 0
2019-11-20T23:01:32.6180144Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-20T23:01:32.6187784Z ##[command]git config --get-all http.proxy
2019-11-20T23:01:32.6193695Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66590/merge:refs/remotes/pull/66590/merge

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)

Aaron1011 · 2019-11-20T23:51:52Z

It looks like 'Install awscli' is consistently failing - someone seems to be wrong with the Ubuntu package servers.

rust-highfive · 2019-11-21T01:03:30Z

Your PR failed (pretty log, 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.

2019-11-20T23:16:09.2923003Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-20T23:16:09.2940000Z ##[command]git config gc.auto 0
2019-11-20T23:16:09.2942450Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-20T23:16:09.2946586Z ##[command]git config --get-all http.proxy
2019-11-20T23:16:09.2950512Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66590/merge:refs/remotes/pull/66590/merge

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)

varkor · 2019-11-28T01:14:50Z

r=me after squashing.

This should be marked as fixing #66580, right?

While working on PR rust-lang#63934, I accidentally reverted to an older version of the PR while working on a rebase. The PR was then merged, not with the later, approved changes, but with earlier, unapproved changes. This PR applies the changes that were *suppoesd* to be mereged in PR rust-lang#63934. All of the proper tests appear to have been merged in PR rust-lang#63934, so this PR adds no new tests Fixes rust-lang#66580

Aaron1011 · 2019-11-28T18:52:39Z

@varkor: Squashed

varkor · 2019-11-28T20:37:44Z

@bors r+

bors · 2019-11-28T20:37:45Z

📌 Commit 79fcaf8 has been approved by varkor

bors · 2019-11-29T08:12:48Z

⌛ Testing commit 79fcaf8 with merge fe969f4...

Apply proper commit from PR #63934 While working on PR #63934, I accidentally reverted to an older version of the PR while working on a rebase. The PR was then merged, not with the later, approved changes, but with earlier, unapproved changes. This PR applies the changes that were *suppoesd* to be mereged in PR #63934. All of the proper tests appear to have been merged in PR #63934, so this PR adds no new tests

bors · 2019-11-29T11:34:57Z

☀️ Test successful - checks-azure
Approved by: varkor
Pushing fe969f4 to master...

rust-highfive assigned petrochenkov Nov 20, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 20, 2019

Aaron1011 mentioned this pull request Nov 20, 2019

ICE with type_alias_impl_trait: ty_is_local invoked on unexpected type #66580

Closed

This comment has been minimized.

Sign in to view

rust-highfive assigned varkor and unassigned petrochenkov Nov 20, 2019

Aaron1011 force-pushed the fix/real-impl-trait-coherence branch from 4a30a95 to c39bb50 Compare November 20, 2019 22:48

Aaron1011 force-pushed the fix/real-impl-trait-coherence branch from 1f901da to b641394 Compare November 20, 2019 23:15

Aaron1011 force-pushed the fix/real-impl-trait-coherence branch from b641394 to 17c11ec Compare November 21, 2019 17:51

Aaron1011 force-pushed the fix/real-impl-trait-coherence branch from 17c11ec to 79fcaf8 Compare November 28, 2019 18:52

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 Nov 28, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 29, 2019

bors merged commit 79fcaf8 into rust-lang:master Nov 29, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Apply proper commit from PR #63934 #66590

Apply proper commit from PR #63934 #66590

Aaron1011 commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

This comment has been minimized.

Centril commented Nov 20, 2019

Aaron1011 commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

Aaron1011 commented Nov 20, 2019

rust-highfive commented Nov 21, 2019

varkor commented Nov 28, 2019

Aaron1011 commented Nov 28, 2019

varkor commented Nov 28, 2019

bors commented Nov 28, 2019

bors commented Nov 29, 2019

bors commented Nov 29, 2019

Apply proper commit from PR #63934 #66590

Apply proper commit from PR #63934 #66590

Conversation

Aaron1011 commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

This comment has been minimized.

Centril commented Nov 20, 2019

Aaron1011 commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

Aaron1011 commented Nov 20, 2019

rust-highfive commented Nov 21, 2019

varkor commented Nov 28, 2019

Aaron1011 commented Nov 28, 2019

varkor commented Nov 28, 2019

bors commented Nov 28, 2019

bors commented Nov 29, 2019

bors commented Nov 29, 2019