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.

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

bump deps, fix wasm build #746

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
566 changes: 401 additions & 165 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions analyze/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ anyhow = "1.0"
twiggy-ir = { version = "=0.7.0", path = "../ir" }
twiggy-opt = { version = "=0.7.0", path = "../opt", default-features = false }
twiggy-traits = { version = "=0.7.0", path = "../traits" }
csv = "1.2.2"
regex = "1.4.2"
csv = "1.3.0"
regex = "1.10.2"
serde = "1.0"
serde_derive = "1.0"
petgraph = "0.6.2"
petgraph = "0.6.4"

[features]
default = ["emit_csv", "emit_json", "emit_text"]
Expand Down
6 changes: 3 additions & 3 deletions ir/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ edition = "2018"
path = "./ir.rs"

[dependencies]
cpp_demangle = { version = "0.3.5", default-features = false }
cpp_demangle = { version = "0.4.3" }
frozen = "1"
petgraph = "0.6.2"
rustc-demangle = "0.1.21"
petgraph = "0.6.4"
rustc-demangle = "0.1.23"
serde = "1.0"
serde_derive = "1.0"
4 changes: 2 additions & 2 deletions job_runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ edition = "2018"

[dependencies]
rustop = "1.1"
cargo_toml = "0.13"
anyhow = "1.0"
cargo_toml = "0.17"
anyhow = "1.0"
4 changes: 2 additions & 2 deletions opt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ edition = "2018"
path = "opt.rs"

[build-dependencies]
regex = "1.4.2"
regex = "1.10.2"

[dependencies]
anyhow = "1.0"
structopt = { version = "0.3", optional = true }
twiggy-traits = { version = "=0.7.0", path = "../traits" }
wasm-bindgen = { version = "0.2.80", optional = true }
wasm-bindgen = { version = "0.2.89", optional = true }
cfg-if = "1.0.0"

[features]
Expand Down
4 changes: 4 additions & 0 deletions opt/definitions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -711,4 +711,8 @@ impl Garbage {
pub fn show_data_segments(&self) -> bool {
self.show_data_segments
}

pub fn set_show_data_segments(&mut self, show: bool) {
self.show_data_segments = show;
}
}
8 changes: 4 additions & 4 deletions parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ path = "./parser.rs"

[dependencies]
anyhow = "1.0"
fallible-iterator = { version = "0.2.0", optional = true }
gimli = { version = "0.27.3", optional = true, default-features = false, features = ["std", "read"] }
object = { version = "0.17.0", optional = true }
wasmparser = "0.80.0"
fallible-iterator = { version = "0.3.0", optional = true }
gimli = { version = "0.28.1", optional = true, default-features = true, features = ["std", "read"] }
object = { version = "0.32.2", optional = true }
wasmparser = "0.80.2"
typed-arena = { version = "2.0.2", optional = true }
twiggy-ir = { version = "=0.7.0", path = "../ir" }
twiggy-traits = { version = "=0.7.0", path = "../traits" }
Expand Down
8 changes: 6 additions & 2 deletions parser/object_parse/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use anyhow::anyhow;
use fallible_iterator::FallibleIterator;
use gimli;
use object::{self, Object};
use object::{self, Object, ObjectSection};
use std::borrow::{Borrow, Cow};
use twiggy_ir as ir;
use typed_arena::Arena;
Expand All @@ -22,7 +22,11 @@ where
'a: 'file,
{
let data = file
.section_data_by_name(Sect::section_name())
.section_by_name(Sect::section_name())
.map(|s| s.uncompressed_data())
.transpose()
.ok()
.flatten()
.unwrap_or(Cow::Borrowed(&[]));
let data_ref = (*arena.alloc(data)).borrow();
Sect::from(gimli::EndianSlice::new(data_ref, endian))
Expand Down
8 changes: 4 additions & 4 deletions traits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ path = "./traits.rs"
[dependencies]
thiserror = "1.0"
anyhow = "1.0"
gimli = { version = "0.27.3", optional = true, default-features = false, features = ["std", "read"] }
wasmparser = "0.80.0"
gimli = { version = "0.28.1", optional = true, default-features = true, features = ["std", "read"] }
wasmparser = "0.118.1"
twiggy-ir = { version = "=0.7.0", path = "../ir" }
csv = "1.2.2"
regex = "1.4.2"
csv = "1.3.0"
regex = "1.10.2"

[features]
default = []
Expand Down
3 changes: 2 additions & 1 deletion twiggy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@ twiggy-parser = { version = "=0.7.0", path = "../parser" }
twiggy-traits = { version = "=0.7.0", path = "../traits" }

[dev-dependencies]
colored = "2.0.0"
colored = "2.1.0"
diff = "0.1.13"
wasm-bindgen-test = "0.2"
2 changes: 1 addition & 1 deletion wasm-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ version = "=0.7.0"
path = "../traits"

[dependencies.wasm-bindgen]
version = "0.2.80"
version = "0.2.89"

[features]
default = ["emit_json"]
Expand Down
Loading