Skip to content

Commit acf4aee

Browse files
committed
Auto merge of #31210 - Manishearth:rollup, r=Manishearth
- Successful merges: #31152, #31184, #31189, #31192, #31197, #31199, #31201 - Failed merges:
2 parents faf6d1e + 79157b3 commit acf4aee

File tree

12 files changed

+332
-519
lines changed

12 files changed

+332
-519
lines changed

src/doc/book/error-handling.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1512,7 +1512,7 @@ and [`rustc-serialize`](https://crates.io/crates/rustc-serialize) crates.
15121512

15131513
We're not going to spend a lot of time on setting up a project with
15141514
Cargo because it is already covered well in [the Cargo
1515-
section](../book/hello-cargo.html) and [Cargo's documentation][14].
1515+
section](getting-started.html#hello-cargo) and [Cargo's documentation][14].
15161516

15171517
To get started from scratch, run `cargo new --bin city-pop` and make sure your
15181518
`Cargo.toml` looks something like this:

src/doc/book/getting-started.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@ variable. If it isn't, run the installer again, select "Change" on the "Change,
167167
repair, or remove installation" page and ensure "Add to PATH" is installed on
168168
the local hard drive.
169169

170+
Rust does not do its own linking, and so you’ll need to have a linker
171+
installed. Doing so will depend on your specific system, consult its
172+
documentation for more details.
173+
170174
If not, there are a number of places where we can get help. The easiest is
171175
[the #rust IRC channel on irc.mozilla.org][irc], which we can access through
172176
[Mibbit][mibbit]. Click that link, and we'll be chatting with other Rustaceans
@@ -604,11 +608,11 @@ This chapter covered the basics that will serve you well through the rest of
604608
this book, and the rest of your time with Rust. Now that you’ve got the tools
605609
down, we'll cover more about the Rust language itself.
606610

607-
You have two options: Dive into a project with ‘[Learn Rust][learnrust]’, or
611+
You have two options: Dive into a project with ‘[Tutorial: Guessing Game][guessinggame]’, or
608612
start from the bottom and work your way up with ‘[Syntax and
609613
Semantics][syntax]’. More experienced systems programmers will probably prefer
610-
Learn Rust’, while those from dynamic backgrounds may enjoy either. Different
614+
Tutorial: Guessing Game’, while those from dynamic backgrounds may enjoy either. Different
611615
people learn differently! Choose whatever’s right for you.
612616

613-
[learnrust]: learn-rust.html
617+
[guessinggame]: guessing-game.html
614618
[syntax]: syntax-and-semantics.html

src/doc/book/learn-rust.md

-9
This file was deleted.

src/doc/book/loops.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ for x in 0..10 {
195195
You may also encounter situations where you have nested loops and need to
196196
specify which one your `break` or `continue` statement is for. Like most
197197
other languages, by default a `break` or `continue` will apply to innermost
198-
loop. In a situation where you would like to a `break` or `continue` for one
198+
loop. In a situation where you would like to `break` or `continue` for one
199199
of the outer loops, you can use labels to specify which loop the `break` or
200200
`continue` statement applies to. This will only print when both `x` and `y` are
201201
odd:

src/libcore/cell.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,9 @@ impl<T: ?Sized> RefCell<T> {
414414
///
415415
/// let c = RefCell::new(5);
416416
///
417-
/// let borrowed_five = c.borrow_mut();
417+
/// *c.borrow_mut() = 7;
418+
///
419+
/// assert_eq!(*c.borrow(), 7);
418420
/// ```
419421
///
420422
/// An example of panic:

src/libcore/iter.rs

+6
Original file line numberDiff line numberDiff line change
@@ -2740,7 +2740,13 @@ pub trait Extend<A> {
27402740
/// It is important to note that both back and forth work on the same range,
27412741
/// and do not cross: iteration is over when they meet in the middle.
27422742
///
2743+
/// In a similar fashion to the [`Iterator`] protocol, once a
2744+
/// `DoubleEndedIterator` returns `None` from a `next_back()`, calling it again
2745+
/// may or may not ever return `Some` again. `next()` and `next_back()` are
2746+
/// interchangable for this purpose.
2747+
///
27432748
/// [`Iterator`]: trait.Iterator.html
2749+
///
27442750
/// # Examples
27452751
///
27462752
/// Basic usage:

src/librustc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ pub mod middle {
108108
pub mod free_region;
109109
pub mod intrinsicck;
110110
pub mod infer;
111-
pub mod implicator;
112111
pub mod lang_items;
113112
pub mod liveness;
114113
pub mod mem_categorization;

0 commit comments

Comments
 (0)