Skip to content

Commit

Permalink
Merge pull request #491 from atouchet/osx
Browse files Browse the repository at this point in the history
Change "OSX" to "macOS"
  • Loading branch information
JohnTitor committed Nov 30, 2022
2 parents a59e64f + 1c878b3 commit 5aabd91
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/symbolize/gimli/macho.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ type MachSection = <Mach as MachHeader>::Section;
type MachNlist = <Mach as MachHeader>::Nlist;

impl Mapping {
// The loading path for OSX is so different we just have a completely
// different implementation of the function here. On OSX we need to go
// The loading path for macOS is so different we just have a completely
// different implementation of the function here. On macOS we need to go
// probing the filesystem for a bunch of files.
pub fn new(path: &Path) -> Option<Mapping> {
// First up we need to load the unique UUID which is stored in the macho
Expand Down
2 changes: 1 addition & 1 deletion tests/skip_inner_frames.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use backtrace::Backtrace;
// function for frames which reports the starting address of a symbol. As a
// result it's only enabled on a few platforms.
const ENABLED: bool = cfg!(all(
// Windows hasn't really been tested, and OSX doesn't support actually
// Windows hasn't really been tested, and macOS doesn't support actually
// finding an enclosing frame, so disable this
target_os = "linux",
// On ARM finding the enclosing function is simply returning the ip itself.
Expand Down

0 comments on commit 5aabd91

Please sign in to comment.