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

Allow customising ty::TraitRef's printing behavior #66613

Merged
merged 1 commit into from
Nov 30, 2019

Conversation

basil-cow
Copy link
Contributor

This pr allows to explicitly choose which representation of TraitRef (<T as Trait<U>> or Trait<U>) you want to print. Debug and Display representations of TraitRef now match.

Closes #59188.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @estebank (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 21, 2019
@rust-highfive
Copy link
Collaborator

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-21T19:19:53.0417846Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-21T19:19:53.5764506Z ##[command]git config gc.auto 0
2019-11-21T19:19:53.5771596Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-21T19:19:53.5777283Z ##[command]git config --get-all http.proxy
2019-11-21T19:19:53.5781187Z ##[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/66613/merge:refs/remotes/pull/66613/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)

@estebank
Copy link
Contributor

r? @eddyb, as they have better context on what's to be accomplished here. I am slightly surprised there's no user visible changes.

@rust-highfive rust-highfive assigned eddyb and unassigned estebank Nov 22, 2019
@basil-cow
Copy link
Contributor Author

Would you mind restarting the build? Or can I do it?

@andjo403
Copy link
Contributor

To restart the build you can close and reopen the pr

@bors
Copy link
Contributor

bors commented Nov 24, 2019

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

@basil-cow basil-cow force-pushed the trait-ref-print branch 2 times, most recently from f5ecb51 to be3bcb3 Compare November 25, 2019 03:02
@rust-highfive
Copy link
Collaborator

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-25T03:03:34.4052497Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-25T03:03:35.2774893Z ##[command]git config gc.auto 0
2019-11-25T03:03:35.2779034Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-25T03:03:35.2783113Z ##[command]git config --get-all http.proxy
2019-11-25T03:03:35.2786522Z ##[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/66613/merge:refs/remotes/pull/66613/merge
---
2019-11-25T03:07:15.8511973Z ####################                                                      29.0%
2019-11-25T03:07:15.8512163Z ######################################################################## 100.0%
2019-11-25T03:07:16.2442519Z extracting /checkout/obj/build/cache/2019-11-06/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
2019-11-25T03:07:16.3222883Z     Updating crates.io index
2019-11-25T03:07:23.4454198Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-25T03:07:23.4483244Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-25T03:07:23.4526771Z make: *** [prepare] Error 1
2019-11-25T03:07:23.4528295Z Makefile:67: recipe for target 'prepare' failed
2019-11-25T03:07:24.4550129Z Command failed. Attempt 2/5:
2019-11-25T03:07:24.4550129Z Command failed. Attempt 2/5:
2019-11-25T03:07:24.6704016Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-25T03:07:24.6721691Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-25T03:07:24.6769967Z Makefile:67: recipe for target 'prepare' failed
2019-11-25T03:07:24.6770052Z make: *** [prepare] Error 1
2019-11-25T03:07:26.6785098Z Command failed. Attempt 3/5:
2019-11-25T03:07:26.6785098Z Command failed. Attempt 3/5:
2019-11-25T03:07:26.8864416Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-25T03:07:26.8877522Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-25T03:07:26.8922587Z make: *** [prepare] Error 1
2019-11-25T03:07:26.8923222Z Makefile:67: recipe for target 'prepare' failed
2019-11-25T03:07:29.8941739Z Command failed. Attempt 4/5:
2019-11-25T03:07:29.8941739Z Command failed. Attempt 4/5:
2019-11-25T03:07:30.1002283Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-25T03:07:30.1019351Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-25T03:07:30.1061239Z make: *** [prepare] Error 1
2019-11-25T03:07:30.1066075Z Makefile:67: recipe for target 'prepare' failed
2019-11-25T03:07:34.1077759Z Command failed. Attempt 5/5:
2019-11-25T03:07:34.1077759Z Command failed. Attempt 5/5:
2019-11-25T03:07:34.3076848Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-25T03:07:34.3093969Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-25T03:07:34.3144349Z make: *** [prepare] Error 1
2019-11-25T03:07:34.3144742Z Makefile:67: recipe for target 'prepare' failed
2019-11-25T03:07:34.3144816Z The command has failed after 5 attempts.
2019-11-25T03:07:34.3147875Z == clock drift check ==
2019-11-25T03:07:34.3147875Z == clock drift check ==
2019-11-25T03:07:34.3176714Z   local time: Mon Nov 25 03:07:34 UTC 2019
2019-11-25T03:07:34.3675154Z   network time: Mon, 25 Nov 2019 03:07:34 GMT
2019-11-25T03:07:34.3675214Z == end clock drift check ==
2019-11-25T03:07:47.6034710Z 
2019-11-25T03:07:47.6131680Z ##[error]Bash exited with code '1'.
2019-11-25T03:07:47.6167064Z ##[section]Starting: Checkout
2019-11-25T03:07:47.6168512Z ==============================================================================
2019-11-25T03:07:47.6168556Z Task         : Get sources
2019-11-25T03:07:47.6168614Z 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)

