diff options
| author | bors <bors@rust-lang.org> | 2019-03-31 14:11:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-31 14:11:11 +0000 |
| commit | a89c03a30a1e8f1cd190114b765d01752d3ce8d8 (patch) | |
| tree | 8454df10ef33efa7dbef5bae1de8b23586d57e59 /src/libstd/panic.rs | |
| parent | cee58fdc12bea8cc373366bd84fc786277729b1c (diff) | |
| parent | fb8396da843fd665fc73a0bf448d5fb83b1b978b (diff) | |
| download | rust-a89c03a30a1e8f1cd190114b765d01752d3ce8d8.tar.gz rust-a89c03a30a1e8f1cd190114b765d01752d3ce8d8.zip | |
Auto merge of #59584 - Centril:rollup, r=Centril
Rollup of 4 pull requests Successful merges: - #58828 (libstd: deny(elided_lifetimes_in_paths)) - #59234 (Mention `no merge policy` in the CONTRIBUTING guide) - #59572 (Include bounds in generic re-ordering diagnostic) - #59574 (Distinguish message for external macros depending on error level) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/panic.rs')
| -rw-r--r-- | src/libstd/panic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 6a16414c141..cc147d851de 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -312,7 +312,7 @@ impl<R, F: FnOnce() -> R> FnOnce<()> for AssertUnwindSafe<F> { #[stable(feature = "std_debug", since = "1.16.0")] impl<T: fmt::Debug> fmt::Debug for AssertUnwindSafe<T> { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_tuple("AssertUnwindSafe") .field(&self.0) .finish() |