encounter
/
objdiff
mirror of https://github.com/encounter/objdiff.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update all dependencies (again)

This commit is contained in:
Luke Street 2023-07-06 10:37:57 -04:00
parent 100f8f8ac5
commit c7a326b160
7 changed files with 449 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

728
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

40
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "objdiff" name = "objdiff"
version = "0.3.2" version = "0.3.3"
edition = "2021" edition = "2021"
rust-version = "1.65" rust-version = "1.65"
authors = ["Luke Street <luke@street.dev>"] authors = ["Luke Street <luke@street.dev>"]
@ -25,37 +25,37 @@ wgpu = ["eframe/wgpu"]
anyhow = "1.0.71" anyhow = "1.0.71"
bytes = "1.4.0" bytes = "1.4.0"
cfg-if = "1.0.0" cfg-if = "1.0.0"
const_format = "0.2.30" const_format = "0.2.31"
cwdemangle = "0.1.5" cwdemangle = "0.1.5"
eframe = { version = "0.21.3", features = ["persistence"] } eframe = { version = "0.22.0", features = ["persistence"] }
egui = "0.21.0" egui = "0.22.0"
egui_extras = "0.21.0" egui_extras = "0.22.0"
flagset = "0.4.3" flagset = "0.4.3"
log = "0.4.17" log = "0.4.19"
memmap2 = "0.6.1" memmap2 = "0.7.1"
notify = "5.1.0" notify = "6.0.1"
object = { version = "0.31.1", features = ["read_core", "std", "elf"], default-features = false } object = { version = "0.31.1", features = ["read_core", "std", "elf"], default-features = false }
png = "0.17.8" png = "0.17.9"
ppc750cl = { git = "https://github.com/terorie/ppc750cl", rev = "9ae36eef34aa6d74e00972c7671f547a2acfd0aa" } ppc750cl = { git = "https://github.com/terorie/ppc750cl", rev = "9ae36eef34aa6d74e00972c7671f547a2acfd0aa" }
rabbitizer = "1.7.1" rabbitizer = "1.7.4"
rfd = { version = "0.11.3" } #, default-features = false, features = ['xdg-portal'] rfd = { version = "0.11.4" } #, default-features = false, features = ['xdg-portal']
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
tempfile = "3.5.0" tempfile = "3.6.0"
thiserror = "1.0.40" thiserror = "1.0.41"
time = { version = "0.3.21", features = ["formatting", "local-offset"] } time = { version = "0.3.22", features = ["formatting", "local-offset"] }
toml = "0.7.3" toml = "0.7.6"
twox-hash = "1.6.3" twox-hash = "1.6.3"
byteorder = "1.4.3" byteorder = "1.4.3"
# For Linux static binaries, use rustls # For Linux static binaries, use rustls
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]
reqwest = { version = "0.11.17", default-features = false, features = ["blocking", "json", "rustls"] } reqwest = { version = "0.11.18", default-features = false, features = ["blocking", "json", "rustls"] }
self_update = { version = "0.36.0", default-features = false, features = ["rustls"] } self_update = { version = "0.37.0", default-features = false, features = ["rustls"] }
# For all other platforms, use native TLS # For all other platforms, use native TLS
[target.'cfg(not(target_os = "linux"))'.dependencies] [target.'cfg(not(target_os = "linux"))'.dependencies]
reqwest = "0.11.17" reqwest = "0.11.18"
self_update = "0.36.0" self_update = "0.37.0"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
path-slash = "0.2.1" path-slash = "0.2.1"
@ -78,4 +78,4 @@ tracing-wasm = "0.2"
[build-dependencies] [build-dependencies]
anyhow = "1.0.71" anyhow = "1.0.71"
vergen = { version = "8.1.3", features = ["build", "cargo", "git", "gitcl"] } vergen = { version = "8.2.4", features = ["build", "cargo", "git", "gitcl"] }

9
deny.toml
View File

@ -48,9 +48,11 @@ notice = "warn"
# A list of advisory IDs to ignore. Note that ignored advisories will still # A list of advisory IDs to ignore. Note that ignored advisories will still
# output a note when they are encountered. # output a note when they are encountered.
ignore = [ ignore = [
# git2 (build dependency) "RUSTSEC-2023-0022",
"RUSTSEC-2023-0002", "RUSTSEC-2023-0023",
"RUSTSEC-2023-0003", "RUSTSEC-2023-0024",
"RUSTSEC-2023-0034",
"RUSTSEC-2023-0044",
] ]
# Threshold for security vulnerabilities, any vulnerability with a CVSS score # Threshold for security vulnerabilities, any vulnerability with a CVSS score
# lower than the range specified will be ignored. Note that ignored advisories # lower than the range specified will be ignored. Note that ignored advisories
@ -86,6 +88,7 @@ allow = [
"OFL-1.1", "OFL-1.1",
"LicenseRef-UFL-1.0", "LicenseRef-UFL-1.0",
"OpenSSL", "OpenSSL",
"GPL-3.0",
] ]
# List of explictly disallowed licenses # List of explictly disallowed licenses
# See https://spdx.org/licenses/ for list of possible licenses # See https://spdx.org/licenses/ for list of possible licenses

