]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: af41097 36eb09f)
Auto merge of #25344 - arielb1:fresh-float, r=nikomatsakis
authorbors <bors@rust-lang.org>
Wed, 13 May 2015 15:42:45 +0000 (15:42 +0000)
committerbors <bors@rust-lang.org>
Wed, 13 May 2015 15:42:45 +0000 (15:42 +0000)
commit222cd73b8a422d2c4124375f6aaffd2663bb9718
tree47922b9cae608808b0aea070e8a1367381d4af74tree | snapshot
parentaf41097b4906fdbd395b74f7de17f84f1666fe7acommit | diff
parent36eb09f356ef49e94dc367467325fce6048273c8commit | diff
Auto merge of #25344 - arielb1:fresh-float, r=nikomatsakis

There is no subtyping relationship between the types (or their non-freshened
variants), so they can not be merged.

Fixes #22645
Fixes #24352
Fixes #23825

Should fix #25235 (no test in issue).
Should fix #19976 (test is outdated).
src/librustc/middle/traits/select.rs diff1 | diff2 | blob | history
src/librustc/middle/ty.rs diff1 | diff2 | blob | history
Empowering everyone to build reliable and efficient software.