Merge branch 'infer-0.6.0' into 'master'

Update infer to 0.6.0

See merge request Lynnesbian/fif!2
This commit is contained in:
Lynne Megido 2022-01-17 00:12:19 +00:00
commit 9c404f2557
3 changed files with 4 additions and 10 deletions

4
Cargo.lock generated
View File

@ -289,9 +289,9 @@ dependencies = [
[[package]]
name = "infer"
version = "0.5.0"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea70330449622910e0edebab230734569516269fb32342fb0a8956340fa48c6c"
checksum = "3fe51fa1be60e2a136243674bf4b938279ebddc7019dd5671211e375145759e9"
dependencies = [
"cfb",
]

View File

@ -44,11 +44,11 @@ parking_lot = "0.11.2"
[target.'cfg(not(unix))'.dependencies]
xdg-mime = { version = "0.3.3", optional = true }
infer = "0.5.0"
infer = "0.6.0"
[target.'cfg(unix)'.dependencies]
xdg-mime = "0.3.3"
infer = { version = "0.5.0", optional = true }
infer = { version = "0.6.0", optional = true }
[target.'cfg(not(all(target_endian = "big", target_pointer_width = "32")))'.dependencies]
# the seemingly weird target constraint here is due to this:

View File

@ -58,12 +58,6 @@ cfg_if! {
buf.len() >= 34 && buf.starts_with(b"RPA-") && buf[7] == b' ' && buf[24] ==b' '
});
info.add("audio/x-aiff", "aiff", |buf| {
// as added by https://github.com/bojand/infer/pull/48/files
// this should be removed when (if) that PR is accepted
buf.starts_with(b"\x46\x4f\x52\x4d\x41\x49\x46\x46")
});
// info.add("application/x-msi", "msi", |buf| {
// TODO: find a way to detect MSI files properly - this just detects those weird windows OLE files and therefore
// also picks up on .doc files