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

rustc: fix ICE when trait alias has bare Self #59118

Merged
merged 1 commit into from Mar 16, 2019

Conversation

Projects
None yet
6 participants
@seanmonstar
Copy link
Contributor

seanmonstar commented Mar 11, 2019

Fixes #59029

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Mar 11, 2019

r? @oli-obk

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

@seanmonstar

This comment has been minimized.

Copy link
Contributor Author

seanmonstar commented Mar 11, 2019

@alexreg

This comment has been minimized.

Copy link
Contributor

alexreg commented Mar 12, 2019

@seanmonstar Thanks! I'm glad the simple fix seems to have worked. Would you mind creating a new test under src/test/run-pass/issues/issue-59029.rs and writing a bit of code there that actually uses a trait alias with a Self bound in some meaningful way (simple is fine, but at least have an assert)? You can just revert the existing test file then.

@alexreg

This comment has been minimized.

Copy link
Contributor

alexreg commented Mar 12, 2019

@rust-highfive rust-highfive assigned alexreg and unassigned oli-obk Mar 12, 2019

@rust-highfive

This comment was marked as outdated.

Copy link
Collaborator

rust-highfive commented Mar 12, 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:0098efa0:start=1552347712761695321,finish=1552347713665627457,duration=903932136
$ 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
---
[01:17:52] ............................................................................ii...................... 2300/2957
[01:18:08] ..............................................ii.................................................... 2400/2957
[01:18:22] .................................................................................................... 2500/2957
[01:18:47] .................................................................................................... 2600/2957
[01:19:05] .............................................F...................................................... 2700/2957
[01:19:26] .................................................................................................... 2900/2957
[01:19:35] .........................................................
[01:19:35] failures:
[01:19:35] 
[01:19:35] 
[01:19:35] ---- [run-pass] run-pass/traits/trait-alias-syntax.rs stdout ----
[01:19:35] 
[01:19:35] error: test compilation failed although it shouldn't!
[01:19:35] status: exit code: 1
[01:19:35] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/run-pass/traits/trait-alias-syntax.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/traits/trait-alias-syntax/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/traits/trait-alias-syntax/auxiliary"
[01:19:35] ------------------------------------------
[01:19:35] 
[01:19:35] ------------------------------------------
[01:19:35] stderr:
[01:19:35] stderr:
[01:19:35] ------------------------------------------
[01:19:35] {"message":"associated type `Out` not found for `Self`","code":{"code":"E0220","explanation":"\nYou used an associated type which isn't defined in the trait.\nErroneous code example:\n\n```compile_fail,E0220\ntrait T1 {\n    type Bar;\n}\n\ntype Foo = T1<F=i32>; // error: associated type `F` not found for `T1`\n\n// or:\n\ntrait T2 {\n    type Bar;\n\n    // error: Baz is used but not declared\n    fn return_bool(&self, _: &Self::Bar, _: &Self::Baz) -> bool;\n}\n```\n\nMake sure that you have defined the associated type in the trait body.\nAlso, verify that you used the right trait or you didn't misspell the\nassociated type name. Example:\n\n```\ntrait T1 {\n    type Bar;\n}\n\ntype Foo = T1<Bar=i32>; // ok!\n\n// or:\n\ntrait T2 {\n    type Bar;\n    type Baz; // we declare `Baz` in our trait.\n\n    // and now we can use it here:\n    fn return_bool(&self, _: &Self::Bar, _: &Self::Baz) -> bool;\n}\n```\n"},"level":"error","spans":[{"file_name":"/checkout/src/test/run-pass/traits/trait-alias-syntax.rs","byte_start":648,"byte_end":657,"line_start":22,"line_end":22,"column_start":46,"column_end":55,"is_primary":true,"text":[{"text":"trait SelfWhere<One, Two> = Assoc<Two> where Self::Out: Assoc<One>;","highlight_start":46,"highlight_end":55}],"label":"associated type `Out` not found","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error[E0220]: associated type `Out` not found for `Self`\n  --> /checkout/src/test/run-pass/traits/trait-alias-syntax.rs:22:46\n   |\nLL | trait SelfWhere<One, Two> = Assoc<Two> where Self::Out: Assoc<One>;\n   |                                              ^^^^^^^^^ associated type `Out` not found\n\n"}
[01:19:35] {"message":"For more information about this error, try `rustc --explain E0220`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0220`.\n"}
[01:19:35] 
[01:19:35] ------------------------------------------
[01:19:35] 
---
[01:19:35] 
[01:19:35] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:496:22
[01:19:35] 
[01:19:35] 
[01:19:35] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/run-pass" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-pass" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:19:35] 
[01:19:35] 
[01:19:35] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:19:35] Build completed unsuccessfully in 0:10:58
[01:19:35] Build completed unsuccessfully in 0:10:58
[01:19:35] Makefile:48: recipe for target 'check' failed
[01:19:35] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0423c1b0
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Tue Mar 12 01:01:40 UTC 2019

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)

