]> git.lizzy.rs Git - rust.git/commit
Rollup merge of #40268 - Mark-Simulacrum:normalization-followup, r=arielb1
authorAriel Ben-Yehuda <arielb1@mail.tau.ac.il>
Wed, 8 Mar 2017 18:53:56 +0000 (20:53 +0200)
committerGitHub <noreply@github.com>
Wed, 8 Mar 2017 18:53:56 +0000 (20:53 +0200)
commit4eb7a335c0f6f2dd7b94b92701f46b5ae2a0081b
treefdc818ce89dd1f2d71f88ea404ca712af579e80d
parent5694ac9e7bc9a6f7785743a48591dfd4e5cbfdab
parent403ae37ce8f680e378dc77904a27453df0867b99
Rollup merge of #40268 - Mark-Simulacrum:normalization-followup, r=arielb1

Fix normalization error

Follows #40163. I don't know whether this is good, but seems logical.

[This block of code](https://github.com/rust-lang/rust/blob/ba07bd5d23aced6d4baa5696213b11ca832c1a5d/src/librustc_typeck/check/mod.rs#L2110-L2138) doesn't contain a call to `normalize_associated_types_in`, while [this](https://github.com/rust-lang/rust/blob/master/src/librustc_typeck/check/mod.rs#L2027-L2028) block does, and is nearly identical.

Ideally these two blocks should be unified into one, but since the change doesn't seem trivial and I'm unsure if this patch will be accepted it hasn't been done yet.

r? @arielb1