about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-05-22 06:54:34 +0000
committerbors <bors@rust-lang.org>2018-05-22 06:54:34 +0000
commit1bbae5f38677e823ba6e23f1e0e105ceee4c6f8a (patch)
tree3fe8b76e82858f4a219fcf11dba457968d66510c /src/libstd/sync
parent6835748725b9bd892d5b64d20ded4ced973ed3b7 (diff)
parentaa5635338c53fbd9f3ca326b55948bc21e655606 (diff)
downloadrust-1bbae5f38677e823ba6e23f1e0e105ceee4c6f8a.tar.gz
rust-1bbae5f38677e823ba6e23f1e0e105ceee4c6f8a.zip
Auto merge of #50876 - matthewjasper:rollback-trivial-bounds, r=nikomatsakis
Filter global bounds from ParamEnv again.

This PR adds back the filtering of global bounds from ParamEnv as a temporary solution for #50825.

<details>

Long term, the fix seems like it should be changing the priority in `candidate_should_be_dropped_in_favor_of` so that (global) where clauses aren't considered as highly.

https://github.com/rust-lang/rust/blob/a722296b6ec17fecd3f16a7d3f9232b83e5de800/src/librustc/traits/select.rs#L2017-L2022

</details>

r? @nikomatsakis
Diffstat (limited to 'src/libstd/sync')
0 files changed, 0 insertions, 0 deletions