auto merge of #12415 : HeroesGrave/rust/move-enum-set, r=alexcrichton

Part of #8784

Also removed the one glob import.

diff --cc src/libcollections/lib.rs
Simple merge

diff --cc src/libextra/lib.rs
Simple merge

diff --cc src/librustc/middle/ty.rs
Simple merge