summary refs log tree commit diff
path: root/src/libstd/collections
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-12-29 16:38:07 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-12-29 23:55:49 -0800
commit470ae101d6e26a6ce07292b7fca6eaed527451c7 (patch)
treeb976bc0eb040da67646a9d99bb9b901cb9f55abd /src/libstd/collections
parentcb7599b83e8f072a8871db3fb238f50e067794de (diff)
downloadrust-470ae101d6e26a6ce07292b7fca6eaed527451c7.tar.gz
rust-470ae101d6e26a6ce07292b7fca6eaed527451c7.zip
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/collections')
-rw-r--r--src/libstd/collections/hash/map.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
index c62ca6f5929..7b7473b2c99 100644
--- a/src/libstd/collections/hash/map.rs
+++ b/src/libstd/collections/hash/map.rs
@@ -278,7 +278,7 @@ fn test_resize_policy() {
 ///
 /// impl Viking {
 ///     /// Create a new Viking.
-///     pub fn new(name: &str, country: &str) -> Viking {
+///     fn new(name: &str, country: &str) -> Viking {
 ///         Viking { name: name.to_string(), country: country.to_string() }
 ///     }
 /// }