migrate to mime_guess2 (#3456)

emilk · Oct 11, 2023 · fd75adb · fd75adb
1 parent b5e3502
commit fd75adb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/egui_extras/Cargo.toml b/crates/egui_extras/Cargo.toml
@@ -24,7 +24,7 @@ all-features = true
 
 
 [features]
-default = ["dep:mime_guess"]
+default = ["dep:mime_guess2"]
 
 ## Shorthand for enabling the different types of image loaders (`file`, `http`, `image`, `svg`).
 all_loaders = ["file", "http", "image", "svg"]
@@ -33,7 +33,7 @@ all_loaders = ["file", "http", "image", "svg"]
 datepicker = ["chrono"]
 
 ## Add support for loading images from `file://` URIs.
-file = ["dep:mime_guess"]
+file = ["dep:mime_guess2"]
 
 ## Add support for loading images via HTTP.
 http = ["dep:ehttp"]
@@ -83,7 +83,7 @@ document-features = { version = "0.2", optional = true }
 image = { version = "0.24", optional = true, default-features = false }
 
 # 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 }
 

diff --git a/crates/egui_extras/src/loaders/file_loader.rs b/crates/egui_extras/src/loaders/file_loader.rs
@@ -68,7 +68,7 @@ impl BytesLoader for FileLoader {
                         let result = match std::fs::read(&path) {
                             Ok(bytes) => {
                                 #[cfg(feature = "mime_guess")]
-                                let mime = mime_guess::from_path(&path)
+                                let mime = mime_guess2::from_path(&path)
                                     .first_raw()
                                     .map(|v| v.to_owned());