@alexreg

This comment has been minimized.

Copy link
Contributor

alexreg commented Mar 12, 2019

Okay, so this fix isn't actually enough, it seems... Could you try the following locally and let me know if they succeed?

trait SelfWhere<One, Two> = Assoc<Two> where Assoc<Two>::Out: Assoc<One>;

and

trait SelfWhere<One, Two> = Assoc<Two> where <Self as Assoc<Two>>::Out: Assoc<One>;
@seanmonstar

This comment has been minimized.

Copy link
Contributor Author

seanmonstar commented Mar 12, 2019

The second one does work, it's part of the initial bug report. I haven't tried the first yet.

If Self should be qualified, I can just change this to a compile-fail test checking for the right error.

@seanmonstar

This comment has been minimized.

Copy link
Contributor Author

seanmonstar commented Mar 12, 2019

The first one (Assoc<Two> where Assoc<Two>::Out: Assoc<One>) complains about "abiguous associated type".

@alexreg

This comment has been minimized.

Copy link
Contributor

alexreg commented Mar 12, 2019

As a loose analogy to this example (insofar as it involves trait bounds on an associated type), I'm of the opinion that it's fine for Self alone not to work (so long as it doesn't ICE, of course).

So, now that we've solved the ICE, the question is: do we want better diagnostics when, e.g., trait SelfWhere<One, Two> = Assoc<Two> where <Self as Assoc<Two>>::Out: Assoc<One>; is used. @estebank, what do you think about the error message in the above CI test failure. Should we be doing better?

@seanmonstar Let's have a ui test for the failing case (just Self), and a run-pass test for the case that should pass (<Self as ...>). Two new test files. You can put them both in the ui/issues/ dir though, maybe, and just annotate the passing one with // run-pass as its first line.

@seanmonstar seanmonstar force-pushed the seanmonstar:alias-where-self-ice branch from f3167ec to 04747c9 Mar 12, 2019

@rust-highfive

This comment was marked as outdated.

Copy link
Collaborator

rust-highfive commented Mar 12, 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:06c7f910:start=1552418315642024004,finish=1552418391967434985,duration=76325410981
$ 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
---
[01:09:12] .................................................................................................... 2600/5452
[01:09:16] .................................................................................................... 2700/5452
[01:09:21] .................................................................................................... 2800/5452
[01:09:25] .................................................................................................... 2900/5452
[01:09:29] .......................................................................F............................ 3000/5452
[01:09:36] .................................................................................................... 3200/5452
[01:09:39] ..............................................................................i..................... 3300/5452
[01:09:43] .................................................................................................... 3400/5452
[01:09:46] ....................................................ii...i...ii..................................... 3500/5452
---
[01:10:59] 
[01:10:59] ---- [ui] ui/issues/issue-59029-1.rs stdout ----
[01:10:59] diff of stderr:
[01:10:59] 
[01:10:59] - error: associated type `Res` not found for `Self`
[01:10:59] -   --> $DIR/issue-59029.rs:5:52
[01:10:59] + error[E0220]: associated type `Res` not found for `Self`
[01:10:59] 3    |
[01:10:59] 3    |
[01:10:59] 4 LL | trait MkSvc<Target, Req> = Svc<Target> where Self::Res: Svc<Req>;
[01:10:59] 5    |                                              ^^^^^^^^^ associated type `Res` not found
[01:10:59] 6 
[01:10:59] 7 error: aborting due to previous error
[01:10:59] + 
[01:10:59] + For more information about this error, try `rustc --explain E0220`.
[01:10:59] + For more information about this error, try `rustc --explain E0220`.
[01:10:59] 8 
[01:10:59] 
[01:10:59] 
[01:10:59] The actual stderr differed from the expected stderr.
[01:10:59] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-59029-1/issue-59029-1.stderr
[01:10:59] To update references, rerun the tests and pass the `--bless` flag
[01:10:59] To only update this specific test, also pass `--test-args issues/issue-59029-1.rs`
[01:10:59] error: 1 errors occurred comparing output.
[01:10:59] status: exit code: 1
[01:10:59] status: exit code: 1
[01:10:59] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/issues/issue-59029-1.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-59029-1/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-59029-1/auxiliary" "-A" "unused"
[01:10:59] ------------------------------------------
[01:10:59] 
[01:10:59] ------------------------------------------
[01:10:59] stderr:
[01:10:59] stderr:
[01:10:59] ------------------------------------------
[01:10:59] {"message":"associated type `Res` not found for `Self`","code":{"code":"E0220","explanation":"\nYou used an associated type which isn't defined in the trait.\nErroneous code example:\n\n```compile_fail,E0220\ntrait T1 {\n    type Bar;\n}\n\ntype Foo = T1<F=i32>; // error: associated type `F` not found for `T1`\n\n// or:\n\ntrait T2 {\n    type Bar;\n\n    // error: Baz is used but not declared\n    fn return_bool(&self, _: &Self::Bar, _: &Self::Baz) -> bool;\n}\n```\n\nMake sure that you have defined the associated type in the trait body.\nAlso, verify that you used the right trait or you didn't misspell the\nassociated type name. Example:\n\n```\ntrait T1 {\n    type Bar;\n}\n\ntype Foo = T1<Bar=i32>; // ok!\n\n// or:\n\ntrait T2 {\n    type Bar;\n    type Baz; // we declare `Baz` in our trait.\n\n    // and now we can use it here:\n    fn return_bool(&self, _: &Self::Bar, _: &Self::Baz) -> bool;\n}\n```\n"},"level":"error","spans":[{"file_name":"/checkout/src/test/ui/issues/issue-59029-1.rs","byte_start":101,"byte_end":110,"line_start":5,"line_end":5,"column_start":46,"column_end":55,"is_primary":true,"text":[{"text":"trait MkSvc<Target, Req> = Svc<Target> where Self::Res: Svc<Req>;","highlight_start":46,"highlight_end":55}],"label":"associated type `Res` not found","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error[E0220]: associated type `Res` not found for `Self`\n  --> /checkout/src/test/ui/issues/issue-59029-1.rs:5:46\n   |\nLL | trait MkSvc<Target, Req> = Svc<Target> where Self::Res: Svc<Req>;\n   |                                              ^^^^^^^^^ associated type `Res` not found\n\n"}
[01:10:59] {"message":"For more information about this error, try `rustc --explain E0220`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0220`.\n"}
[01:10:59] 
[01:10:59] ------------------------------------------
[01:10:59] 
---
[01:10:59] 
[01:10:59] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:496:22
[01:10:59] 
[01:10:59] 
[01:10:59] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:10:59] 
[01:10:59] 
[01:10:59] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:10:59] Build completed unsuccessfully in 0:04:15
[01:10:59] Build completed unsuccessfully in 0:04:15
[01:10:59] make: *** [check] Error 1
[01:10:59] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:01340268
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Tue Mar 12 20:31:00 UTC 2019
---
travis_time:end:00938d7c:start=1552422661837442010,finish=1552422661842126205,duration=4684195
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2b294f20
$ 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:02cd9274
travis_time:start:02cd9274
$ 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:01f66ae0
$ 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)

