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

Use associated_type_bounds where applicable - closes #61738 #63350

Merged
merged 3 commits into from
Aug 10, 2019

Conversation

iluuu1994
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @KodrAus

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 7, 2019
@iluuu1994
Copy link
Contributor Author

r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned KodrAus Aug 7, 2019
@iluuu1994
Copy link
Contributor Author

@alexreg I rebased this onto master. Unfortunately the fix for the associated type bounds (#61919) seems to not fully fix the issue (#61752). I still get the following two errors:

error[E0221]: ambiguous associated type `Item` in bounds of `I`
   --> src/libcore/iter/adapters/flatten.rs:112:30
    |
112 |     inner: FlattenCompat<I, <I::Item as IntoIterator>::IntoIter>,
    |                              ^^^^^^^ ambiguous associated type `Item`
    |
   ::: src/libcore/iter/traits/collect.rs:211:5
    |
211 |     type Item;
    |     ---------- ambiguous `Item` from `iter::traits::collect::IntoIterator`
    |
   ::: src/libcore/iter/traits/iterator.rs:94:5
    |
94  |     type Item;
    |     ---------- ambiguous `Item` from `iter::traits::iterator::Iterator`

and

error[E0221]: ambiguous associated type `Item` in bounds of `U`
   --> src/libcore/iter/adapters/flatten.rs:77:39
    |
77  |     fn next_back(&mut self) -> Option<U::Item> { self.inner.next_back() }
    |                                       ^^^^^^^ ambiguous associated type `Item`
    |
   ::: src/libcore/iter/traits/iterator.rs:94:5
    |
94  |     type Item;
    |     ---------- ambiguous `Item` from `iter::traits::iterator::Iterator`
    |
   ::: src/libcore/iter/traits/collect.rs:211:5
    |
211 |     type Item;
    |     ---------- ambiguous `Item` from `iter::traits::collect::IntoIterator`

both of which do not occur without associated type bounds.

@rust-highfive
Copy link
Collaborator

The job mingw-check of your PR failed (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-08-07T14:49:41.5497784Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-07T14:49:41.5668159Z ##[command]git config gc.auto 0
2019-08-07T14:49:41.5738370Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-07T14:49:41.5788871Z ##[command]git config --get-all http.proxy
2019-08-07T14:49:41.5918361Z ##[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/63350/merge:refs/remotes/pull/63350/merge
---
2019-08-07T14:50:18.1774312Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-07T14:50:18.1774367Z 
2019-08-07T14:50:18.1774578Z   git checkout -b <new-branch-name>
2019-08-07T14:50:18.1774628Z 
2019-08-07T14:50:18.1774674Z HEAD is now at ee41ceb39 Merge 8f5ceaaa466e45e282207527730bd9be658caeb3 into d4abb08be6c3a06a14e285396f5e3ef367584f77
2019-08-07T14:50:18.1934291Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-07T14:50:18.1936655Z ==============================================================================
2019-08-07T14:50:18.1936703Z Task         : Bash
2019-08-07T14:50:18.1936744Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-07T14:55:09.4294038Z    |
2019-08-07T14:55:09.4294517Z 76 | #![feature(const_generics)]
2019-08-07T14:55:09.4294917Z    |            ^^^^^^^^^^^^^^
2019-08-07T14:55:09.4295073Z 
2019-08-07T14:55:12.4747563Z error[E0221]: ambiguous associated type `Item` in bounds of `I`
2019-08-07T14:55:12.4747956Z    --> src/libcore/iter/adapters/flatten.rs:112:30
2019-08-07T14:55:12.4748190Z     |
2019-08-07T14:55:12.4748565Z 112 |     inner: FlattenCompat<I, <I::Item as IntoIterator>::IntoIter>,
2019-08-07T14:55:12.4748946Z     |                              ^^^^^^^ ambiguous associated type `Item`
2019-08-07T14:55:12.4749478Z    ::: src/libcore/iter/traits/collect.rs:211:5
2019-08-07T14:55:12.4749700Z     |
2019-08-07T14:55:12.4750149Z 211 |     type Item;
2019-08-07T14:55:12.4750149Z 211 |     type Item;
2019-08-07T14:55:12.4751000Z     |     ---------- ambiguous `Item` from `iter::traits::collect::IntoIterator`
2019-08-07T14:55:12.4751453Z    ::: src/libcore/iter/traits/iterator.rs:94:5
2019-08-07T14:55:12.4751856Z     |
2019-08-07T14:55:12.4752217Z 94  |     type Item;
2019-08-07T14:55:12.4752217Z 94  |     type Item;
2019-08-07T14:55:12.4752555Z     |     ---------- ambiguous `Item` from `iter::traits::iterator::Iterator`
2019-08-07T14:55:12.4760333Z 
2019-08-07T14:55:12.6160426Z error[E0221]: ambiguous associated type `Item` in bounds of `U`
2019-08-07T14:55:12.6161673Z    --> src/libcore/iter/adapters/flatten.rs:77:39
2019-08-07T14:55:12.6162288Z     |
2019-08-07T14:55:12.6162987Z 77  |     fn next_back(&mut self) -> Option<U::Item> { self.inner.next_back() }
2019-08-07T14:55:12.6164449Z     |                                       ^^^^^^^ ambiguous associated type `Item`
2019-08-07T14:55:12.6165333Z    ::: src/libcore/iter/traits/iterator.rs:94:5
2019-08-07T14:55:12.6165688Z     |
2019-08-07T14:55:12.6166651Z 94  |     type Item;
2019-08-07T14:55:12.6166651Z 94  |     type Item;
2019-08-07T14:55:12.6167254Z     |     ---------- ambiguous `Item` from `iter::traits::iterator::Iterator`
2019-08-07T14:55:12.6168085Z    ::: src/libcore/iter/traits/collect.rs:211:5
2019-08-07T14:55:12.6168461Z     |
2019-08-07T14:55:12.6168871Z 211 |     type Item;
2019-08-07T14:55:12.6168871Z 211 |     type Item;
2019-08-07T14:55:12.6169407Z     |     ---------- ambiguous `Item` from `iter::traits::collect::IntoIterator`
2019-08-07T14:55:12.6727389Z error: aborting due to 2 previous errors
2019-08-07T14:55:12.6727525Z 
2019-08-07T14:55:12.6728590Z For more information about this error, try `rustc --explain E0221`.
2019-08-07T14:55:12.7515295Z error: Could not compile `core`.
2019-08-07T14:55:12.7515295Z error: Could not compile `core`.
2019-08-07T14:55:12.7516647Z warning: build failed, waiting for other jobs to finish...
2019-08-07T14:55:15.4951226Z error: build failed
2019-08-07T14:55:15.4974956Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-j" "2" "--release" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--message-format" "json"
2019-08-07T14:55:15.4986846Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2019-08-07T14:55:15.4986986Z Build completed unsuccessfully in 0:02:07
2019-08-07T14:55:15.4986986Z Build completed unsuccessfully in 0:02:07
2019-08-07T14:55:28.7629713Z ##[error]Bash exited with code '1'.
2019-08-07T14:55:28.7665609Z ##[section]Starting: Checkout
2019-08-07T14:55:28.7667104Z ==============================================================================
2019-08-07T14:55:28.7667156Z Task         : Get sources
2019-08-07T14:55:28.7667201Z 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)

@alexreg
Copy link
Contributor

alexreg commented Aug 7, 2019

Well it certainly does fix #61752, because I added a regression test for that. Can you submit a new issue, minimised, please?

@iluuu1994
Copy link
Contributor Author

@alexreg Sure, I'll check if this one still fails on master.

@iluuu1994
Copy link
Contributor Author

@alexreg I've tried everything, can't reproduce it in a test. It looks like there are multiple factors playing together. I've copied the Flatten struct and all of its impls but it still works fine. Would you mind trying it out on my branch? You'll probably understand the issue better than I do.

@alexreg
Copy link
Contributor

alexreg commented Aug 7, 2019

@iluuu1994 Have you tried a clean build? No keep-stage, incremental, etc. This strikes me as if your old build is still being used somewhere.

@iluuu1994
Copy link
Contributor Author

@alexreg Yes. Note that the build here also fails with the exact same error message.

@alexreg
Copy link
Contributor

alexreg commented Aug 7, 2019

Not sure then... maybe @Centril can take a look.

src/liballoc/tests/str.rs Outdated Show resolved Hide resolved
src/libcore/iter/adapters/flatten.rs Outdated Show resolved Hide resolved
src/libcore/iter/adapters/flatten.rs Outdated Show resolved Hide resolved
src/libcore/iter/adapters/flatten.rs Outdated Show resolved Hide resolved
src/libcore/iter/adapters/flatten.rs Outdated Show resolved Hide resolved
src/librustc/traits/select.rs Outdated Show resolved Hide resolved
src/librustc_mir/dataflow/mod.rs Outdated Show resolved Hide resolved
src/librustc_mir/dataflow/mod.rs Outdated Show resolved Hide resolved
src/libserialize/collection_impls.rs Outdated Show resolved Hide resolved
src/libserialize/collection_impls.rs Outdated Show resolved Hide resolved
@Centril
Copy link
Contributor

Centril commented Aug 8, 2019

@iluuu1994 Let's move out the parts that don't work for now and revisit those parts in a smaller PR after this one has merged.

@iluuu1994 iluuu1994 force-pushed the use-associated-type-bounds branch from 8f5ceaa to 3a6a29b Compare August 8, 2019 20:39
Copy link
Contributor

@Centril Centril left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! r=me rollup when green

@Centril
Copy link
Contributor

Centril commented Aug 8, 2019

@iluuu1994 Also, can you file an issue for the Flatten complications and cc myself and alexreg? :)

