From 3cf8cbf3f0c7776007680759f3b4ff05e6760909 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 10 Jun 2020 12:05:28 -0700 Subject: [PATCH] Fix some more nightly warnings about lifetimes --- src/symbolize/dbghelp.rs | 6 +++--- src/symbolize/noop.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/symbolize/dbghelp.rs b/src/symbolize/dbghelp.rs index ecadafd94..4673f87aa 100644 --- a/src/symbolize/dbghelp.rs +++ b/src/symbolize/dbghelp.rs @@ -53,7 +53,7 @@ pub struct Symbol<'a> { } impl Symbol<'_> { - pub fn name(&self) -> Option { + pub fn name(&self) -> Option> { Some(SymbolName::new(unsafe { &*self.name })) } @@ -61,7 +61,7 @@ impl Symbol<'_> { Some(self.addr as *mut _) } - pub fn filename_raw(&self) -> Option { + pub fn filename_raw(&self) -> Option> { self.filename .map(|slice| unsafe { BytesOrWideString::Wide(&*slice) }) } @@ -81,7 +81,7 @@ impl Symbol<'_> { #[repr(C, align(8))] struct Aligned8(T); -pub unsafe fn resolve(what: ResolveWhat, cb: &mut dyn FnMut(&super::Symbol)) { +pub unsafe fn resolve(what: ResolveWhat<'_>, cb: &mut dyn FnMut(&super::Symbol)) { // Ensure this process's symbols are initialized let dbghelp = match dbghelp::init() { Ok(dbghelp) => dbghelp, diff --git a/src/symbolize/noop.rs b/src/symbolize/noop.rs index 961edf9ec..bb720e677 100644 --- a/src/symbolize/noop.rs +++ b/src/symbolize/noop.rs @@ -7,14 +7,14 @@ use crate::SymbolName; use core::ffi::c_void; use core::marker; -pub unsafe fn resolve(_addr: ResolveWhat, _cb: &mut dyn FnMut(&super::Symbol)) {} +pub unsafe fn resolve(_addr: ResolveWhat<'_>, _cb: &mut dyn FnMut(&super::Symbol)) {} pub struct Symbol<'a> { _marker: marker::PhantomData<&'a i32>, } impl Symbol<'_> { - pub fn name(&self) -> Option { + pub fn name(&self) -> Option> { None } @@ -22,7 +22,7 @@ impl Symbol<'_> { None } - pub fn filename_raw(&self) -> Option { + pub fn filename_raw(&self) -> Option> { None }