auto merge of #14253 : alexcrichton/rust/issue-14221, r=pcwalton

This plugs a leak where resolve was treating enums defined in parent modules as
in-scope for all children modules when resolving a pattern identifier. This
eliminates the code path in resolve entirely.

If this breaks any existing code, then it indicates that the variants need to be
explicitly imported into the module.

Closes #14221

diff --cc src/compiletest/runtest.rs
Simple merge

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