Bump float-ord and some dev-dependencies

servo · Nov 21, 2023 · a653d98 · a653d98
1 parent 24324b0
commit a653d98
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,7 @@ source = []
 [dependencies]
 bitflags = "1"
 byteorder = "1.2"
-float-ord = "0.2"
+float-ord = "0.3"
 lazy_static = "1.1"
 libc = "0.2"
 log = "0.4.4"
@@ -38,8 +38,8 @@ version = "5.0"
 optional = true
 
 [dev-dependencies]
-clap = "2.32"
-colored = "1.6"
+clap = "3"
+colored = "2"
 pbr = "1.0"
 prettytable-rs = "0.10"
 

diff --git a/examples/fallback.rs b/examples/fallback.rs
@@ -21,7 +21,7 @@ static SANS_SERIF_FONT_REGULAR_POSTSCRIPT_NAME: &'static str = "ArialMT";
 #[cfg(not(any(target_family = "windows", target_os = "macos")))]
 static SANS_SERIF_FONT_REGULAR_POSTSCRIPT_NAME: &'static str = "DejaVuSans";
 
-fn get_args() -> ArgMatches<'static> {
+fn get_args() -> ArgMatches {
     let postscript_name_arg = Arg::with_name("POSTSCRIPT-NAME")
         .help("PostScript name of the font")
         .default_value(SANS_SERIF_FONT_REGULAR_POSTSCRIPT_NAME)

diff --git a/examples/render-glyph.rs b/examples/render-glyph.rs
@@ -26,7 +26,7 @@ static SANS_SERIF_FONT_REGULAR_POSTSCRIPT_NAME: &'static str = "ArialMT";
 #[cfg(not(any(target_family = "windows", target_os = "macos")))]
 static SANS_SERIF_FONT_REGULAR_POSTSCRIPT_NAME: &'static str = "DejaVuSans";
 
-fn get_args() -> ArgMatches<'static> {
+fn get_args() -> ArgMatches {
     let postscript_name_arg = Arg::with_name("POSTSCRIPT-NAME")
         .help("PostScript name of the font")
         .default_value(SANS_SERIF_FONT_REGULAR_POSTSCRIPT_NAME)
@@ -44,15 +44,15 @@ fn get_args() -> ArgMatches<'static> {
         .help("Use grayscale antialiasing (default)");
     let bilevel_arg = Arg::with_name("bilevel")
         .help("Use bilevel (black & white) rasterization")
-        .short("b")
+        .short('b')
         .long("bilevel");
     let subpixel_arg = Arg::with_name("subpixel")
         .help("Use subpixel (LCD) rasterization")
-        .short("s")
+        .short('s')
         .long("subpixel");
     let hinting_arg = Arg::with_name("hinting")
         .help("Select hinting type")
-        .short("H")
+        .short('H')
         .long("hinting")
         .takes_value(true)
         .possible_value("none")

diff --git a/tests/select_font.rs b/tests/select_font.rs
@@ -19,6 +19,7 @@ use std::ffi::OsStr;
 #[cfg(feature = "source")]
 use font_kit::source::SystemSource;
 
+#[cfg(all(feature = "source", any(target_os = "windows", target_os = "macos")))]
 macro_rules! match_handle {
     ($handle:expr, $path:expr, $index:expr) => {
         match $handle {
@@ -246,7 +247,7 @@ mod test {
         let family = SystemSource::new()
             .select_family_by_name("DejaVu Sans")
             .unwrap();
-        let mut filenames: Vec<String> = family
+        let filenames: Vec<String> = family
             .fonts()
             .iter()
             .map(|handle| match *handle {