Skip to content

Commit 5acc8e5

Browse files
committed
Reproduce text changes from @brson PR 7176 and fix a typo therein
1 parent 819d07a commit 5acc8e5

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

src/libextra/std.rc

+7-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010

1111
/*!
1212

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

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`).
15+
The `extra` crate is a set of useful modules for a variety of
16+
purposes, including collections, numerics, I/O, serialization,
17+
and concurrency.
18+
19+
Rust extras are part of the standard Rust distribution.
1720

1821
*/
1922

@@ -22,7 +25,7 @@ are not required in or otherwise suitable for the standard library (`std`).
2225
uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
2326
url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
2427

25-
#[comment = "The Rust extras library"];
28+
#[comment = "Rust extras"];
2629
#[license = "MIT/ASL2"];
2730
#[crate_type = "lib"];
2831

src/libstd/core.rc

+15-14
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,20 @@
1212

1313
# The Rust standard library
1414

15-
The Rust standard library provides runtime features required by the language,
16-
including the task scheduler and memory allocators, as well as library
17-
support for Rust built-in types, platform abstractions, and other commonly
18-
used features.
19-
20-
`std` includes modules corresponding to each of the integer types, each of
21-
the floating point types, the `bool` type, tuples, characters, strings
22-
(`str`), vectors (`vec`), managed boxes (`managed`), owned boxes (`owned`),
23-
and unsafe and borrowed pointers (`ptr`). Additionally, `std` provides
24-
pervasive types (`option` and `result`), task creation and communication
25-
primitives (`task`, `comm`), platform abstractions (`os` and `path`), basic
26-
I/O abstractions (`io`), common traits (`kinds`, `ops`, `cmp`, `num`,
27-
`to_str`), and complete bindings to the C standard library (`libc`).
15+
The Rust standard library is a group of interrelated modules defining
16+
the core language traits, operations on built-in data types, collections,
17+
platform abstractions, the task scheduler, runtime support for language
18+
features and other common functionality.
19+
20+
`std` includes modules corresponding to each of the integer types,
21+
each of the floating point types, the `bool` type, tuples, characters,
22+
strings (`str`), vectors (`vec`), managed boxes (`managed`), owned
23+
boxes (`owned`), and unsafe and borrowed pointers (`ptr`, `borrowed`).
24+
Additionally, `std` provides pervasive types (`option` and `result`),
25+
task creation and communication primitives (`task`, `comm`), platform
26+
abstractions (`os` and `path`), basic I/O abstractions (`io`), common
27+
traits (`kinds`, `ops`, `cmp`, `num`, `to_str`), and complete bindings
28+
to the C standard library (`libc`).
2829

2930
# Standard library injection and the Rust prelude
3031

@@ -38,7 +39,7 @@ with the `std::` path prefix, as in `use std::vec`, `use std::task::spawn`,
3839
etc.
3940

4041
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
42+
most common types, traits and functions. The contents of the prelude are
4243
imported into every *module* by default. Implicitly, all modules behave as if
4344
they contained the following prologue:
4445

0 commit comments

Comments
 (0)