diff options
| author | bors <bors@rust-lang.org> | 2018-09-29 12:35:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-29 12:35:39 +0000 |
| commit | 9653f790333d1270f36f1614e85d8a7b54193e75 (patch) | |
| tree | 854a3f96041f7734a63a7b197ccd968b3674cd9a /src/libcore | |
| parent | 7e7bc060c1564b19742fd241f40a02c9210e445c (diff) | |
| parent | def5f84fa64f4a64137dcfc4cc5e3007cc9257e6 (diff) | |
| download | rust-9653f790333d1270f36f1614e85d8a7b54193e75.tar.gz rust-9653f790333d1270f36f1614e85d8a7b54193e75.zip | |
Auto merge of #54660 - kennytm:rollup, r=kennytm
Rollup of 8 pull requests Successful merges: - #54564 (Add 1.29.1 release notes) - #54567 (Include path in stamp hash for debuginfo tests) - #54577 (rustdoc: give proc-macros their own pages) - #54590 (std: Don't let `rust_panic` get inlined) - #54598 (Remove useless lifetimes from `Pin` `impl`s.) - #54604 (Added help message for `self_in_typedefs` feature gate) - #54635 (Improve docs for std::io::Seek) - #54645 (Compute Android gdb version in compiletest)
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/pin.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/pin.rs b/src/libcore/pin.rs index d09a545aecf..0224560af4c 100644 --- a/src/libcore/pin.rs +++ b/src/libcore/pin.rs @@ -293,21 +293,21 @@ where } #[unstable(feature = "pin", issue = "49150")] -impl<'a, P: fmt::Debug> fmt::Debug for Pin<P> { +impl<P: fmt::Debug> fmt::Debug for Pin<P> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Debug::fmt(&self.pointer, f) } } #[unstable(feature = "pin", issue = "49150")] -impl<'a, P: fmt::Display> fmt::Display for Pin<P> { +impl<P: fmt::Display> fmt::Display for Pin<P> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Display::fmt(&self.pointer, f) } } #[unstable(feature = "pin", issue = "49150")] -impl<'a, P: fmt::Pointer> fmt::Pointer for Pin<P> { +impl<P: fmt::Pointer> fmt::Pointer for Pin<P> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Pointer::fmt(&self.pointer, f) } @@ -319,10 +319,10 @@ impl<'a, P: fmt::Pointer> fmt::Pointer for Pin<P> { // for other reasons, though, so we just need to take care not to allow such // impls to land in std. #[unstable(feature = "pin", issue = "49150")] -impl<'a, P, U> CoerceUnsized<Pin<U>> for Pin<P> +impl<P, U> CoerceUnsized<Pin<U>> for Pin<P> where P: CoerceUnsized<U>, {} #[unstable(feature = "pin", issue = "49150")] -impl<'a, P> Unpin for Pin<P> {} +impl<P> Unpin for Pin<P> {} |
