Skip to content

Commit 819d07a

Browse files
committed
Update doc references to new names for std, extra, and std::libc
1 parent 98bd683 commit 819d07a

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

src/README.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Source layout:
44

55
librustc/ The self-hosted compiler
66

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

1111
rt/ The runtime system

src/libextra/std.rc

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010

1111
/*!
1212

13-
The Rust standard library.
13+
The Rust "extras" library.
1414

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

1818
*/
1919

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

25-
#[comment = "The Rust standard library"];
25+
#[comment = "The Rust extras library"];
2626
#[license = "MIT/ASL2"];
2727
#[crate_type = "lib"];
2828

@@ -128,7 +128,7 @@ pub mod test;
128128
pub mod serialize;
129129

130130
// A curious inner-module that's not exported that contains the binding
131-
// 'extra' so that macro-expanded references to std::serialize and such
131+
// 'extra' so that macro-expanded references to extra::serialize and such
132132
// can be resolved within libextra.
133133
#[doc(hidden)]
134134
pub mod std {

src/libstd/core.rc

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ with the `std::` path prefix, as in `use std::vec`, `use std::task::spawn`,
3838
etc.
3939

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

@@ -66,7 +66,7 @@ they contained the following prologue:
6666
#[deny(non_camel_case_types)];
6767
#[deny(missing_doc)];
6868

69-
// Make core testable by not duplicating lang items. See #2912
69+
// Make std testable by not duplicating lang items. See #2912
7070
#[cfg(test)] extern mod realstd(name = "std");
7171
#[cfg(test)] pub use kinds = realstd::kinds;
7272
#[cfg(test)] pub use ops = realstd::ops;

src/libstd/libc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* This module contains bindings to the C standard library,
1515
* organized into modules by their defining standard.
1616
* Additionally, it contains some assorted platform-specific definitions.
17-
* For convenience, most functions and types are reexported from `core::libc`,
18-
* so `pub use core::libc::*` will import the available
17+
* For convenience, most functions and types are reexported from `std::libc`,
18+
* so `pub use std::libc::*` will import the available
1919
* C bindings as appropriate for the target platform. The exact
2020
* set of functions available are platform specific.
2121
*

0 commit comments

Comments
 (0)