---

pnkfelix · pnkfelix · commit 1070a0b1a4f6 · 2015-03-24T22:27:23.000+01:00
yaml --- r: 192310 b: refs/heads/master c: 290c8de h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5f57fd591d890cbf9cfc94123071c1a30d809b9e
+refs/heads/master: 290c8de0a6f233b1d30c8a97cb41614fce989d30
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a923278c6278c63468d74772c58dbf788e88f58c
 refs/heads/try: ce76bff75603a754d092456285ff455eb871633d
diff --git a/trunk/src/libstd/thread/mod.rs b/trunk/src/libstd/thread/mod.rs
@@ -698,7 +698,7 @@ impl Drop for JoinHandle {
 /// permission.
 #[must_use = "thread will be immediately joined if `JoinGuard` is not used"]
 #[stable(feature = "rust1", since = "1.0.0")]
-pub struct JoinGuard<'a, T: 'a> {
+pub struct JoinGuard<'a, T: Send + 'a> {
     inner: JoinInner<T>,
     _marker: PhantomData<&'a T>,
 }

Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ impl Drop for JoinHandle {`
`698`	`698`	`/// permission.`
`699`	`699`	#[must_use = "thread will be immediately joined if `JoinGuard` is not used"]
`700`	`700`	`#[stable(feature = "rust1", since = "1.0.0")]`
`701`		`-pub struct JoinGuard<'a, T: 'a> {`
	`701`	`+pub struct JoinGuard<'a, T: Send + 'a> {`
`702`	`702`	`inner: JoinInner<T>,`
`703`	`703`	`_marker: PhantomData<&'a T>,`
`704`	`704`	`}`