Skip to content

Commit 3cf8cbf

Browse files
committed
Fix some more nightly warnings about lifetimes
1 parent d4f24b1 commit 3cf8cbf

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/symbolize/dbghelp.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ pub struct Symbol<'a> {
5353
}
5454

5555
impl Symbol<'_> {
56-
pub fn name(&self) -> Option<SymbolName> {
56+
pub fn name(&self) -> Option<SymbolName<'_>> {
5757
Some(SymbolName::new(unsafe { &*self.name }))
5858
}
5959

6060
pub fn addr(&self) -> Option<*mut c_void> {
6161
Some(self.addr as *mut _)
6262
}
6363

64-
pub fn filename_raw(&self) -> Option<BytesOrWideString> {
64+
pub fn filename_raw(&self) -> Option<BytesOrWideString<'_>> {
6565
self.filename
6666
.map(|slice| unsafe { BytesOrWideString::Wide(&*slice) })
6767
}
@@ -81,7 +81,7 @@ impl Symbol<'_> {
8181
#[repr(C, align(8))]
8282
struct Aligned8<T>(T);
8383

84-
pub unsafe fn resolve(what: ResolveWhat, cb: &mut dyn FnMut(&super::Symbol)) {
84+
pub unsafe fn resolve(what: ResolveWhat<'_>, cb: &mut dyn FnMut(&super::Symbol)) {
8585
// Ensure this process's symbols are initialized
8686
let dbghelp = match dbghelp::init() {
8787
Ok(dbghelp) => dbghelp,

src/symbolize/noop.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ use crate::SymbolName;
77
use core::ffi::c_void;
88
use core::marker;
99

10-
pub unsafe fn resolve(_addr: ResolveWhat, _cb: &mut dyn FnMut(&super::Symbol)) {}
10+
pub unsafe fn resolve(_addr: ResolveWhat<'_>, _cb: &mut dyn FnMut(&super::Symbol)) {}
1111

1212
pub struct Symbol<'a> {
1313
_marker: marker::PhantomData<&'a i32>,
1414
}
1515

1616
impl Symbol<'_> {
17-
pub fn name(&self) -> Option<SymbolName> {
17+
pub fn name(&self) -> Option<SymbolName<'_>> {
1818
None
1919
}
2020

2121
pub fn addr(&self) -> Option<*mut c_void> {
2222
None
2323
}
2424

25-
pub fn filename_raw(&self) -> Option<BytesOrWideString> {
25+
pub fn filename_raw(&self) -> Option<BytesOrWideString<'_>> {
2626
None
2727
}
2828

0 commit comments

Comments
 (0)