@basil-cow
Copy link
Contributor Author

Something went wrong when rebasing, I think it's connected to the fact that I unbeknownst to me updated clippy, I would appreciate any help.

@rust-highfive
Copy link
Collaborator

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-25T13:16:58.3479716Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-25T13:16:58.3492747Z ##[command]git config gc.auto 0
2019-11-25T13:16:58.3497449Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-25T13:16:58.3501950Z ##[command]git config --get-all http.proxy
2019-11-25T13:16:58.3507473Z ##[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/66613/merge:refs/remotes/pull/66613/merge
---
2019-11-25T13:20:13.9565001Z ############################################################              84.3%
2019-11-25T13:20:13.9566792Z ######################################################################## 100.0%
2019-11-25T13:20:14.3440015Z extracting /checkout/obj/build/cache/2019-11-06/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
2019-11-25T13:20:14.4227807Z     Updating crates.io index
2019-11-25T13:20:21.1660215Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-25T13:20:21.1691282Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-25T13:20:21.1738283Z Makefile:67: recipe for target 'prepare' failed
2019-11-25T13:20:21.1742261Z make: *** [prepare] Error 1
2019-11-25T13:20:22.1751503Z Command failed. Attempt 2/5:
2019-11-25T13:20:22.1751503Z Command failed. Attempt 2/5:
2019-11-25T13:20:22.3906071Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-25T13:20:22.3922760Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-25T13:20:22.3965801Z make: *** [prepare] Error 1
2019-11-25T13:20:22.3966564Z Makefile:67: recipe for target 'prepare' failed
2019-11-25T13:20:24.4016160Z Command failed. Attempt 3/5:
2019-11-25T13:20:24.4016160Z Command failed. Attempt 3/5:
2019-11-25T13:20:24.6046536Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-25T13:20:24.6067626Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-25T13:20:24.6118287Z make: *** [prepare] Error 1
2019-11-25T13:20:24.6118754Z Makefile:67: recipe for target 'prepare' failed
2019-11-25T13:20:27.6134252Z Command failed. Attempt 4/5:
2019-11-25T13:20:27.6134252Z Command failed. Attempt 4/5:
2019-11-25T13:20:27.8205772Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-25T13:20:27.8218688Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-25T13:20:27.8266450Z make: *** [prepare] Error 1
2019-11-25T13:20:27.8267069Z Makefile:67: recipe for target 'prepare' failed
2019-11-25T13:20:31.8301895Z Command failed. Attempt 5/5:
2019-11-25T13:20:31.8301895Z Command failed. Attempt 5/5:
2019-11-25T13:20:32.0330076Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-25T13:20:32.0345080Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-25T13:20:32.0391072Z make: *** [prepare] Error 1
2019-11-25T13:20:32.0392121Z Makefile:67: recipe for target 'prepare' failed
2019-11-25T13:20:32.0394915Z The command has failed after 5 attempts.
2019-11-25T13:20:32.0398031Z == clock drift check ==
2019-11-25T13:20:32.0398031Z == clock drift check ==
2019-11-25T13:20:32.0405624Z   local time: Mon Nov 25 13:20:32 UTC 2019
2019-11-25T13:20:32.0690361Z   network time: Mon, 25 Nov 2019 13:20:32 GMT
2019-11-25T13:20:32.0693624Z == end clock drift check ==
2019-11-25T13:20:45.3561600Z 
2019-11-25T13:20:45.3659640Z ##[error]Bash exited with code '1'.
2019-11-25T13:20:45.3688717Z ##[section]Starting: Checkout
2019-11-25T13:20:45.3690504Z ==============================================================================
2019-11-25T13:20:45.3690562Z Task         : Get sources
2019-11-25T13:20:45.3690609Z 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)

