diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 15:19:18 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 17:27:44 -0800 |
| commit | d8450d69bbb7bb5c288fba01295551b78a5a8c03 (patch) | |
| tree | 180b2e9d64e822c78f8ad38c3eb7f1501c17862d /src/libstd/rt | |
| parent | c14cf4dc868a9468dcf0a106a84dcafd859707fc (diff) | |
| parent | d0de2b46e9bcca93971ef64d6ecdef872633f246 (diff) | |
| download | rust-d8450d69bbb7bb5c288fba01295551b78a5a8c03.tar.gz rust-d8450d69bbb7bb5c288fba01295551b78a5a8c03.zip | |
rollup merge of #22435: aturon/final-stab-thread
Conflicts: src/test/bench/rt-messaging-ping-pong.rs src/test/bench/rt-parfib.rs src/test/bench/task-perf-spawnalot.rs
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/util.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/util.rs b/src/libstd/rt/util.rs index d445c299028..a304f1f844d 100644 --- a/src/libstd/rt/util.rs +++ b/src/libstd/rt/util.rs @@ -149,7 +149,7 @@ pub fn abort(args: fmt::Arguments) -> ! { } pub unsafe fn report_overflow() { - use thread::Thread; + use thread; // See the message below for why this is not emitted to the // ^ Where did the message below go? @@ -159,5 +159,5 @@ pub unsafe fn report_overflow() { // and the FFI call needs 2MB of stack when we just ran out. rterrln!("\nthread '{}' has overflowed its stack", - Thread::current().name().unwrap_or("<unknown>")); + thread::current().name().unwrap_or("<unknown>")); } |