Auto merge of #43588 - dns2utf8:wrapping_add, r=sfackler

bors · bors · commit c2de81f4c97c · 2017-08-09T11:10:23.000Z
Use explicit wrapping_add …

… to prevent potential unexpected behavior on debug builds.
diff --git a/src/libstd/sync/barrier.rs b/src/libstd/sync/barrier.rs
@@ -152,7 +152,7 @@ impl Barrier {
             BarrierWaitResult(false)
         } else {
             lock.count = 0;
-            lock.generation_id += 1;
+            lock.generation_id = lock.generation_id.wrapping_add(1);
             self.cvar.notify_all();
             BarrierWaitResult(true)
         }

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ impl Barrier {`
`152`	`152`	`BarrierWaitResult(false)`
`153`	`153`	`} else {`
`154`	`154`	`lock.count = 0;`
`155`		`- lock.generation_id += 1;`
	`155`	`+ lock.generation_id = lock.generation_id.wrapping_add(1);`
`156`	`156`	`self.cvar.notify_all();`
`157`	`157`	`BarrierWaitResult(true)`
`158`	`158`	`}`