Skip to content

Commit

Permalink
Update doc references to new names for std, extra, and std::libc
Browse files Browse the repository at this point in the history
  • Loading branch information
rkbodenner committed Jun 17, 2013
1 parent 98bd683 commit 819d07a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/README.txt
Expand Up @@ -4,8 +4,8 @@ Source layout:

librustc/ The self-hosted compiler

libcore/ The core library (imported and linked by default)
libstd/ The standard library (slightly more peripheral code)
libstd/ The standard library (imported and linked by default)
libextra/ The "extras" library (slightly more peripheral code)
libsyntax/ The Rust parser and pretty-printer

rt/ The runtime system
Expand Down
12 changes: 6 additions & 6 deletions src/libextra/std.rc
Expand Up @@ -10,19 +10,19 @@

/*!

The Rust standard library.
The Rust "extras" library.

The Rust standand library provides a number of useful features that are
not required in or otherwise suitable for the core library.
The Rust extras library (`extra`) provides a number of useful features that
are not required in or otherwise suitable for the standard library (`std`).

*/

#[link(name = "extra",
vers = "0.7-pre",
uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
url = "https://github.com/mozilla/rust/tree/master/src/libstd")];
url = "https://github.com/mozilla/rust/tree/master/src/libextra")];

#[comment = "The Rust standard library"];
#[comment = "The Rust extras library"];
#[license = "MIT/ASL2"];
#[crate_type = "lib"];

Expand Down Expand Up @@ -128,7 +128,7 @@ pub mod test;
pub mod serialize;

// A curious inner-module that's not exported that contains the binding
// 'extra' so that macro-expanded references to std::serialize and such
// 'extra' so that macro-expanded references to extra::serialize and such
// can be resolved within libextra.
#[doc(hidden)]
pub mod std {
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/core.rc
Expand Up @@ -38,7 +38,7 @@ with the `std::` path prefix, as in `use std::vec`, `use std::task::spawn`,
etc.

Additionally, `std` contains a `prelude` module that reexports many of the
most common std modules, types and traits. The contents of the prelude are
most common `std` modules, types and traits. The contents of the prelude are
imported into every *module* by default. Implicitly, all modules behave as if
they contained the following prologue:

Expand Down Expand Up @@ -66,7 +66,7 @@ they contained the following prologue:
#[deny(non_camel_case_types)];
#[deny(missing_doc)];

// Make core testable by not duplicating lang items. See #2912
// Make std testable by not duplicating lang items. See #2912
#[cfg(test)] extern mod realstd(name = "std");
#[cfg(test)] pub use kinds = realstd::kinds;
#[cfg(test)] pub use ops = realstd::ops;
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/libc.rs
Expand Up @@ -14,8 +14,8 @@
* This module contains bindings to the C standard library,
* organized into modules by their defining standard.
* Additionally, it contains some assorted platform-specific definitions.
* For convenience, most functions and types are reexported from `core::libc`,
* so `pub use core::libc::*` will import the available
* For convenience, most functions and types are reexported from `std::libc`,
* so `pub use std::libc::*` will import the available
* C bindings as appropriate for the target platform. The exact
* set of functions available are platform specific.
*
Expand Down

0 comments on commit 819d07a

Please sign in to comment.