---

pnkfelix · pnkfelix · commit a76bfa6b2782 · 2015-03-24T22:27:23.000+01:00
yaml --- r: 194408 b: refs/heads/tmp c: 290c8de h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -34,7 +34,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: a3b13610c5b93d9ada072471a001a5613df6a960
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 5f57fd591d890cbf9cfc94123071c1a30d809b9e
+refs/heads/tmp: 290c8de0a6f233b1d30c8a97cb41614fce989d30
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 28a0b25f424090255966273994748a9f9901059f
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412
diff --git a/branches/tmp/src/libstd/thread/mod.rs b/branches/tmp/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`	`}`