skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migrate to mime_guess2 (#3456)

This commit is contained in:
Clement Rey 2023-10-11 14:24:55 +02:00 committed by GitHub
parent b5e3502067
commit fd75adb3a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -1319,7 +1319,7 @@ dependencies = [
"enum-map", "enum-map",
"image", "image",
"log", "log",
"mime_guess", "mime_guess2",
"puffin", "puffin",
"resvg", "resvg",
"serde", "serde",
@ -2445,10 +2445,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]] [[package]]
name = "mime_guess" name = "mime_guess2"
version = "2.0.4" version = "2.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" checksum = "25a3333bb1609500601edc766a39b4c1772874a4ce26022f4d866854dc020c41"
dependencies = [ dependencies = [
"mime", "mime",
"unicase", "unicase",

6
crates/egui_extras/Cargo.toml
View File

@ -24,7 +24,7 @@ all-features = true
[features] [features]
default = ["dep:mime_guess"] default = ["dep:mime_guess2"]
## Shorthand for enabling the different types of image loaders (`file`, `http`, `image`, `svg`). ## Shorthand for enabling the different types of image loaders (`file`, `http`, `image`, `svg`).
all_loaders = ["file", "http", "image", "svg"] all_loaders = ["file", "http", "image", "svg"]
@ -33,7 +33,7 @@ all_loaders = ["file", "http", "image", "svg"]
datepicker = ["chrono"] datepicker = ["chrono"]
## Add support for loading images from `file://` URIs. ## Add support for loading images from `file://` URIs.
file = ["dep:mime_guess"] file = ["dep:mime_guess2"]
## Add support for loading images via HTTP. ## Add support for loading images via HTTP.
http = ["dep:ehttp"] http = ["dep:ehttp"]
@ -83,7 +83,7 @@ document-features = { version = "0.2", optional = true }
image = { version = "0.24", optional = true, default-features = false } image = { version = "0.24", optional = true, default-features = false }
# file feature # file feature
mime_guess = { version = "2.0.4", optional = true, default-features = false } mime_guess2 = { version = "2", optional = true, default-features = false }
puffin = { version = "0.16", optional = true } puffin = { version = "0.16", optional = true }

2
crates/egui_extras/src/loaders/file_loader.rs
View File

@ -68,7 +68,7 @@ impl BytesLoader for FileLoader {
let result = match std::fs::read(&path) { let result = match std::fs::read(&path) {
Ok(bytes) => { Ok(bytes) => {
#[cfg(feature = "mime_guess")] #[cfg(feature = "mime_guess")]
let mime = mime_guess::from_path(&path) let mime = mime_guess2::from_path(&path)
.first_raw() .first_raw()
.map(|v| v.to_owned()); .map(|v| v.to_owned());