]> git.lizzy.rs Git - rust.git/commit
Fix merge conflicts from making enum variants namespaced.
authorNiko Matsakis <niko@alum.mit.edu>
Mon, 17 Nov 2014 20:25:37 +0000 (15:25 -0500)
committerNiko Matsakis <niko@alum.mit.edu>
Mon, 17 Nov 2014 20:25:56 +0000 (15:25 -0500)
commit99fbd34d7e60faf99afd5065eb55c4fc19af87ec
tree1b4b1c0298399f1d57a0fce546f8b63cbb2d7217
parentd7bb01eb52d6b3b40084450d99eb928d74d25d6e
Fix merge conflicts from making enum variants namespaced.
src/librustc/middle/fast_reject.rs
src/librustc/middle/traits/select.rs
src/librustc/middle/typeck/check/method/mod.rs
src/librustc/middle/typeck/check/method/probe.rs
src/librustc/middle/typeck/infer/glb.rs
src/librustc/middle/typeck/infer/lub.rs
src/librustc/middle/typeck/infer/mod.rs
src/librustc/middle/typeck/infer/sub.rs