@seanmonstar seanmonstar force-pushed the seanmonstar:alias-where-self-ice branch from 04747c9 to df05fbf Mar 12, 2019

@estebank

This comment has been minimized.

Copy link
Contributor

estebank commented Mar 12, 2019

@alexreg it's probably fine. The ideal output would be to provide a suggestion to use <Self as Svc<Target>>::Res, but to do that you'd have to peek into Svc to see if the assoc type not found exists in it. I'm ok with merging this PR as is.

error[E0220]: associated type `Res` not found for `Self`
  --> $DIR/issue-59029-1.rs:5:46
   |
LL | trait MkSvc<Target, Req> = Svc<Target> where Self::Res: Svc<Req>;
   |                                              ^^^^^^^^^
   |                                              |
   |                                              associated type `Res` not found
   |                                              help: you might have meant to use the fully qualified path: `<Self as Svc<Target>>::Res`

@alexreg

This comment has been minimized.

Copy link
Contributor

alexreg commented Mar 12, 2019

@estebank Great. I'm okay with merging this as-is too, in that case.

@alexreg

This comment has been minimized.

Copy link
Contributor

alexreg commented Mar 12, 2019

@bors r+

Thanks @seanmonstar!

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Mar 12, 2019

📌 Commit df05fbf has been approved by alexreg

@bors

This comment was marked as spam.

Copy link
Contributor

bors commented Mar 12, 2019

💡 This pull request was already approved, no need to approve it again.

  • There's another pull request that is currently being tested, blocking this pull request: #58743
@bors

This comment was marked as spam.

Copy link
Contributor

bors commented Mar 12, 2019

📌 Commit df05fbf has been approved by alexreg

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Mar 13, 2019

Rollup merge of rust-lang#59118 - seanmonstar:alias-where-self-ice, r…
…=alexreg

rustc: fix ICE when trait alias has bare Self

Fixes rust-lang#59029

kennytm added a commit to kennytm/rust that referenced this pull request Mar 15, 2019

Rollup merge of rust-lang#59118 - seanmonstar:alias-where-self-ice, r…
…=alexreg

rustc: fix ICE when trait alias has bare Self

Fixes rust-lang#59029

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

Auto merge of #59207 - kennytm:rollup, r=kennytm
Rollup of 31 pull requests

Successful merges:

 - #58803 (fs::copy() unix: set file mode early)
 - #58854 (appveyor: Use VS2017 for all our images)
 - #58855 (std: Spin for a global malloc lock on wasm32)
 - #58873 (Fix "Auto-hide item methods documentation" setting)
 - #58933 (Move alloc::prelude::* to alloc::prelude::v1, make alloc a subset of std)
 - #58938 (core: ensure VaList passes improper_ctypes lint)
 - #58941 (MIPS: add r6 support)
 - #58949 (SGX target: Expose thread id function in os module)
 - #58976 (Default to integrated `rust-lld` linker for UEFI targets)
 - #58986 ([CI] Update binutils for powerpc64 and powerpc64le)
 - #59009 (Fix SGX implementations of read/write_vectored.)
 - #59025 (Fix generic argument lookup for Self)
 - #59036 (Fix ICE in MIR pretty printing)
 - #59037 (Avoid some common false positives in intra doc link checking)
 - #59038 (Track embedded-book in the toolstate)
 - #59072 (we can now skip should_panic tests with the libtest harness)
 - #59079 (add suggestions to invalid macro item error)
 - #59082 (A few improvements to comments in user-facing crates)
 - #59102 (Consistent naming for duration_float methods and additional f32 methods)
 - #59106 (Add peer_addr function to UdpSocket)
 - #59118 (rustc: fix ICE when trait alias has bare Self)
 - #59139 (Unregress using scalar unions in constants.)
 - #59146 (Suggest return lifetime when there's only one named lifetime)
 - #59147 (Make std time tests more robust for platform differences)
 - #59152 (Stabilize Range*::contains.)
 - #59156 ([wg-async-await] Add regression test for #55809.)
 - #59158 (Revert "Don't generate minification variable if minification disabled")
 - #59169 (Add `-Z allow_features=...` flag)
 - #59175 (Don't run test launching `echo` since that doesn't exist on Windows)
 - #59180 (Use try blocks in rustc_codegen_ssa)
 - #59185 (No old chestnuts in iter::repeat docs)

Failed merges:

 - #58901 (Change `std::fs::copy` to use `copyfile` on MacOS and iOS)
 - #59055 (CI: Set job names.)

r? @ghost

kennytm added a commit to kennytm/rust that referenced this pull request Mar 16, 2019

