diff options
| author | bors <bors@rust-lang.org> | 2016-10-23 08:23:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-23 08:23:22 -0700 |
| commit | 1e5dab1da04143a454a4f3d7e3f835ce990b437a (patch) | |
| tree | 515eea5939526208c8c22bdee6df22735a552d19 | |
| parent | 1bc7f8f49f813e2fa77b0e3727697dc98cf967e7 (diff) | |
| parent | f9cb7dfc0c92e2196ee04b1a138f37069e60d71d (diff) | |
| download | rust-1e5dab1da04143a454a4f3d7e3f835ce990b437a.tar.gz rust-1e5dab1da04143a454a4f3d7e3f835ce990b437a.zip | |
Auto merge of #37358 - typelist:select-fix, r=eddyb
Fix typo that resulted in comparison-to-self This line was introduced in commit 843db01bd925279da0a56efde532c9e3ecf73610, rebased from eddyb's c5f6f84d59b853b6a3485380721b71b479ece337. I don't know whether this fixes anything in practice, but it seems like the changed version was what was intended originally. r? @eddyb
| -rw-r--r-- | src/librustc/traits/select.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs index f4747b5b108..941cef39fb2 100644 --- a/src/librustc/traits/select.rs +++ b/src/librustc/traits/select.rs @@ -1614,7 +1614,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> { // // We always upcast when we can because of reason // #2 (region bounds). - data_a.principal.def_id() == data_a.principal.def_id() && + data_a.principal.def_id() == data_b.principal.def_id() && data_a.builtin_bounds.is_superset(&data_b.builtin_bounds) } |