Skip to content

Commit a7fd8c8

Browse files
committed
Rollup merge of #24254 - aturon:join-handle-debug, r=alexcrichton
Make `Box<Any + Send>` implement `Debug`. Fixes #21291
2 parents db7aecd + 76d468a commit a7fd8c8

File tree

2 files changed

+27
-0
lines changed

2 files changed

+27
-0
lines changed

src/libcore/any.rs

+10
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,16 @@ impl fmt::Debug for Any {
114114
}
115115
}
116116

117+
// Ensure that the result of e.g. joining a thread can be printed and
118+
// hence used with `unwrap`. May eventually no longer be needed if
119+
// dispatch works with upcasting.
120+
#[stable(feature = "rust1", since = "1.0.0")]
121+
impl fmt::Debug for Any + Send {
122+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
123+
f.pad("Any")
124+
}
125+
}
126+
117127
impl Any {
118128
/// Returns true if the boxed type is the same as `T`
119129
#[stable(feature = "rust1", since = "1.0.0")]

src/test/run-pass/issue-21291.rs

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// Regression test for unwrapping the result of `join`, issue #21291
12+
13+
use std::thread;
14+
15+
fn main() {
16+
thread::spawn(|| {}).join().unwrap()
17+
}

0 commit comments

Comments
 (0)