Skip to content

Commit abf0548

Browse files
committed
Auto merge of #24481 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #24425, #24435, #24438, #24440, #24449, #24457, #24460, #24465, #24467, #24468, #24471, #24476, #24480 - Failed merges:
2 parents 07f807d + 7644ef8 commit abf0548

File tree

20 files changed

+327
-283
lines changed

20 files changed

+327
-283
lines changed

src/doc/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ideas behind Rust.
1919
donated to the Rust project. As the name implies, it teaches you Rust through a
2020
series of small examples.
2121

22-
[rbe]: rustbyexample.com
22+
[rbe]: http://rustbyexample.com/
2323

2424
# Community & Getting Help
2525

src/doc/trpl/ffi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ pub fn uncompress(src: &[u8]) -> Option<Vec<u8>> {
166166
}
167167
```
168168

169-
For reference, the examples used here are also available as an [library on
169+
For reference, the examples used here are also available as a [library on
170170
GitHub](https://github.com/thestinger/rust-snappy).
171171

172172
# Destructors

src/doc/trpl/hello-world.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ We’ll get to the details eventually, you’ll just have to trust us for now.
104104

105105
Next, `"Hello, world!"` is a ‘string’. Strings are a surprisingly complicated
106106
topic in a systems programming language, and this is a ‘statically allocated’
107-
string. If you want to read further about allocation, check out [the stack and
108-
the heap], but you don’t need to right now if you don’t want to. We pass this
109-
string as an argument to `println!`, which prints the string to the screen.
110-
Easy enough!
107+
string. If you want to read further about allocation, check out
108+
[the stack and the heap][allocation], but you don’t need to right now if you
109+
don’t want to. We pass this string as an argument to `println!`, which prints the
110+
string to the screen. Easy enough!
111111

112112
[allocation]: the-stack-and-the-heap.html
113113

src/doc/trpl/installing-rust.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ If not, there are a number of places where you can get help. The easiest is
9090
[the #rust IRC channel on irc.mozilla.org][irc], which you can access through
9191
[Mibbit][mibbit]. Click that link, and you'll be chatting with other Rustaceans
9292
(a silly nickname we call ourselves), and we can help you out. Other great
93-
resources include [the user’s forum][users], and [Stack Overflow][stack
94-
overflow].
93+
resources include [the user’s forum][users], and
94+
[Stack Overflow][stack overflow].
9595

9696
[irc]: irc://irc.mozilla.org/#rust
9797
[mibbit]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust

src/doc/trpl/no-stdlib.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ necessary functionality for writing idiomatic and effective Rust code.
103103
As an example, here is a program that will calculate the dot product of two
104104
vectors provided from C, using idiomatic Rust practices.
105105

106-
```
106+
```ignore
107107
#![feature(lang_items, start, no_std, core, libc)]
108108
#![no_std]
109109

src/liballoc/arc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ pub fn get_mut<T>(this: &mut Arc<T>) -> Option<&mut T> {
274274
// reference to the inner data.
275275
let inner = unsafe { &mut **this._ptr };
276276
Some(&mut inner.data)
277-
}else {
277+
} else {
278278
None
279279
}
280280
}

src/libcore/iter.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,9 @@ pub trait Iterator {
273273
FilterMap { iter: self, f: f }
274274
}
275275

276-
/// Creates an iterator that yields a pair of the value returned by this
277-
/// iterator plus the current index of iteration.
276+
/// Creates an iterator that yields pairs `(i, val)` where `i` is the
277+
/// current index of iteration and `val` is the value returned by the
278+
/// iterator.
278279
///
279280
/// `enumerate` keeps its count as a `usize`. If you want to count by a
280281
/// different sized integer, the `zip` function provides similar
@@ -1129,7 +1130,7 @@ pub trait FromIterator<A> {
11291130
/// Conversion into an `Iterator`
11301131
///
11311132
/// Implementing this trait allows you to use your type with Rust's `for` loop. See
1132-
/// the [module level documentation](../index.html) for more details.
1133+
/// the [module level documentation](index.html) for more details.
11331134
#[stable(feature = "rust1", since = "1.0.0")]
11341135
pub trait IntoIterator {
11351136
/// The type of the elements being iterated

src/libcore/ptr.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
//! Working with unsafe pointers in Rust is uncommon,
1616
//! typically limited to a few patterns.
1717
//!
18-
//! Use the [`null` function](fn.null.html) to create null pointers, and
19-
//! the `is_null` method of the `*const T` type to check for null.
20-
//! The `*const T` type also defines the `offset` method, for pointer math.
18+
//! Use the `null` function to create null pointers, and the `is_null` method
19+
//! of the `*const T` type to check for null. The `*const T` type also defines
20+
//! the `offset` method, for pointer math.
2121
//!
2222
//! # Common ways to create unsafe pointers
2323
//!

src/librustc/metadata/loader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
//! > Dear rustc,
130130
//! >
131131
//! > When you are attempting to load the immediate dependency `crate-name`, I
132-
//! > would like you too assume that the library is located at
132+
//! > would like you to assume that the library is located at
133133
//! > `path/to/the/crate.rlib`, and look nowhere else. Also, please do not
134134
//! > assume that the path I specified has the name `crate-name`.
135135
//!

src/libstd/ffi/c_str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ impl CString {
172172
///
173173
/// This method is equivalent to `new` except that no runtime assertion
174174
/// is made that `v` contains no 0 bytes, and it requires an actual
175-
/// byte vector, not anyhting that can be converted to one with Into.
175+
/// byte vector, not anything that can be converted to one with Into.
176176
#[stable(feature = "rust1", since = "1.0.0")]
177177
pub unsafe fn from_vec_unchecked(mut v: Vec<u8>) -> CString {
178178
v.push(0);

0 commit comments

Comments
 (0)