@iluuu1994
Copy link
Contributor Author

iluuu1994 commented Aug 8, 2019

Done (#63393), thanks @Centril 🙂

@iluuu1994 iluuu1994 marked this pull request as ready for review August 8, 2019 22:04
@rust-highfive

This comment has been minimized.

@iluuu1994
Copy link
Contributor Author

Bummer, there was a #![feature(associated_type_bounds)] missing. I didn't know build doesn't actually build the tests.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (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-08-08T22:35:07.9364611Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-08T22:35:07.9591633Z ##[command]git config gc.auto 0
2019-08-08T22:35:07.9643686Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-08T22:35:07.9704762Z ##[command]git config --get-all http.proxy
2019-08-08T22:35:07.9849406Z ##[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/63350/merge:refs/remotes/pull/63350/merge
---
2019-08-08T22:35:42.9534215Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-08T22:35:42.9534264Z 
2019-08-08T22:35:42.9534500Z   git checkout -b <new-branch-name>
2019-08-08T22:35:42.9534530Z 
2019-08-08T22:35:42.9534578Z HEAD is now at c93035655 Merge a5208c37b9612eb80887531974aefade63589143 into 2d1a551e144335e0d60a637d12f410cf65849876
2019-08-08T22:35:42.9685680Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-08T22:35:42.9688870Z ==============================================================================
2019-08-08T22:35:42.9688948Z Task         : Bash
2019-08-08T22:35:42.9688993Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-08T23:38:46.7577087Z .................................................................................................... 1400/8852
2019-08-08T23:38:52.9814330Z .................................................................................................... 1500/8852
2019-08-08T23:39:03.6147376Z ...................................................................................i...............i 1600/8852
2019-08-08T23:39:11.2945839Z .................................................................................................... 1700/8852
2019-08-08T23:39:18.9430862Z .....................................................................iiiii.......................... 1800/8852
2019-08-08T23:39:40.3405120Z .................................................................................................... 2000/8852
2019-08-08T23:39:42.7700593Z .................................................................................................... 2100/8852
2019-08-08T23:39:45.5815991Z .................................................................................................... 2200/8852
2019-08-08T23:39:53.5043452Z .................................................................................................... 2300/8852
---
2019-08-08T23:43:41.9668154Z .................................................................................................... 5200/8852
2019-08-08T23:43:53.2426480Z .............................................................................................i...... 5300/8852
2019-08-08T23:44:01.4812749Z .................................................................................................... 5400/8852
2019-08-08T23:44:06.3875848Z .................................................................................................... 5500/8852
2019-08-08T23:44:18.2157332Z .......................................................................................ii...i..ii... 5600/8852
2019-08-08T23:44:42.1908584Z .................................................................................................... 5800/8852
2019-08-08T23:44:47.6668186Z .................................................................................................... 5900/8852
2019-08-08T23:44:47.6668186Z .................................................................................................... 5900/8852
2019-08-08T23:44:52.3689990Z ........................................................................................i..ii....... 6000/8852
2019-08-08T23:45:23.5250161Z .................................................................................................... 6200/8852
2019-08-08T23:45:26.0692709Z ...............................i.................................................................... 6300/8852
2019-08-08T23:45:27.7252238Z .................................................................................................... 6400/8852
2019-08-08T23:45:30.4262139Z ...i................................................................................................ 6500/8852
---
2019-08-08T23:50:20.5588401Z  finished in 21.117
2019-08-08T23:50:20.5755280Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-08T23:50:20.7421729Z 
2019-08-08T23:50:20.7443626Z running 146 tests
2019-08-08T23:50:24.0270941Z i....iii......iii..iiii....i............................i..i................i....i.........ii.i.i..i 100/146
2019-08-08T23:50:25.9220624Z iii..............i.........iii.i......ii......
2019-08-08T23:50:25.9221301Z 
2019-08-08T23:50:25.9224270Z  finished in 5.346
2019-08-08T23:50:25.9384665Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-08T23:50:26.1064671Z 
---
2019-08-08T23:50:28.1782725Z  finished in 2.239
2019-08-08T23:50:28.2071554Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-08T23:50:28.3950744Z 
2019-08-08T23:50:28.3950989Z running 9 tests
2019-08-08T23:50:28.3951839Z iiiiiiiii
2019-08-08T23:50:28.3952186Z 
2019-08-08T23:50:28.3952251Z  finished in 0.187
2019-08-08T23:50:28.4155632Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-08T23:50:28.5921612Z 
---
2019-08-08T23:50:46.7497659Z  finished in 18.334
2019-08-08T23:50:46.7679479Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-08T23:50:46.9296733Z 
2019-08-08T23:50:46.9297517Z running 122 tests
2019-08-08T23:51:10.5944799Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....i..........iiii..........i...ii...i.......ii.i 100/122
2019-08-08T23:51:15.1542195Z .i.i......iii.i.....ii
2019-08-08T23:51:15.1543261Z 
2019-08-08T23:51:15.1545904Z  finished in 28.386
2019-08-08T23:51:15.1553100Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-08T23:51:15.1553686Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-08-09T00:05:42.4359266Z 
2019-08-09T00:05:42.4360677Z    Doc-tests core
2019-08-09T00:05:46.4352372Z 
2019-08-09T00:05:46.4353844Z running 2379 tests
2019-08-09T00:05:58.6210004Z ......iiiii......................................................................................... 100/2379
2019-08-09T00:06:10.6492368Z .........................................................................ii......................... 200/2379
2019-08-09T00:06:40.0027135Z .........................F.......................................................................... 400/2379
2019-08-09T00:06:40.0027135Z .........................F.......................................................................... 400/2379
2019-08-09T00:06:50.9580270Z ..............................i..i.................iiii............................................. 500/2379
2019-08-09T00:07:14.5228281Z .................................................................................................... 700/2379
2019-08-09T00:07:26.9290146Z .................................................................................................... 800/2379
2019-08-09T00:07:39.3739728Z .................................................................................................... 900/2379
2019-08-09T00:07:51.5091283Z .................................................................................................... 1000/2379
---
2019-08-09T00:10:50.3539065Z ---- iter/traits/collect.rs - iter::traits::collect::IntoIterator (line 196) stdout ----
2019-08-09T00:10:50.3539160Z error[E0658]: associated type bounds are unstable
2019-08-09T00:10:50.3539560Z  --> iter/traits/collect.rs:199:21
2019-08-09T00:10:50.3539626Z   |
2019-08-09T00:10:50.3539672Z 6 |     T: IntoIterator<Item: std::fmt::Debug>,
2019-08-09T00:10:50.3539778Z   |
2019-08-09T00:10:50.3539778Z   |
2019-08-09T00:10:50.3540316Z   = note: for more information, see ***/issues/52662
2019-08-09T00:10:50.3540390Z   = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
2019-08-09T00:10:50.3540487Z error: aborting due to previous error
2019-08-09T00:10:50.3540516Z 
2019-08-09T00:10:50.3540799Z For more information about this error, try `rustc --explain E0658`.
2019-08-09T00:10:50.3541016Z Couldn't compile the test.
---
2019-08-09T00:10:50.3541698Z 
2019-08-09T00:10:50.3826399Z error: test failed, to rerun pass '--doc'
2019-08-09T00:10:50.3841321Z 
2019-08-09T00:10:50.3841698Z 
2019-08-09T00:10:50.3843292Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "2" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "core" "--" "--quiet"
2019-08-09T00:10:50.3843454Z 
2019-08-09T00:10:50.3843701Z 
2019-08-09T00:10:50.3847966Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-08-09T00:10:50.3848055Z Build completed unsuccessfully in 1:28:44
2019-08-09T00:10:50.3848055Z Build completed unsuccessfully in 1:28:44
2019-08-09T00:10:50.8775612Z ##[error]Bash exited with code '1'.
2019-08-09T00:10:50.8830393Z ##[section]Starting: Checkout
2019-08-09T00:10:50.8832434Z ==============================================================================
2019-08-09T00:10:50.8832494Z Task         : Get sources
2019-08-09T00:10:50.8832542Z 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)

