Skip to content

Fix multiple import error #356

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

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Fix multiple import error #356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b0eb30
Fix multiple import error
mox692 Sep 16, 2024
55865c7
Merge branch 'main' into fix-samply-symbols-compile-error
mstange Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions samply-symbols/src/breakpad/index.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use nom::multi::separated_list1;
use nom::sequence::{terminated, tuple};
use nom::{Err, IResult};
use zerocopy::{AsBytes, LittleEndian, Ref, U32, U64};
use zerocopy_derive::{AsBytes, FromBytes, FromZeroes, Unaligned};
use zerocopy_derive::{FromBytes, FromZeroes, Unaligned};

use crate::CodeId;

Expand Down Expand Up @@ -372,7 +372,7 @@ pub enum BreakpadSymindexParseError {
CouldntReadSymbolEntryListBytes,
}

#[derive(FromZeroes, FromBytes, AsBytes, Unaligned)]
#[derive(FromZeroes, FromBytes, zerocopy_derive::AsBytes, Unaligned)]
#[repr(C)]
struct BreakpadSymindexFileHeader {
/// Always b"SYMINDEX", at 0
Expand All @@ -399,7 +399,7 @@ struct BreakpadSymindexFileHeader {
symbol_entries_offset: U32<LittleEndian>,
}

#[derive(FromZeroes, FromBytes, AsBytes, Unaligned)]
#[derive(FromZeroes, FromBytes, zerocopy_derive::AsBytes, Unaligned)]
#[repr(C)]
struct FileOrInlineOriginEntry {
pub index: U32<LittleEndian>,
Expand All @@ -410,7 +410,7 @@ struct FileOrInlineOriginEntry {
const SYMBOL_ENTRY_KIND_PUBLIC: u32 = 0;
const SYMBOL_ENTRY_KIND_FUNC: u32 = 1;

#[derive(FromZeroes, FromBytes, AsBytes, Unaligned)]
#[derive(FromZeroes, FromBytes, zerocopy_derive::AsBytes, Unaligned)]
#[repr(C)]
struct SymbolEntry {
/// Uses `SYMBOL_ENTRY_KIND_*` constants (0 for PUBLIC, 1 for FUNC)
Expand Down