Update ordered-float to 4

Fix lints Update CI
alexheretic · Sep 23, 2023 · 68f1008 · 68f1008
1 parent 5203b5f
commit 68f1008
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - run: rustup update stable
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - run: cargo test
     - run: cargo test --benches
 
@@ -22,20 +22,20 @@ jobs:
   #   - run: rustup update stable
   #   - run: sudo apt update && sudo apt install -yq gcc-multilib musl-tools
   #   - run: rustup target add i686-unknown-linux-musl
-  #   - uses: actions/checkout@v2
+  #   - uses: actions/checkout@v4
   #   - run: cargo test --target i686-unknown-linux-musl
 
   check_wasm:
     runs-on: ubuntu-latest
     steps:
     - run: rustup update stable
     - run: rustup target add wasm32-unknown-unknown
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - run: cargo check --target wasm32-unknown-unknown
 
   rustfmt:
     runs-on: ubuntu-latest
     steps:
     - run: rustup update stable
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - run: cargo fmt -- --check
diff --git a/glyph-brush/CHANGELOG.md b/glyph-brush/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Unreleased (v0.7.8)
+* Update _ordered-float_ to `4`.
+
 # v0.7.7
 * Allow `Text::new` to work with any `X` type. **This may break usage**, however it will hopefully be non-breaking in practice as the compiler should always be able to infer this.
 * Add `Section::builder` for more flexible `X`/"extra" type usage than `Section::default` & for owned text too.

diff --git a/glyph-brush/Cargo.toml b/glyph-brush/Cargo.toml
@@ -12,7 +12,7 @@ readme = "README.md"
 [dependencies]
 glyph_brush_draw_cache = { version = "0.1.1", path = "../draw-cache" }
 glyph_brush_layout = { version = "0.2.3", path = "../layout" }
-ordered-float = "3"
+ordered-float = "4"
 rustc-hash = "1"
 twox-hash = { version = "1.6.1", default-features = false }
 

diff --git a/glyph-brush/src/glyph_brush.rs b/glyph-brush/src/glyph_brush.rs
@@ -274,7 +274,7 @@ where
                             match change {
                                 None => Some(old.positioned.glyphs),
                                 Some(change) => Some(layout.recalculate_glyphs(
-                                    old.positioned.glyphs.into_iter(),
+                                    old.positioned.glyphs,
                                     change,
                                     &self.fonts,
                                     &geometry,
@@ -800,7 +800,7 @@ mod hash_diff_test {
             &section.layout,
         ));
 
-        assert!(matches!(diff, None));
+        assert!(diff.is_none());
     }
 
     #[test]

diff --git a/layout/Cargo.toml b/layout/Cargo.toml
@@ -16,4 +16,4 @@ xi-unicode = "0.3"
 
 [dev-dependencies]
 once_cell = "1"
-ordered-float = "3"
+ordered-float = "4"