Merge pull request rust-lang#8 from tmiasko/master

alexcrichton · web-flow · commit b9d62fc818f2 · 2016-07-18T08:29:56.000-07:00
s/Send/Sync/
diff --git a/src/lib.rs b/src/lib.rs
@@ -613,7 +613,7 @@ fn assert_future<A, B, F>(t: F) -> F
     t
 }
 
-/// A trait essentially representing `Fn(&Tokens) + Send + Send + 'static`.
+/// A trait essentially representing `Fn(&Tokens) + Send + Sync + 'static`.
 ///
 /// This is used as an argument to the `Future::schedule` function.
 pub trait Wake: Send + Sync + 'static {

Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,7 @@ fn assert_future<A, B, F>(t: F) -> F`
`613`	`613`	`t`
`614`	`614`	`}`
`615`	`615`
`616`		-/// A trait essentially representing `Fn(&Tokens) + Send + Send + 'static`.
	`616`	+/// A trait essentially representing `Fn(&Tokens) + Send + Sync + 'static`.
`617`	`617`	`///`
`618`	`618`	/// This is used as an argument to the `Future::schedule` function.
`619`	`619`	`pub trait Wake: Send + Sync + 'static {`