diff options
| author | Huon Wilson <dbau.pp+github@gmail.com> | 2013-08-16 15:54:14 +1000 |
|---|---|---|
| committer | Huon Wilson <dbau.pp+github@gmail.com> | 2013-08-16 15:54:14 +1000 |
| commit | 72fd02d93985bc9be359d736eec0484cb51a8b3f (patch) | |
| tree | 97320928c95c49aefbf757500be8b4432b7f80c8 | |
| parent | abe94f9b4d0d072e2477b989715c6c79e97de259 (diff) | |
| download | rust-72fd02d93985bc9be359d736eec0484cb51a8b3f.tar.gz rust-72fd02d93985bc9be359d736eec0484cb51a8b3f.zip | |
doc: convert remaining uses of core:: to std::.
| -rw-r--r-- | src/etc/cmathconsts.c | 2 | ||||
| -rwxr-xr-x | src/etc/ziggurat_tables.py | 2 | ||||
| -rw-r--r-- | src/etc/zsh/_rust | 2 | ||||
| -rw-r--r-- | src/libstd/io.rs | 8 | ||||
| -rw-r--r-- | src/libstd/os.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rand/distributions.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rt/io/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/mod.rs | 24 | ||||
| -rw-r--r-- | src/libstd/rt/uv/mod.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ast.rs | 6 | ||||
| -rw-r--r-- | src/rt/rust_log.cpp | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-5543.rs | 4 |
12 files changed, 30 insertions, 30 deletions
diff --git a/src/etc/cmathconsts.c b/src/etc/cmathconsts.c index 7a7f13a7e97..21b1b377afa 100644 --- a/src/etc/cmathconsts.c +++ b/src/etc/cmathconsts.c @@ -13,7 +13,7 @@ #include <math.h> #include <stdio.h> -// must match core::ctypes +// must match std::ctypes #define C_FLT(x) (float)x #define C_DBL(x) (double)x diff --git a/src/etc/ziggurat_tables.py b/src/etc/ziggurat_tables.py index c8f873037d8..51c0da39bd5 100755 --- a/src/etc/ziggurat_tables.py +++ b/src/etc/ziggurat_tables.py @@ -2,7 +2,7 @@ # xfail-license # This creates the tables used for distributions implemented using the -# ziggurat algorithm in `core::rand::distributions;`. They are +# ziggurat algorithm in `std::rand::distributions;`. They are # (basically) the tables as used in the ZIGNOR variant (Doornik 2005). # They are changed rarely, so the generated file should be checked in # to git. diff --git a/src/etc/zsh/_rust b/src/etc/zsh/_rust index 7320eced7e1..3d0163d9e25 100644 --- a/src/etc/zsh/_rust +++ b/src/etc/zsh/_rust @@ -36,7 +36,7 @@ _rustc_opts_lint=( 'path-statement[path statements with no effect]' 'missing-trait-doc[detects missing documentation for traits]' 'missing-struct-doc[detects missing documentation for structs]' - 'ctypes[proper use of core::libc types in foreign modules]' + 'ctypes[proper use of std::libc types in foreign modules]' "unused-mut[detect mut variables which don't need to be mutable]" 'unused-imports[imports that are never used]' 'heap-memory[use of any (~ type or @ type) heap memory]' diff --git a/src/libstd/io.rs b/src/libstd/io.rs index 2c18bd272e8..0df575b7f41 100644 --- a/src/libstd/io.rs +++ b/src/libstd/io.rs @@ -1029,9 +1029,9 @@ pub fn FILE_reader(f: *libc::FILE, cleanup: bool) -> @Reader { * # Example * * ~~~ {.rust} -* let stdin = core::io::stdin(); +* let stdin = std::io::stdin(); * let line = stdin.read_line(); -* core::io::print(line); +* std::io::print(line); * ~~~ */ pub fn stdin() -> @Reader { @@ -1598,7 +1598,7 @@ pub fn buffered_file_writer(path: &Path) -> Result<@Writer, ~str> { * # Example * * ~~~ {.rust} -* let stdout = core::io::stdout(); +* let stdout = std::io::stdout(); * stdout.write_str("hello\n"); * ~~~ */ @@ -1610,7 +1610,7 @@ pub fn stdout() -> @Writer { fd_writer(libc::STDOUT_FILENO as c_int, false) } * # Example * * ~~~ {.rust} -* let stderr = core::io::stderr(); +* let stderr = std::io::stderr(); * stderr.write_str("hello\n"); * ~~~ */ diff --git a/src/libstd/os.rs b/src/libstd/os.rs index c916be79c53..53c5d255f1c 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -411,7 +411,7 @@ pub fn pipe() -> Pipe { // inheritance has to be handled in a different way that I do not // fully understand. Here we explicitly make the pipe non-inheritable, // which means to pass it to a subprocess they need to be duplicated - // first, as in core::run. + // first, as in std::run. let mut fds = Pipe {input: 0 as c_int, out: 0 as c_int }; let res = libc::pipe(&mut fds.input, 1024 as ::libc::c_uint, diff --git a/src/libstd/rand/distributions.rs b/src/libstd/rand/distributions.rs index 56eae042875..67be7986c33 100644 --- a/src/libstd/rand/distributions.rs +++ b/src/libstd/rand/distributions.rs @@ -66,7 +66,7 @@ fn ziggurat<R:Rng>(rng: &mut R, /// # Example /// /// ~~~ -/// use core::rand::distributions::StandardNormal; +/// use std::rand::distributions::StandardNormal; /// /// fn main() { /// let normal = 2.0 + (*rand::random::<StandardNormal>()) * 3.0; @@ -120,7 +120,7 @@ impl Rand for StandardNormal { /// # Example /// /// ~~~ -/// use core::rand::distributions::Exp1; +/// use std::rand::distributions::Exp1; /// /// fn main() { /// let exp2 = (*rand::random::<Exp1>()) * 0.5; diff --git a/src/libstd/rt/io/mod.rs b/src/libstd/rt/io/mod.rs index 78c4cec2d4c..aec9168b5d1 100644 --- a/src/libstd/rt/io/mod.rs +++ b/src/libstd/rt/io/mod.rs @@ -19,7 +19,7 @@ file, TCP, UDP, Unix domain sockets. Readers and Writers may be composed to add capabilities like string parsing, encoding, and compression. -This will likely live in core::io, not core::rt::io. +This will likely live in std::io, not std::rt::io. # Examples diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index 65214d0cea7..58e86f97f71 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -40,17 +40,17 @@ out of `rt` as development proceeds. Several modules in `core` are clients of `rt`: -* `core::task` - The user-facing interface to the Rust task model. -* `core::task::local_data` - The interface to local data. -* `core::gc` - The garbage collector. -* `core::unstable::lang` - Miscellaneous lang items, some of which rely on `core::rt`. -* `core::condition` - Uses local data. -* `core::cleanup` - Local heap destruction. -* `core::io` - In the future `core::io` will use an `rt` implementation. -* `core::logging` -* `core::pipes` -* `core::comm` -* `core::stackwalk` +* `std::task` - The user-facing interface to the Rust task model. +* `std::task::local_data` - The interface to local data. +* `std::gc` - The garbage collector. +* `std::unstable::lang` - Miscellaneous lang items, some of which rely on `std::rt`. +* `std::condition` - Uses local data. +* `std::cleanup` - Local heap destruction. +* `std::io` - In the future `std::io` will use an `rt` implementation. +* `std::logging` +* `std::pipes` +* `std::comm` +* `std::stackwalk` */ @@ -139,7 +139,7 @@ pub mod rc; /// scheduler and task context pub mod tube; -/// Simple reimplementation of core::comm +/// Simple reimplementation of std::comm pub mod comm; mod select; diff --git a/src/libstd/rt/uv/mod.rs b/src/libstd/rt/uv/mod.rs index 6c5a28b31b1..59833a16ed8 100644 --- a/src/libstd/rt/uv/mod.rs +++ b/src/libstd/rt/uv/mod.rs @@ -10,7 +10,7 @@ /*! -Bindings to libuv, along with the default implementation of `core::rt::rtio`. +Bindings to libuv, along with the default implementation of `std::rt::rtio`. UV types consist of the event loop (Loop), Watchers, Requests and Callbacks. diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 17247222c3f..b01c19a59c1 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -100,7 +100,7 @@ pub struct Lifetime { } // a "Path" is essentially Rust's notion of a name; -// for instance: core::cmp::Eq . It's represented +// for instance: std::cmp::Eq . It's represented // as a sequence of identifiers, along with a bunch // of supporting information. #[deriving(Clone, Eq, Encodable, Decodable, IterBytes)] @@ -1093,8 +1093,8 @@ pub enum inlined_item { /* hold off on tests ... they appear in a later merge. #[cfg(test)] mod test { - use core::option::{None, Option, Some}; - use core::uint; + use std::option::{None, Option, Some}; + use std::uint; use extra; use codemap::*; use super::*; diff --git a/src/rt/rust_log.cpp b/src/rt/rust_log.cpp index 25b246c69f5..127a1b57a21 100644 --- a/src/rt/rust_log.cpp +++ b/src/rt/rust_log.cpp @@ -31,7 +31,7 @@ const size_t default_log_level = log_err; // This is a rather ugly parser for strings in the form // "crate1,crate2.mod3,crate3.x=1". Log levels are 0-255, -// with the most likely ones being 0-3 (defined in core::). +// with the most likely ones being 0-3 (defined in std::). size_t parse_logging_spec(char* spec, log_directive* dirs) { size_t dir = 0; while (dir < max_log_directives && *spec) { diff --git a/src/test/compile-fail/issue-5543.rs b/src/test/compile-fail/issue-5543.rs index cad47eff013..c2b15c2fd1b 100644 --- a/src/test/compile-fail/issue-5543.rs +++ b/src/test/compile-fail/issue-5543.rs @@ -9,8 +9,8 @@ // except according to those terms. // xfail-test -use core::io::ReaderUtil; -use core::io::Reader; +use std::io::ReaderUtil; +use std::io::Reader; fn bar(r:@ReaderUtil) -> ~str { r.read_line() } |
