Skip to content

Commit

Permalink
Update ordered-float to 4
Browse files Browse the repository at this point in the history
Fix lints
Update CI
  • Loading branch information
alexheretic committed Sep 23, 2023
1 parent 5203b5f commit 68f1008
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
3 changes: 3 additions & 0 deletions glyph-brush/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion glyph-brush/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
4 changes: 2 additions & 2 deletions glyph-brush/src/glyph_brush.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -800,7 +800,7 @@ mod hash_diff_test {
&section.layout,
));

assert!(matches!(diff, None));
assert!(diff.is_none());
}

#[test]
Expand Down
2 changes: 1 addition & 1 deletion layout/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ xi-unicode = "0.3"

[dev-dependencies]
once_cell = "1"
ordered-float = "3"
ordered-float = "4"

0 comments on commit 68f1008

Please sign in to comment.