Skip to content

Commit

Permalink
Format & use syntect regex-fancy
Browse files Browse the repository at this point in the history
The onig crate no longer builds
in CI with cargo-zigbuild.
  • Loading branch information
encounter committed Mar 14, 2024
1 parent d727110 commit 7fd0397
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 37 deletions.
55 changes: 26 additions & 29 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ serde_yaml = "0.9.32"
sha-1 = "0.10.1"
smallvec = "1.13.1"
supports-color = "3.0.0"
syntect = { version = "5.2.0", features = ["parsing", "regex-onig", "dump-load"], default-features = false }
syntect = { version = "5.2.0", features = ["parsing", "regex-fancy", "dump-load"], default-features = false }
tracing = "0.1.40"
tracing-attributes = "0.1.27"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
Expand Down
3 changes: 1 addition & 2 deletions src/cmd/dwarf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ use std::{
use anyhow::{anyhow, bail, Context, Result};
use argp::FromArgs;
use object::{
elf, Object, ObjectSection, ObjectSymbol, RelocationFlags, RelocationTarget,
Section,
elf, Object, ObjectSection, ObjectSymbol, RelocationFlags, RelocationTarget, Section,
};
use syntect::{
highlighting::{Color, HighlightIterator, HighlightState, Highlighter, Theme, ThemeSet},
Expand Down
5 changes: 2 additions & 3 deletions src/cmd/elf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ use objdiff_core::obj::split_meta::{SplitMeta, SPLITMETA_SECTION};
use object::{
elf,
write::{Mangling, SectionId, SymbolId},
FileFlags, Object, ObjectSection, ObjectSymbol,
RelocationTarget, SectionFlags, SectionIndex, SectionKind, SymbolFlags, SymbolIndex,
SymbolKind, SymbolScope, SymbolSection,
FileFlags, Object, ObjectSection, ObjectSymbol, RelocationTarget, SectionFlags, SectionIndex,
SectionKind, SymbolFlags, SymbolIndex, SymbolKind, SymbolScope, SymbolSection,
};

use crate::{
Expand Down
3 changes: 1 addition & 2 deletions src/util/elf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ use object::{
StringId,
},
Architecture, Endianness, Object, ObjectKind, ObjectSection, ObjectSymbol, Relocation,
RelocationFlags, RelocationTarget, SectionKind, Symbol, SymbolKind,
SymbolScope, SymbolSection,
RelocationFlags, RelocationTarget, SectionKind, Symbol, SymbolKind, SymbolScope, SymbolSection,
};

use crate::{
Expand Down

0 comments on commit 7fd0397

Please sign in to comment.