@@ -401,15 +401,15 @@ impl NiceRegionError<'me, 'tcx> {
format!(
"{}`{}` would have to be implemented for the type `{}`",
if leading_ellipsis { "..." } else { "" },
expected_trait_ref,
expected_trait_ref.map(ty::TraitRef::print_only_trait_path),
Copy link
Member

Choose a reason for hiding this comment

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

Isn't |tr| tr.print_only_trait_path() shorter?

@@ -1292,7 +1292,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
}

pub fn trait_ref_to_string(&self, t: &ty::TraitRef<'tcx>) -> String {
self.resolve_vars_if_possible(t).to_string()
self.resolve_vars_if_possible(t).print_only_trait_path().to_string()
}
Copy link
Member

@eddyb eddyb Nov 28, 2019

Choose a reason for hiding this comment

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

I find it a bit odd that this method exists, I wonder where it's used. (not relevant to this PR though)

Copy link
Member

@eddyb eddyb left a comment

Choose a reason for hiding this comment

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

r=me modulo using closures instead of passing ty::TraitRef::print_only_trait_path (but that's not critical)

@bors
Copy link
Contributor

bors commented Nov 29, 2019

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

@rust-highfive
Copy link
Collaborator

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-29T14:17:48.2421754Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-29T14:17:48.2637298Z ##[command]git config gc.auto 0
2019-11-29T14:17:48.2741230Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-29T14:17:48.2821736Z ##[command]git config --get-all http.proxy
2019-11-29T14:17:48.3016476Z ##[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/66613/merge:refs/remotes/pull/66613/merge
---
2019-11-29T14:21:05.8028914Z ################################################                          67.9%
2019-11-29T14:21:05.8029610Z ######################################################################## 100.0%
2019-11-29T14:21:06.2181003Z extracting /checkout/obj/build/cache/2019-11-06/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
2019-11-29T14:21:06.3011988Z     Updating crates.io index
2019-11-29T14:21:14.3225924Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-29T14:21:14.3263909Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-29T14:21:14.3322620Z make: *** [prepare] Error 1
2019-11-29T14:21:14.3324046Z Makefile:67: recipe for target 'prepare' failed
2019-11-29T14:21:15.3337050Z Command failed. Attempt 2/5:
2019-11-29T14:21:15.4588173Z     Updating crates.io index
2019-11-29T14:21:15.4588173Z     Updating crates.io index
2019-11-29T14:21:15.8339023Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-29T14:21:15.8365541Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-29T14:21:15.8426062Z make: *** [prepare] Error 1
2019-11-29T14:21:15.8426855Z Makefile:67: recipe for target 'prepare' failed
2019-11-29T14:21:17.8433250Z Command failed. Attempt 3/5:
2019-11-29T14:21:17.9728983Z     Updating crates.io index
2019-11-29T14:21:17.9728983Z     Updating crates.io index
2019-11-29T14:21:18.3125239Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-29T14:21:18.3145710Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-29T14:21:18.3192754Z Makefile:67: recipe for target 'prepare' failed
2019-11-29T14:21:18.3192869Z make: *** [prepare] Error 1
2019-11-29T14:21:21.3205860Z Command failed. Attempt 4/5:
2019-11-29T14:21:21.4460010Z     Updating crates.io index
2019-11-29T14:21:21.4460010Z     Updating crates.io index
2019-11-29T14:21:21.7857274Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-29T14:21:21.7874557Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-29T14:21:21.7922837Z Makefile:67: recipe for target 'prepare' failed
2019-11-29T14:21:21.7927489Z make: *** [prepare] Error 1
2019-11-29T14:21:25.7940466Z Command failed. Attempt 5/5:
2019-11-29T14:21:25.9162891Z     Updating crates.io index
2019-11-29T14:21:25.9162891Z     Updating crates.io index
2019-11-29T14:21:26.2644477Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-29T14:21:26.2663543Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-29T14:21:26.2759068Z Makefile:67: recipe for target 'prepare' failed
2019-11-29T14:21:26.2759271Z The command has failed after 5 attempts.
2019-11-29T14:21:26.2759321Z == clock drift check ==
2019-11-29T14:21:26.2759372Z   local time: Fri Nov 29 14:21:26 UTC 2019
2019-11-29T14:21:26.2759372Z   local time: Fri Nov 29 14:21:26 UTC 2019
2019-11-29T14:21:26.2759444Z   network time: make: *** [prepare] Error 1
2019-11-29T14:21:26.8071480Z Fri, 29 Nov 2019 14:21:26 GMT
2019-11-29T14:21:26.8082427Z == end clock drift check ==
2019-11-29T14:21:39.7126354Z 
2019-11-29T14:21:39.7229033Z ##[error]Bash exited with code '1'.
2019-11-29T14:21:39.7259395Z ##[section]Starting: Checkout
2019-11-29T14:21:39.7261074Z ==============================================================================
2019-11-29T14:21:39.7261130Z Task         : Get sources
2019-11-29T14:21:39.7261179Z 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)

@eddyb
Copy link
Member

eddyb commented Nov 29, 2019

@Areredify Btw, if you use git gui to commit you can pick individual files (or hunks/lines from files), which allows you to avoid committing submodule changes, and also you can amend instead of making new commits.

@basil-cow
Copy link
Contributor Author

Why is this even happening? Do I need to do a submodule update every time before rebasing or commiting?

fix clippy

allow customising ty::TraitRef's printing behavior

fix clippy

stylistic fix
@eddyb
Copy link
Member

eddyb commented Nov 29, 2019

@Areredify I'm not sure, the only way I can think of to find out is to never use git commit -a and always look at what's being staged when committing (for me git gui does this perfectly).

Note that running x.py will update submodules so if you do it during a rebase that might cause issues.

@eddyb
Copy link
Member

eddyb commented Nov 29, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Nov 29, 2019

📌 Commit f07bd06 has been approved by eddyb

@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 Nov 29, 2019
RalfJung added a commit to RalfJung/rust that referenced this pull request Nov 29, 2019
Allow customising ty::TraitRef's printing behavior

This pr allows to explicitly choose which representation of `TraitRef` (`<T as Trait<U>>` or `Trait<U>`) you want to print. `Debug` and `Display` representations of `TraitRef` now match.

Closes rust-lang#59188.
@bors
Copy link
Contributor

bors commented Nov 29, 2019

⌛ Testing commit f07bd06 with merge b16b339...

bors added a commit that referenced this pull request Nov 29, 2019
Allow customising ty::TraitRef's printing behavior

This pr allows to explicitly choose which representation of `TraitRef` (`<T as Trait<U>>` or `Trait<U>`) you want to print. `Debug` and `Display` representations of `TraitRef` now match.

Closes #59188.
RalfJung added a commit to RalfJung/rust that referenced this pull request Nov 29, 2019
Allow customising ty::TraitRef's printing behavior

This pr allows to explicitly choose which representation of `TraitRef` (`<T as Trait<U>>` or `Trait<U>`) you want to print. `Debug` and `Display` representations of `TraitRef` now match.

Closes rust-lang#59188.
@RalfJung
Copy link
Member

@bors retry rolled up

bors added a commit that referenced this pull request Nov 29, 2019
Rollup of 11 pull requests

Successful merges:

 - #66379 (Rephrase docs in for ptr)
 - #66589 (Draw vertical lines correctly in compiler error messages)
 - #66613 (Allow customising ty::TraitRef's printing behavior)
 - #66766 (Panic machinery comments and tweaks)
 - #66791 (Handle GlobalCtxt directly from librustc_interface query system)
 - #66793 (Record temporary static references in generator witnesses)
 - #66808 (Cleanup error code)
 - #66826 (Clarifies how to tag users for assigning PRs)
 - #66837 (Clarify `{f32,f64}::EPSILON` docs)
 - #66844 (Miri: do not consider memory allocated by caller_location leaked)
 - #66872 (Minor documentation fix)

Failed merges:

r? @ghost
@bors bors merged commit f07bd06 into rust-lang:master Nov 30, 2019
@basil-cow basil-cow deleted the trait-ref-print branch December 2, 2019 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow customising ty::TraitRef's printing behavior.
7 participants