@alexreg
Copy link
Contributor

alexreg commented Aug 9, 2019

Still missing a feature gate in iter/traits/collect.rs.

Let's see if we can work out the issue with the other tests in the next PR, though I'd still be surprised if it's something non-trivial (albeit perhaps not obvious either).

@iluuu1994
Copy link
Contributor Author

Sorry about that, I really need to buy a more powerful computer so I can rebuild more often.

@iluuu1994 iluuu1994 force-pushed the use-associated-type-bounds branch from a5208c3 to 3d231ac Compare August 9, 2019 09:20
@iluuu1994
Copy link
Contributor Author

iluuu1994 commented Aug 9, 2019

Oops, I've just noticed that code using the macros in src/libcore/str/mod.rs will fail unless they specify #![feature(associated_type_bounds)]. Should I revert those instances until the feature is stabilized?

EDIT Maybe not? My local tests failed for that reason but in CI it succeeded. Maybe it was a caching issue.

@Centril
Copy link
Contributor

Centril commented Aug 9, 2019

Seems odd; only one macro is affected in this PR and it does not seem related to the test.
Let's try it on CI and see if it gets reproduced...

@bors r+

@bors
Copy link
Contributor

bors commented Aug 9, 2019

📌 Commit 77bfd7f has been approved by Centril