Rollup merge of rust-lang#59118 - seanmonstar:alias-where-self-ice, r…
…=alexreg

rustc: fix ICE when trait alias has bare Self

Fixes rust-lang#59029

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

Auto merge of #59226 - kennytm:rollup, r=kennytm
Rollup of 37 pull requests

Successful merges:

 - #58854 (appveyor: Use VS2017 for all our images)
 - #58855 (std: Spin for a global malloc lock on wasm32)
 - #58873 (Fix "Auto-hide item methods documentation" setting)
 - #58901 (Change `std::fs::copy` to use `copyfile` on MacOS and iOS)
 - #58933 (Move alloc::prelude::* to alloc::prelude::v1, make alloc a subset of std)
 - #58938 (core: ensure VaList passes improper_ctypes lint)
 - #58941 (MIPS: add r6 support)
 - #58949 (SGX target: Expose thread id function in os module)
 - #58976 (Default to integrated `rust-lld` linker for UEFI targets)
 - #58986 ([CI] Update binutils for powerpc64 and powerpc64le)
 - #59009 (Fix SGX implementations of read/write_vectored.)
 - #59025 (Fix generic argument lookup for Self)
 - #59036 (Fix ICE in MIR pretty printing)
 - #59037 (Avoid some common false positives in intra doc link checking)
 - #59038 (Track embedded-book in the toolstate)
 - #59072 (we can now skip should_panic tests with the libtest harness)
 - #59079 (add suggestions to invalid macro item error)
 - #59082 (A few improvements to comments in user-facing crates)
 - #59102 (Consistent naming for duration_float methods and additional f32 methods)
 - #59118 (rustc: fix ICE when trait alias has bare Self)
 - #59139 (Unregress using scalar unions in constants.)
 - #59146 (Suggest return lifetime when there's only one named lifetime)
 - #59147 (Make std time tests more robust for platform differences)
 - #59152 (Stabilize Range*::contains.)
 - #59156 ([wg-async-await] Add regression test for #55809.)
 - #59158 (Revert "Don't generate minification variable if minification disabled")
 - #59169 (Add `-Z allow_features=...` flag)
 - #59173 (bootstrap: Default to a sensible llvm-suffix.)
 - #59175 (Don't run test launching `echo` since that doesn't exist on Windows)
 - #59180 (Use try blocks in rustc_codegen_ssa)
 - #59185 (No old chestnuts in iter::repeat docs)
 - #59201 (Remove restriction on isize/usize in repr(simd))
 - #59204 (Output diagnostic information for rustdoc)
 - #59206 (Improved test output)
 - #59208 (Reduce a Code Repetition Related to Bit Operation)
 - #59212 (Add x86_64 musl host to the manifest)
 - #59221 (Option and Result: Add references to documentation of as_ref and as_mut)

Failed merges:

 - #59055 (CI: Set job names.)

r? @ghost

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

Auto merge of #59226 - kennytm:rollup, r=kennytm
Rollup of 37 pull requests

Successful merges:

 - #58854 (appveyor: Use VS2017 for all our images)
 - #58855 (std: Spin for a global malloc lock on wasm32)
 - #58873 (Fix "Auto-hide item methods documentation" setting)
 - #58901 (Change `std::fs::copy` to use `copyfile` on MacOS and iOS)
 - #58933 (Move alloc::prelude::* to alloc::prelude::v1, make alloc a subset of std)
 - #58938 (core: ensure VaList passes improper_ctypes lint)
 - #58941 (MIPS: add r6 support)
 - #58949 (SGX target: Expose thread id function in os module)
 - #58976 (Default to integrated `rust-lld` linker for UEFI targets)
 - #58986 ([CI] Update binutils for powerpc64 and powerpc64le)
 - #59009 (Fix SGX implementations of read/write_vectored.)
 - #59025 (Fix generic argument lookup for Self)
 - #59036 (Fix ICE in MIR pretty printing)
 - #59037 (Avoid some common false positives in intra doc link checking)
 - #59038 (Track embedded-book in the toolstate)
 - #59072 (we can now skip should_panic tests with the libtest harness)
 - #59079 (add suggestions to invalid macro item error)
 - #59082 (A few improvements to comments in user-facing crates)
 - #59102 (Consistent naming for duration_float methods and additional f32 methods)
 - #59118 (rustc: fix ICE when trait alias has bare Self)
 - #59139 (Unregress using scalar unions in constants.)
 - #59146 (Suggest return lifetime when there's only one named lifetime)
 - #59147 (Make std time tests more robust for platform differences)
 - #59152 (Stabilize Range*::contains.)
 - #59156 ([wg-async-await] Add regression test for #55809.)
 - #59158 (Revert "Don't generate minification variable if minification disabled")
 - #59169 (Add `-Z allow_features=...` flag)
 - #59173 (bootstrap: Default to a sensible llvm-suffix.)
 - #59175 (Don't run test launching `echo` since that doesn't exist on Windows)
 - #59180 (Use try blocks in rustc_codegen_ssa)
 - #59185 (No old chestnuts in iter::repeat docs)
 - #59201 (Remove restriction on isize/usize in repr(simd))
 - #59204 (Output diagnostic information for rustdoc)
 - #59206 (Improved test output)
 - #59208 (Reduce a Code Repetition Related to Bit Operation)
 - #59212 (Add x86_64 musl host to the manifest)
 - #59221 (Option and Result: Add references to documentation of as_ref and as_mut)

Failed merges:

 - #59055 (CI: Set job names.)

r? @ghost

kennytm added a commit to kennytm/rust that referenced this pull request Mar 16, 2019

Rollup merge of rust-lang#59118 - seanmonstar:alias-where-self-ice, r…
…=alexreg

rustc: fix ICE when trait alias has bare Self

Fixes rust-lang#59029

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

Auto merge of #59226 - kennytm:rollup, r=kennytm
Rollup of 37 pull requests

Successful merges:

 - #58854 (appveyor: Use VS2017 for all our images)
 - #58855 (std: Spin for a global malloc lock on wasm32)
 - #58873 (Fix "Auto-hide item methods documentation" setting)
 - #58901 (Change `std::fs::copy` to use `copyfile` on MacOS and iOS)
 - #58933 (Move alloc::prelude::* to alloc::prelude::v1, make alloc a subset of std)
 - #58938 (core: ensure VaList passes improper_ctypes lint)
 - #58941 (MIPS: add r6 support)
 - #58949 (SGX target: Expose thread id function in os module)
 - #58959 (Add release notes for PR #56243)
 - #58976 (Default to integrated `rust-lld` linker for UEFI targets)
 - #59009 (Fix SGX implementations of read/write_vectored.)
 - #59025 (Fix generic argument lookup for Self)
 - #59036 (Fix ICE in MIR pretty printing)
 - #59037 (Avoid some common false positives in intra doc link checking)
 - #59072 (we can now skip should_panic tests with the libtest harness)
 - #59079 (add suggestions to invalid macro item error)
 - #59082 (A few improvements to comments in user-facing crates)
 - #59102 (Consistent naming for duration_float methods and additional f32 methods)
 - #59118 (rustc: fix ICE when trait alias has bare Self)
 - #59139 (Unregress using scalar unions in constants.)
 - #59146 (Suggest return lifetime when there's only one named lifetime)
 - #59147 (Make std time tests more robust for platform differences)
 - #59152 (Stabilize Range*::contains.)
 - #59156 ([wg-async-await] Add regression test for #55809.)
 - #59158 (Revert "Don't generate minification variable if minification disabled")
 - #59169 (Add `-Z allow_features=...` flag)
 - #59173 (bootstrap: Default to a sensible llvm-suffix.)
 - #59175 (Don't run test launching `echo` since that doesn't exist on Windows)
 - #59180 (Use try blocks in rustc_codegen_ssa)
 - #59185 (No old chestnuts in iter::repeat docs)
 - #59201 (Remove restriction on isize/usize in repr(simd))
 - #59204 (Output diagnostic information for rustdoc)
 - #59206 (Improved test output)
 - #59208 (Reduce a Code Repetition Related to Bit Operation)
 - #59212 (Add x86_64 musl host to the manifest)
 - #59221 (Option and Result: Add references to documentation of as_ref and as_mut)
 - #59231 (Stabilize Option::copied)

@bors bors merged commit df05fbf into rust-lang:master Mar 16, 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.