Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump object to 0.31 #522

Merged
merged 1 commit into from
Jun 21, 2023
Merged

Bump object to 0.31 #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ addr2line = { version = "0.20.0", default-features = false }
miniz_oxide = { version = "0.7.0", default-features = false }

[dependencies.object]
version = "0.30.0"
version = "0.31.0"
default-features = false
features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']

Expand Down
2 changes: 1 addition & 1 deletion crates/as-if-std/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ addr2line = { version = "0.20.0", default-features = false, optional = true }
miniz_oxide = { version = "0.4.0", default-features = false }

[dependencies.object]
version = "0.28"
version = "0.31"
default-features = false
optional = true
features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
Expand Down
1 change: 1 addition & 0 deletions src/symbolize/gimli/coff.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use super::{gimli, Context, Endian, EndianSlice, Mapping, Path, Stash, Vec};
use alloc::sync::Arc;
use core::convert::TryFrom;
use object::pe::{ImageDosHeader, ImageSymbol};
use object::read::coff::ImageSymbol as _;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems we don't need this line to bump object.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's strange, it breaks in a different way if I remove that. I think I'll close this PR, since I can't really test it on Windows.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You do need this line, but you also need to update

backtrace-rs/crates/as-if-std/Cargo.toml

Line 22 in b3e5bb8

version = "0.28"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lnicola
This commit will make rustc failing in mingw-check:

https://github.com/rust-lang/rust/actions/runs/5407279353/jobs/9825113481

image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chenyukang If you're bumping the backtrace version in libstd, then you also need to bump the object version.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, sorry, I missed the previous comments.
Got it, thanks!

use object::read::pe::{ImageNtHeaders, ImageOptionalHeader, SectionTable};
use object::read::StringTable;
use object::LittleEndian as LE;
Expand Down