@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 Aug 9, 2019
@alexreg
Copy link
Contributor

alexreg commented Aug 9, 2019

Sorry about that, I really need to buy a more powerful computer so I can rebuild more often.

No worries, easily done. You may want to check out my post about the GCC Compile Farm on Rust Internals, get an account, and enjoy the faster build times!

Centril added a commit to Centril/rust that referenced this pull request Aug 9, 2019
…s, r=Centril

Use associated_type_bounds where applicable - closes rust-lang#61738
@iluuu1994
Copy link
Contributor Author

Thanks for the tip, I'll check it out 😊

Centril added a commit to Centril/rust that referenced this pull request Aug 9, 2019
…s, r=Centril

Use associated_type_bounds where applicable - closes rust-lang#61738
Centril added a commit to Centril/rust that referenced this pull request Aug 10, 2019
…s, r=Centril

Use associated_type_bounds where applicable - closes rust-lang#61738
Centril added a commit to Centril/rust that referenced this pull request Aug 10, 2019
…s, r=Centril

Use associated_type_bounds where applicable - closes rust-lang#61738
bors added a commit that referenced this pull request Aug 10, 2019
Rollup of 7 pull requests

Successful merges:

 - #63056 (Give built-in macros stable addresses in the standard library)
 - #63337 (Tweak mismatched types error)
 - #63350 (Use associated_type_bounds where applicable - closes #61738)
 - #63394 (Add test for issue 36804)
 - #63399 (More explicit diagnostic when using a `vec![]` in a pattern)
 - #63419 (check against more collisions for TypeId of fn pointer)
 - #63423 (Mention that tuple structs are private if any of their fields are)

Failed merges:

r? @ghost
@bors bors merged commit 77bfd7f into rust-lang:master Aug 10, 2019
@bors
Copy link
Contributor

bors commented Aug 10, 2019

⌛ Testing commit 77bfd7f with merge d19a359...

@Centril Centril added the F-associated_type_bounds `#![feature(associated_type_bounds)]` label Aug 10, 2019
@bors
Copy link
Contributor

bors commented Aug 10, 2019

☔ The latest upstream changes (presumably #63428) 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 Aug 10, 2019
@pietroalbini
Copy link
Member

@bors retry r-

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
F-associated_type_bounds `#![feature(associated_type_bounds)]` S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants