diff options
| author | bors <bors@rust-lang.org> | 2014-11-14 18:17:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-14 18:17:28 +0000 |
| commit | 1e4e55aebc1a71b6674c00b8604efa6b1e2e52cd (patch) | |
| tree | d57cb32a69c139630345db9c9a52fda4bf900b6c /src/libstd/collections/hash | |
| parent | 1bf06495443584539b958873e04cc2f864ab10e4 (diff) | |
| parent | 5969bf663ef6ea4c62d27b88a957d401dad4227b (diff) | |
| download | rust-1e4e55aebc1a71b6674c00b8604efa6b1e2e52cd.tar.gz rust-1e4e55aebc1a71b6674c00b8604efa6b1e2e52cd.zip | |
auto merge of #18880 : barosl/rust/doc-fail-to-panic, r=alexcrichton
I found some occurrences of "failure" and "fails" in the documentation. I changed them to "panics" if it means a task panic. Otherwise I left it as is, or changed it to "errors" to clearly distinguish them. Also, I made a minor fix that is breaking the layout of a module page. "Example" is shown in an irrelevant place from the following page: http://doc.rust-lang.org/std/os/index.html
Diffstat (limited to 'src/libstd/collections/hash')
| -rw-r--r-- | src/libstd/collections/hash/map.rs | 4 | ||||
| -rw-r--r-- | src/libstd/collections/hash/table.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index 68c428f456d..4d26fa7e26c 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -1237,9 +1237,9 @@ impl<K: Eq + Hash<S>, V: Clone, S, H: Hasher<S>> HashMap<K, V, H> { /// Return a copy of the value corresponding to the key. /// - /// # Failure + /// # Panics /// - /// Fails if the key is not present. + /// Panics if the key is not present. /// /// # Example /// diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs index 4838d3d73f1..05faba4950b 100644 --- a/src/libstd/collections/hash/table.rs +++ b/src/libstd/collections/hash/table.rs @@ -489,9 +489,9 @@ impl<K, V, M: Deref<RawTable<K, V>>> GapThenFull<K, V, M> { /// Rounds up to a multiple of a power of two. Returns the closest multiple /// of `target_alignment` that is higher or equal to `unrounded`. /// -/// # Failure +/// # Panics /// -/// Fails if `target_alignment` is not a power of two. +/// Panics if `target_alignment` is not a power of two. fn round_up_to_next(unrounded: uint, target_alignment: uint) -> uint { assert!(target_alignment.is_power_of_two()); (unrounded + target_alignment - 1) & !(target_alignment - 1) |