diff options
| author | bors <bors@rust-lang.org> | 2016-04-01 17:06:04 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-04-01 17:06:04 -0700 |
| commit | 18172d1375274050fbe37acd9b3c884f2caaacb9 (patch) | |
| tree | 2216dff2fd4cbda8c4ff6b81690a47cec7f8e561 /src/libstd/sys | |
| parent | c8b8eb1fda90998832ba1cdf96a34dc676f7124b (diff) | |
| parent | 45c4769920caf7e8099dcf0c9533b071e8dbbda8 (diff) | |
| download | rust-18172d1375274050fbe37acd9b3c884f2caaacb9.tar.gz rust-18172d1375274050fbe37acd9b3c884f2caaacb9.zip | |
Auto merge of #32666 - Manishearth:rollup, r=Manishearth
Rollup of 11 pull requests - Successful merges: #32622, #32629, #32640, #32641, #32642, #32645, #32647, #32649, #32652, #32654, #32656 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/ext/thread.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/ext/thread.rs b/src/libstd/sys/unix/ext/thread.rs index bb8200ff859..c98e42faba7 100644 --- a/src/libstd/sys/unix/ext/thread.rs +++ b/src/libstd/sys/unix/ext/thread.rs @@ -30,7 +30,7 @@ pub trait JoinHandleExt { /// /// This function **transfers ownership** of the underlying pthread_t to /// the caller. Callers are then the unique owners of the pthread_t and - /// must either detech or join the pthread_t once it's no longer needed. + /// must either detach or join the pthread_t once it's no longer needed. fn into_pthread_t(self) -> RawPthread; } |