Auto merge of #45725 - alexcrichton:std-less-rand, r=dtolnay

Working towards a libc-less (wasm32) libstd

This is a series of commits I was able to extract from prepare to comiple libstd on a "bare libc-less" target, notably wasm32. The actual wasm32 bits I intend to send in a PR later, this is just some internal refactorings required for libstd to work with a `libc` that's empty and a few other assorted refactorings.

No functional change should be included in this PR for users of libstd, this is intended to just be internal refactorings.

2 files changed, 2 insertions, 3 deletions

diff --git a/src/libcore/Cargo.toml b/src/libcore/Cargo.toml
index 178df02ccdd..d1a0a5f09e0 100644
--- a/src/libcore/Cargo.toml
+++ b/src/libcore/Cargo.toml
@@ -10,7 +10,7 @@ test = false
 bench = false
 
 [dev-dependencies]
-rand = { path = "../librand" }
+rand = "0.3"
 
 [[test]]
 name = "coretests"
diff --git a/src/libcore/tests/num/flt2dec/mod.rs b/src/libcore/tests/num/flt2dec/mod.rs
index 0f4d19e7092..2720c5c8677 100644
--- a/src/libcore/tests/num/flt2dec/mod.rs
+++ b/src/libcore/tests/num/flt2dec/mod.rs
@@ -10,8 +10,7 @@
 
 use std::prelude::v1::*;
 use std::{str, mem, i16, f32, f64, fmt};
-use std::__rand as rand;
-use rand::{Rand, XorShiftRng};
+use rand::{self, Rand, XorShiftRng};
 use rand::distributions::{IndependentSample, Range};
 
 use core::num::flt2dec::{decode, DecodableFloat, FullDecoded, Decoded};