4
src/app.rs
View File

@ -481,7 +481,7 @@ impl eframe::App for App {
if let Some(project_dir) = &config.project_dir { if let Some(project_dir) = &config.project_dir {
match create_watcher(self.modified.clone(), project_dir) { match create_watcher(self.modified.clone(), project_dir) {
Ok(watcher) => self.watcher = Some(watcher), Ok(watcher) => self.watcher = Some(watcher),
Err(e) => eprintln!("Failed to create watcher: {e}"), Err(e) => log::error!("Failed to create watcher: {e}"),
} }
config.project_dir_change = false; config.project_dir_change = false;
self.modified.store(true, Ordering::Relaxed); self.modified.store(true, Ordering::Relaxed);
@ -532,7 +532,7 @@ fn create_watcher(
} }
} }
} }
Err(e) => println!("watch error: {e:?}"), Err(e) => log::error!("watch error: {e:?}"),
})?; })?;
watcher.watch(project_dir, RecursiveMode::Recursive)?; watcher.watch(project_dir, RecursiveMode::Recursive)?;
Ok(watcher) Ok(watcher)

4
src/main.rs
View File

@ -65,7 +65,7 @@ fn main() {
let result = exec::Command::new(path) let result = exec::Command::new(path)
.args(&std::env::args().collect::<Vec<String>>()) .args(&std::env::args().collect::<Vec<String>>())
.exec(); .exec();
eprintln!("Failed to relaunch: {result:?}"); log::error!("Failed to relaunch: {result:?}");
} else { } else {
let result = std::process::Command::new(path) let result = std::process::Command::new(path)
.args(std::env::args()) .args(std::env::args())
@ -73,7 +73,7 @@ fn main() {
.unwrap() .unwrap()
.wait(); .wait();
if let Err(e) = result { if let Err(e) = result {
eprintln!("Failed to relaunch: {:?}", e); log::error!("Failed to relaunch: {:?}", e);
} }
} }
} }

4
src/obj/elf.rs
View File

@ -26,7 +26,7 @@ fn to_obj_section_kind(kind: SectionKind) -> Option<ObjSectionKind> {
fn to_obj_symbol(obj_file: &File<'_>, symbol: &Symbol<'_, '_>, addend: i64) -> Result<ObjSymbol> { fn to_obj_symbol(obj_file: &File<'_>, symbol: &Symbol<'_, '_>, addend: i64) -> Result<ObjSymbol> {
let mut name = symbol.name().context("Failed to process symbol name")?; let mut name = symbol.name().context("Failed to process symbol name")?;
if name.is_empty() { if name.is_empty() {
println!("Found empty sym: {symbol:?}"); log::warn!("Found empty sym: {symbol:?}");
name = "?"; name = "?";
} }
let mut flags = ObjSymbolFlagSet(ObjSymbolFlags::none()); let mut flags = ObjSymbolFlagSet(ObjSymbolFlags::none());
@ -294,7 +294,7 @@ fn line_info(obj_file: &File<'_>) -> Result<Option<BTreeMap<u32, u32>>> {
let address_delta = reader.read_u32::<BigEndian>()?; let address_delta = reader.read_u32::<BigEndian>()?;
map.insert(base_address + address_delta, line_number); map.insert(base_address + address_delta, line_number);
} }
println!("Line info: {map:#X?}"); log::debug!("Line info: {map:#X?}");
return Ok(Some(map)); return Ok(Some(map));
} }
Ok(None) Ok(None)

2
src/views/jobs.rs
View File

@ -17,7 +17,7 @@ pub fn jobs_ui(ui: &mut egui::Ui, view_state: &mut ViewState) {
if job.handle.is_some() { if job.handle.is_some() {
job.should_remove = true; job.should_remove = true;
if let Err(e) = job.cancel.send(()) { if let Err(e) = job.cancel.send(()) {
eprintln!("Failed to cancel job: {e:?}"); log::error!("Failed to cancel job: {e:?}");
} }
} else { } else {
remove_job = Some(idx); remove_job = Some(idx);