diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2014-08-12 20:31:30 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2014-08-16 19:32:25 -0700 |
| commit | 7f928d150e53b5873b4238f9e60d1aa4be9b602f (patch) | |
| tree | 02452858125464ce20b886a2b61d77b0c3b3d65a /src/librustc/middle/astencode.rs | |
| parent | 85fd37f876dad1d4db02208f8a56f02228d975b0 (diff) | |
| download | rust-7f928d150e53b5873b4238f9e60d1aa4be9b602f.tar.gz rust-7f928d150e53b5873b4238f9e60d1aa4be9b602f.zip | |
librustc: Forbid external crates, imports, and/or items from being
declared with the same name in the same scope.
This breaks several common patterns. First are unused imports:
use foo::bar;
use baz::bar;
Change this code to the following:
use baz::bar;
Second, this patch breaks globs that import names that are shadowed by
subsequent imports. For example:
use foo::*; // including `bar`
use baz::bar;
Change this code to remove the glob:
use foo::{boo, quux};
use baz::bar;
Or qualify all uses of `bar`:
use foo::{boo, quux};
use baz;
... baz::bar ...
Finally, this patch breaks code that, at top level, explicitly imports
`std` and doesn't disable the prelude.
extern crate std;
Because the prelude imports `std` implicitly, there is no need to
explicitly import it; just remove such directives.
The old behavior can be opted into via the `import_shadowing` feature
gate. Use of this feature gate is discouraged.
This implements RFC #116.
Closes #16464.
[breaking-change]
Diffstat (limited to 'src/librustc/middle/astencode.rs')
| -rw-r--r-- | src/librustc/middle/astencode.rs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/librustc/middle/astencode.rs b/src/librustc/middle/astencode.rs index 26cb2f25129..ff2830421e0 100644 --- a/src/librustc/middle/astencode.rs +++ b/src/librustc/middle/astencode.rs @@ -47,8 +47,8 @@ use rbml::io::SeekableMemWriter; use rbml::{reader, writer}; use rbml; use serialize; -use serialize::{Encoder, Encodable, EncoderHelpers, DecoderHelpers}; -use serialize::{Decoder, Decodable}; +use serialize::{Decodable, Decoder, DecoderHelpers, Encodable}; +use serialize::{EncoderHelpers}; #[cfg(test)] use syntax::parse; #[cfg(test)] use syntax::print::pprust; @@ -620,6 +620,8 @@ fn encode_method_callee(ecx: &e::EncodeContext, rbml_w: &mut Encoder, adjustment: typeck::ExprAdjustment, method: &MethodCallee) { + use serialize::Encoder; + rbml_w.emit_struct("MethodCallee", 4, |rbml_w| { rbml_w.emit_struct_field("adjustment", 0u, |rbml_w| { adjustment.encode(rbml_w) @@ -695,6 +697,8 @@ fn encode_vtable_res_with_key(ecx: &e::EncodeContext, rbml_w: &mut Encoder, adjustment: typeck::ExprAdjustment, dr: &typeck::vtable_res) { + use serialize::Encoder; + rbml_w.emit_struct("VtableWithKey", 2, |rbml_w| { rbml_w.emit_struct_field("adjustment", 0u, |rbml_w| { adjustment.encode(rbml_w) @@ -728,6 +732,8 @@ pub fn encode_vtable_param_res(ecx: &e::EncodeContext, pub fn encode_unboxed_closure_kind(ebml_w: &mut Encoder, kind: ty::UnboxedClosureKind) { + use serialize::Encoder; + ebml_w.emit_enum("UnboxedClosureKind", |ebml_w| { match kind { ty::FnUnboxedClosureKind => { @@ -755,6 +761,8 @@ pub fn encode_unboxed_closure_kind(ebml_w: &mut Encoder, pub fn encode_vtable_origin(ecx: &e::EncodeContext, rbml_w: &mut Encoder, vtable_origin: &typeck::vtable_origin) { + use serialize::Encoder; + rbml_w.emit_enum("vtable_origin", |rbml_w| { match *vtable_origin { typeck::vtable_static(def_id, ref substs, ref vtable_res) => { @@ -985,6 +993,8 @@ impl<'a> rbml_writer_helpers for Encoder<'a> { fn emit_polytype(&mut self, ecx: &e::EncodeContext, pty: ty::Polytype) { + use serialize::Encoder; + self.emit_struct("Polytype", 2, |this| { this.emit_struct_field("generics", 0, |this| { this.emit_struct("Generics", 2, |this| { @@ -1013,6 +1023,8 @@ impl<'a> rbml_writer_helpers for Encoder<'a> { } fn emit_auto_adjustment(&mut self, ecx: &e::EncodeContext, adj: &ty::AutoAdjustment) { + use serialize::Encoder; + self.emit_enum("AutoAdjustment", |this| { match *adj { ty::AutoAddEnv(store) => { |
