---

pnkfelix · pnkfelix · commit cca1fde47bb7 · 2015-03-24T22:27:23.000+01:00
yaml --- r: 194211 b: refs/heads/beta c: 290c8de h: refs/heads/master i: 194209: c6717c4 194207: 2f1873e v: v3
diff --git a/[refs] b/[refs]
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 5f57fd591d890cbf9cfc94123071c1a30d809b9e
+refs/heads/beta: 290c8de0a6f233b1d30c8a97cb41614fce989d30
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6
diff --git a/branches/beta/src/libstd/thread/mod.rs b/branches/beta/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`	`}`