Skip to content

Commit

Permalink
Merge pull request #466 from philipc/deps
Browse files Browse the repository at this point in the history
Update dependencies and make more optional
  • Loading branch information
philipc committed Jan 10, 2020
2 parents 9630b74 + 003ee0c commit 30131d8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
15 changes: 7 additions & 8 deletions Cargo.toml
Expand Up @@ -17,28 +17,27 @@ travis-ci = { repository = "gimli-rs/gimli" }
coveralls = { repository = "gimli-rs/gimli" }

[dependencies]
arrayvec = { version = "0.5.0", default-features = false }
arrayvec = { version = "0.5.0", default-features = false, optional = true }
byteorder = { version = "1.0", default-features = false }
fallible-iterator = { version = "0.2.0", default-features = false }
fallible-iterator = { version = "0.2.0", default-features = false, optional = true }
indexmap = { version = "1.0.2", optional = true }
smallvec = { version = "0.6.10", default-features = false }
smallvec = { version = "1.1.0", default-features = false, optional = true }
stable_deref_trait = { version = "1.1.0", default-features = false, optional = true }

[dev-dependencies]
crossbeam = "0.7.1"
getopts = "0.2"
memmap = "0.7"
num_cpus = "1"
object = "0.15"
object = "0.17"
rayon = "1.0"
regex = "1"
test-assembler = "0.1.3"
typed-arena = "1"
target-lexicon = "0.8"
typed-arena = "2"

[features]
read = ["stable_deref_trait"]
write = ["std", "indexmap"]
read = ["arrayvec", "fallible-iterator", "smallvec", "stable_deref_trait"]
write = ["indexmap"]
std = ["fallible-iterator/std", "stable_deref_trait/std"]
default = ["read", "write", "std"]

Expand Down
2 changes: 1 addition & 1 deletion examples/dwarfdump.rs
Expand Up @@ -3,7 +3,7 @@

use fallible_iterator::FallibleIterator;
use gimli::{CompilationUnitHeader, Section, UnitOffset, UnitSectionOffset, UnwindSection};
use object::{Object, ObjectSection};
use object::{target_lexicon, Object, ObjectSection};
use regex::bytes::Regex;
use std::borrow::{Borrow, Cow};
use std::cmp::min;
Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
Expand Up @@ -16,8 +16,8 @@
//! * `read`: Enabled by default. Enables the `read` module. Use of `std` is
//! optional.
//!
//! * `write`: Enabled by default. Enables the `write` module. Automatically
//! enables `std` too.
//! * `write`: Enabled by default. Enables the `write` module. Always uses
//! the `std` library.
#![deny(missing_docs)]
#![deny(missing_debug_implementations)]
// Selectively enable rust 2018 warnings
Expand All @@ -40,7 +40,7 @@
#[macro_use]
extern crate alloc;

#[cfg(feature = "std")]
#[cfg(any(feature = "std", feature = "write"))]
#[macro_use]
extern crate std;

Expand Down

0 comments on commit 30131d8

Please sign in to comment.