Auto merge of #44474 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 13 pull requests - Successful merges: #44262, #44329, #44332, #44347, #44372, #44384, #44387, #44396, #44449, #44451, #44457, #44464, #44467 - Failed merges:
This commit is contained in:
@@ -22,7 +22,8 @@ pub fn resolve_symname<F>(frame: Frame,
|
||||
{
|
||||
unsafe {
|
||||
let mut info: Dl_info = intrinsics::init();
|
||||
let symname = if dladdr(frame.exact_position, &mut info) == 0 {
|
||||
let symname = if dladdr(frame.exact_position, &mut info) == 0 ||
|
||||
info.dli_sname.is_null() {
|
||||
None
|
||||
} else {
|
||||
CStr::from_ptr(info.dli_sname).to_str().ok()
|
||||
|
||||
@@ -31,6 +31,10 @@ use mem;
|
||||
/// within a thread, and values that implement [`Drop`] get destructed when a
|
||||
/// thread exits. Some caveats apply, which are explained below.
|
||||
///
|
||||
/// A `LocalKey`'s initializer cannot recursively depend on itself, and using
|
||||
/// a `LocalKey` in this way will cause the initializer to infinitely recurse
|
||||
/// on the first call to `with`.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
|
||||
Reference in New Issue
Block a user