about summary refs log tree commit diff
path: root/src/doc
diff options
context:
space:
mode:
authorHuon Wilson <dbau.pp+github@gmail.com>2014-02-23 21:29:35 +1100
committerHuon Wilson <dbau.pp+github@gmail.com>2014-02-24 07:44:10 +1100
commitefaf4db24c92e119e26dc575ffd6bfd3b91fb87d (patch)
treee735230061b0c480550fdaad749a998bc48df78d /src/doc
parent5444da54fd32b705eec28112e309f63b704e3f8c (diff)
downloadrust-efaf4db24c92e119e26dc575ffd6bfd3b91fb87d.tar.gz
rust-efaf4db24c92e119e26dc575ffd6bfd3b91fb87d.zip
Transition to new `Hash`, removing IterBytes and std::to_bytes.
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/guide-container.md6
-rw-r--r--src/doc/po/ja/tutorial.md.po6
-rw-r--r--src/doc/rust.md2
-rw-r--r--src/doc/tutorial.md2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/doc/guide-container.md b/src/doc/guide-container.md
index ebad650a534..543b77ccdb9 100644
--- a/src/doc/guide-container.md
+++ b/src/doc/guide-container.md
@@ -38,7 +38,7 @@ order.
 Each `HashMap` instance has a random 128-bit key to use with a keyed hash,
 making the order of a set of keys in a given hash table randomized. Rust
 provides a [SipHash](https://131002.net/siphash/) implementation for any type
-implementing the `IterBytes` trait.
+implementing the `Hash` trait.
 
 ## Double-ended queues
 
@@ -186,12 +186,12 @@ let mut calls = 0;
     let it = xs.iter().scan((), |_, x| {
         calls += 1;
         if *x < 3 { Some(x) } else { None }});
-        
+
     // the iterator will only yield 1 and 2 before returning None
     // If we were to call it 5 times, calls would end up as 5, despite
     // only 2 values being yielded (and therefore 3 unique calls being
     // made). The fuse() adaptor can fix this.
-    
+
     let mut it = it.fuse();
     it.next();
     it.next();
diff --git a/src/doc/po/ja/tutorial.md.po b/src/doc/po/ja/tutorial.md.po
index 34769b320b7..2646460346b 100644
--- a/src/doc/po/ja/tutorial.md.po
+++ b/src/doc/po/ja/tutorial.md.po
@@ -4421,15 +4421,15 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "The full list of derivable traits is `Eq`, `TotalEq`, `Ord`, `TotalOrd`, "
-#| "`Encodable` `Decodable`, `Clone`, `DeepClone`, `IterBytes`, `Rand`, "
+#| "`Encodable` `Decodable`, `Clone`, `DeepClone`, `Hash`, `Rand`, "
 #| "`Zero`, and `ToStr`."
 msgid ""
 "The full list of derivable traits is `Eq`, `TotalEq`, `Ord`, `TotalOrd`, "
-"`Encodable` `Decodable`, `Clone`, `DeepClone`, `IterBytes`, `Rand`, "
+"`Encodable` `Decodable`, `Clone`, `DeepClone`, `Hash`, `Rand`, "
 "`Default`, `Zero`, and `ToStr`."
 msgstr ""
 "実装を自動的に導出可能なトレイトは、 `Eq`, `TotalEq`, `Ord`, `TotalOrd`, "
-"`Encodable` `Decodable`, `Clone`, `DeepClone`, `IterBytes`, `Rand`, `Zero`, "
+"`Encodable` `Decodable`, `Clone`, `DeepClone`, `Hash`, `Rand`, `Zero`, "
 "および `ToStr` です。."
 
 #. type: Plain text
diff --git a/src/doc/rust.md b/src/doc/rust.md
index 6d9cb8b5d7b..650bee7d335 100644
--- a/src/doc/rust.md
+++ b/src/doc/rust.md
@@ -2035,7 +2035,7 @@ Supported traits for `deriving` are:
 * Comparison traits: `Eq`, `TotalEq`, `Ord`, `TotalOrd`.
 * Serialization: `Encodable`, `Decodable`. These require `serialize`.
 * `Clone` and `DeepClone`, to perform (deep) copies.
-* `IterBytes`, to iterate over the bytes in a data type.
+* `Hash`, to iterate over the bytes in a data type.
 * `Rand`, to create a random instance of a data type.
 * `Default`, to create an empty instance of a data type.
 * `Zero`, to create an zero instance of a numeric data type.
diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md
index 304dc1fb5af..59e0bca5a97 100644
--- a/src/doc/tutorial.md
+++ b/src/doc/tutorial.md
@@ -2525,7 +2525,7 @@ enum ABC { A, B, C }
 
 The full list of derivable traits is `Eq`, `TotalEq`, `Ord`,
 `TotalOrd`, `Encodable` `Decodable`, `Clone`, `DeepClone`,
-`IterBytes`, `Rand`, `Default`, `Zero`, `FromPrimitive` and `Show`.
+`Hash`, `Rand`, `Default`, `Zero`, `FromPrimitive` and `Show`.
 
 # Crates and the module system