Skip to content

Commit fe90285

Browse files
authored
Merge pull request mozilla#242 from mozilla/use-fallible_collections-crate
Switch to using fallible_collections crate
2 parents 34b5100 + 4f55d01 commit fe90285

File tree

8 files changed

+30
-555
lines changed

8 files changed

+30
-555
lines changed

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ install:
2727
fi
2828

2929
script:
30-
# We cannot run `cargo test` with the mp4parse_fallible feature enabled
31-
# (see comment where the feature is defined in mp4parse_capi/Cargo.toml),
32-
# but we can at least check for changes behind features that would break the
33-
# build.
34-
- cargo check --all --verbose $RELEASE --tests --all-features
3530
- cargo test --all --verbose $RELEASE ${TARGET:+--target=$TARGET}
3631
- cargo doc --package mp4parse_capi
3732
# The `false` after `echo` is necessary to avoid false negatives due to `echo` returning success

mp4parse/Cargo.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ travis-ci = { repository = "https://github.com/mozilla/mp4parse-rust" }
2727
[dependencies]
2828
byteorder = "1.2.1"
2929
bitreader = { version = "0.3.2" }
30+
fallible_collections = { version = "0.1.3", features = ["std_io"] }
3031
hashbrown = "0.7.1"
3132
num-traits = "=0.2.10"
3233
log = "0.4"
@@ -36,9 +37,3 @@ static_assertions = "1.1.0"
3637
test-assembler = "0.1.2"
3738
env_logger = "0.7.1"
3839
walkdir = "2.3.1"
39-
40-
[features]
41-
# Enable mp4parse_fallible to use fallible memory allocation rather than
42-
# panicking on OOM. Note that this is only safe within Gecko where the system
43-
# allocator has been globally overridden (see BMO 1457359).
44-
mp4parse_fallible = []

0 commit comments

Comments
 (0)