---

yaml
---
r: 274333
b: refs/heads/stable
c: b3e30b5
h: refs/heads/master
i:
  274331: c63a9ee

Author: tmiasko

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 10de8826cd583d61171c118426fe8e9c73a59f2d
+refs/heads/stable: b3e30b5fc3ad49f8d1461a9d181b0853bfc41c9a
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/libcore/hash/mod.rs

@@ -194,8 +194,8 @@ pub trait Hasher {
 /// A `BuildHasher` is typically used as a factory for instances of `Hasher`
 /// which a `HashMap` can then use to hash keys independently.
 ///
-/// Note that for each instance of `BuildHasher`, the created hashers should be
-/// identical. That is, if the same stream of bytes is fed into each hasher, the
+/// Note that for each instance of `BuildHasher` the create hashers should be
+/// identical. That is if the same stream of bytes is fed into each hasher the
 /// same output will also be generated.
 #[stable(since = "1.7.0", feature = "build_hasher")]
 pub trait BuildHasher {

branches/stable/src/librustc/session/mod.rs

@@ -179,9 +179,9 @@ impl Session {
     pub fn track_errors<F, T>(&self, f: F) -> Result<T, usize>
         where F: FnOnce() -> T
     {
-        let mut count = self.err_count();
+        let count = self.err_count();
         let result = f();
-        count -= self.err_count();
+        let count = self.err_count() - count;
         if count == 0 {
             Ok(result)
         } else {