diff options
| author | bors <bors@rust-lang.org> | 2015-05-05 04:47:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-05 04:47:56 +0000 |
| commit | 31e3cb7c4e8895fff23aa67e1cd6b58d798cdac4 (patch) | |
| tree | 5c8ab399eb799e89b424309a7e0226242340516a /src/libcore | |
| parent | 0be117e2733423e70bccd8b0a46e8eccd1e1d1cc (diff) | |
| parent | 135502ef0016fd6b17324cc1ed4e088863a97176 (diff) | |
| download | rust-31e3cb7c4e8895fff23aa67e1cd6b58d798cdac4.tar.gz rust-31e3cb7c4e8895fff23aa67e1cd6b58d798cdac4.zip | |
Auto merge of #25111 - Manishearth:rollup, r=Manishearth
r? @Manishearth
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/option.rs | 2 | ||||
| -rw-r--r-- | src/libcore/str/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs index d1bc24bd9ba..8da28094be3 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -161,7 +161,7 @@ use slice; // `Iterator` is an enumeration with one type parameter and two variants, // which basically means it must be `Option`. -/// The `Option` type. See [the module level documentation](../index.html) for more. +/// The `Option` type. See [the module level documentation](index.html) for more. #[derive(Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Debug, Hash)] #[stable(feature = "rust1", since = "1.0.0")] pub enum Option<T> { diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index 6b65d746256..c9bbcba31e9 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -421,7 +421,7 @@ macro_rules! derive_pattern_clone { /// wrapping an private internal one that makes use of the `Pattern` API. /// /// For all patterns `P: Pattern<'a>` the following items will be -/// generated (generics ommitted): +/// generated (generics omitted): /// /// struct $forward_iterator($internal_iterator); /// struct $reverse_iterator($internal_iterator); |
