Merge pull request rust-windowing#93 from Eijebong/num-traits-0.1-is-…

…goooone Update dependencies to remove num-traits 0.1
tmfink · Jul 31, 2018 · a518cda · a518cda
2 parents d04912f + 9d19454
commit a518cda
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 70 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/demo/server/Cargo.toml b/demo/server/Cargo.toml
@@ -9,12 +9,12 @@ freetype = ["pathfinder_font_renderer/freetype"]
 reftests = ["rsvg", "cairo-rs", "pathfinder_font_renderer/freetype"]
 
 [dependencies]
-app_units = "0.6"
+app_units = "0.7"
 base64 = "0.6"
 bincode = "1.0"
 env_logger = "0.5"
 euclid = "0.19"
-image = "0.17"
+image = "0.19"
 lazy_static = "0.2"
 log = "0.3"
 lru-cache = "0.1"

diff --git a/demo/server/src/main.rs b/demo/server/src/main.rs
@@ -354,7 +354,7 @@ impl<'r> Responder<'r> for ReferenceImage {
 
         let mut bytes = vec![];
         try!(self.image
-                 .save(&mut bytes, ImageFormat::PNG)
+                 .write_to(&mut bytes, ImageFormat::PNG)
                  .map_err(|_| Status::InternalServerError));
         builder.sized_body(Cursor::new(bytes));
         builder.ok()

diff --git a/font-renderer/Cargo.toml b/font-renderer/Cargo.toml
@@ -8,7 +8,7 @@ default = []
 freetype-backend = ["freetype"]
 
 [dependencies]
-app_units = "0.6"
+app_units = "0.7"
 libc = "0.2"
 log = "0.3"
 lyon_path = "0.12"

diff --git a/utils/area-lut/Cargo.toml b/utils/area-lut/Cargo.toml
@@ -6,4 +6,4 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 [dependencies]
 clap = "2.30"
 euclid = "0.19"
-image = "0.18"
+image = "0.19"
diff --git a/utils/frontend/Cargo.toml b/utils/frontend/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.2.0"
 authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 
 [dependencies]
-app_units = "0.6"
+app_units = "0.7"
 clap = "2.27"
 freetype = "0.4"
 lyon_path = "0.12"

diff --git a/utils/gamma-lut/Cargo.toml b/utils/gamma-lut/Cargo.toml
@@ -5,5 +5,5 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 
 [dependencies]
 clap = "2.27"
-image = "0.17"
+image = "0.19"
 log = "0.3"
diff --git a/utils/gamma-lut/src/main.rs b/utils/gamma-lut/src/main.rs
@@ -12,9 +12,7 @@ mod gamma_lut;
 
 use clap::{App, Arg};
 use gamma_lut::GammaLut;
-use image::{ImageBuffer, ImageLuma8, Luma, PNG};
-use std::fs::File;
-use std::path::Path;
+use image::{ImageBuffer, ImageLuma8, Luma};
 
 const CONTRAST: f32 = 0.0;
 const GAMMA: f32 = 0.0;
@@ -58,8 +56,6 @@ pub fn main() {
     }
 
     let output_path = matches.value_of("OUTPUT-PATH").unwrap();
-    let output_path = Path::new(output_path);
 
-    let mut output = File::create(output_path).unwrap();
-    ImageLuma8(image).save(&mut output, PNG).unwrap();
+    ImageLuma8(image).save(output_path).unwrap();
 }