diff options
| author | bors <bors@rust-lang.org> | 2020-04-22 03:50:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-22 03:50:02 +0000 |
| commit | 2dc5b602eee35d70e8e6e506a7ea07b6c7e0197d (patch) | |
| tree | 43279f0eee2bf88591559449b56f87b217873337 /src/libstd/thread | |
| parent | 70f4f320b02cfd511c78389a6db1628285277410 (diff) | |
| parent | 66eaead0e2088e5bad6e5c24287a5f061aab4844 (diff) | |
| download | rust-2dc5b602eee35d70e8e6e506a7ea07b6c7e0197d.tar.gz rust-2dc5b602eee35d70e8e6e506a7ea07b6c7e0197d.zip | |
Auto merge of #71410 - JohnTitor:rollup-vh6dut5, r=JohnTitor
Rollup of 7 pull requests Successful merges: - #70998 (Suggest `-> impl Trait` and `-> Box<dyn Trait>` on fn that doesn't return) - #71236 (Remove unused rustc_serialize::hex module) - #71366 (Use assoc int consts3) - #71372 (Fix #! (shebang) stripping account space issue) - #71384 (Fix stage0.txt version number comment) - #71390 (Fix incorrect description of E0690) - #71399 (Clean up E0554 explanation) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 282e268efd2..7a3cbbe4562 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -1062,7 +1062,7 @@ impl ThreadId { // If we somehow use up all our bits, panic so that we're not // covering up subtle bugs of IDs being reused. - if COUNTER == crate::u64::MAX { + if COUNTER == u64::MAX { panic!("failed to generate unique thread ID: bitspace exhausted"); } |