Skip to content

Commit 5fe6fc5

Browse files
committed
Remove a ton of public reexports
Remove most of the public reexports mentioned in #19253 These are all leftovers from the enum namespacing transition In particular: * src/libstd/num/strconv.rs * ExponentFormat * SignificantDigits * SignFormat * src/libstd/path/windows.rs * PathPrefix * src/libstd/sys/windows/timer.rs * Req * src/libcollections/str.rs * MaybeOwned * src/libstd/collections/hash/map.rs * Entry * src/libstd/collections/hash/table.rs * BucketState * src/libstd/dynamic_lib.rs * Rtld * src/libstd/io/net/ip.rs * IpAddr * src/libstd/os.rs * MemoryMapKind * MapOption * MapError * src/libstd/sys/common/net.rs * SocketStatus * InAddr * src/libstd/sys/unix/timer.rs * Req [breaking-change]
1 parent c141f22 commit 5fe6fc5

File tree

34 files changed

+85
-72
lines changed

34 files changed

+85
-72
lines changed

src/compiletest/runtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1609,7 +1609,7 @@ fn _arm_exec_compiled_test(config: &Config,
16091609
stderr_out.as_slice());
16101610

16111611
ProcRes {
1612-
status: process::ExitStatus(exitcode),
1612+
status: process::ProcessExit::ExitStatus(exitcode),
16131613
stdout: stdout_out,
16141614
stderr: stderr_out,
16151615
cmdline: cmdline

src/libcollections/str.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
5252
#![doc(primitive = "str")]
5353

54-
pub use self::MaybeOwned::*;
54+
use self::MaybeOwned::*;
5555
use self::RecompositionState::*;
5656
use self::DecompositionType::*;
5757

@@ -842,7 +842,7 @@ mod tests {
842842
use core::iter::AdditiveIterator;
843843
use super::{eq_slice, from_utf8, is_utf8, is_utf16, raw};
844844
use super::truncate_utf16_at_nul;
845-
use super::{Owned, Slice};
845+
use super::MaybeOwned::{Owned, Slice};
846846

847847
#[test]
848848
fn test_eq_slice() {

src/libcollections/string.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ use core::raw::Slice as RawSlice;
2626

2727
use slice::CloneSliceExt;
2828
use str;
29-
use str::{CharRange, CowString, FromStr, StrAllocating, Owned};
29+
use str::{CharRange, CowString, FromStr, StrAllocating};
30+
use str::MaybeOwned::Owned;
3031
use vec::{DerefVec, Vec, as_vec};
3132

3233
/// A growable string stored as a UTF-8 encoded buffer.

src/librustc/lint/builtin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use util::nodemap::{FnvHashMap, NodeSet};
3737
use lint::{Context, LintPass, LintArray};
3838

3939
use std::{cmp, slice};
40-
use std::collections::hash_map::{Occupied, Vacant};
40+
use std::collections::hash_map::Entry::{Occupied, Vacant};
4141
use std::num::SignedInt;
4242
use std::{i8, i16, i32, i64, u8, u16, u32, u64, f32, f64};
4343
use syntax::{abi, ast, ast_map};

src/librustc/metadata/creader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use plugin::load::PluginMetadata;
2323
use util::nodemap::FnvHashMap;
2424

2525
use std::rc::Rc;
26-
use std::collections::hash_map::{Occupied, Vacant};
26+
use std::collections::hash_map::Entry::{Occupied, Vacant};
2727
use syntax::ast;
2828
use syntax::abi;
2929
use syntax::attr;

src/librustc/metadata/loader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ use util::fs;
228228

229229
use std::c_str::ToCStr;
230230
use std::cmp;
231-
use std::collections::hash_map::{Occupied, Vacant};
231+
use std::collections::hash_map::Entry::{Occupied, Vacant};
232232
use std::collections::{HashMap, HashSet};
233233
use std::io::fs::PathExtensions;
234234
use std::io;

src/librustc/middle/const_eval.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use syntax::visit::{mod, Visitor};
2828
use syntax::{ast_map, ast_util, codemap};
2929

3030
use std::rc::Rc;
31-
use std::collections::hash_map::Vacant;
31+
use std::collections::hash_map::Entry::Vacant;
3232

3333
//
3434
// This pass classifies expressions by their constant-ness.

src/librustc/middle/infer/freshen.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use middle::ty::{mod, Ty};
3434
use middle::ty_fold;
3535
use middle::ty_fold::TypeFoldable;
3636
use middle::ty_fold::TypeFolder;
37-
use std::collections::hash_map;
37+
use std::collections::hash_map::{mod, Entry};
3838

3939
use super::InferCtxt;
4040
use super::unify::InferCtxtMethodsForSimplyUnifiableTypes;
@@ -67,8 +67,8 @@ impl<'a, 'tcx> TypeFreshener<'a, 'tcx> {
6767
}
6868

6969
match self.freshen_map.entry(key) {
70-
hash_map::Occupied(entry) => *entry.get(),
71-
hash_map::Vacant(entry) => {
70+
Entry::Occupied(entry) => *entry.get(),
71+
Entry::Vacant(entry) => {
7272
let index = self.freshen_count;
7373
self.freshen_count += 1;
7474
let t = ty::mk_infer(self.infcx.tcx, freshener(index));

src/librustc/middle/infer/region_inference/graphviz.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use session::config;
2626
use util::nodemap::{FnvHashMap, FnvHashSet};
2727
use util::ppaux::Repr;
2828

29-
use std::collections::hash_map::Vacant;
29+
use std::collections::hash_map::Entry::Vacant;
3030
use std::io::{mod, File};
3131
use std::os;
3232
use std::sync::atomic;

src/librustc/middle/traits/fulfill.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use middle::infer::InferCtxt;
1212
use middle::mem_categorization::Typer;
1313
use middle::ty::{mod, Ty};
1414
use std::collections::HashSet;
15-
use std::collections::hash_map::{Occupied, Vacant};
15+
use std::collections::hash_map::Entry::{Occupied, Vacant};
1616
use std::default::Default;
1717
use std::rc::Rc;
1818
use syntax::ast;

0 commit comments

Comments
 (0)