diff options
| author | Laurenz <laurmaedje@gmail.com> | 2024-08-05 12:54:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-05 10:54:30 +0000 |
| commit | 9909f12d4f599674055a6d0c775d573d315b89b8 (patch) | |
| tree | d343710e69c95bddeec3e6274125273fd958d9e3 | |
| parent | 6fbba6d73fb516452807d0883e1c2d25c3124a33 (diff) | |
Bump to Rust 1.80 (#4681)
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 2 | ||||
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | crates/typst-pdf/src/color_font.rs | 2 | ||||
| -rw-r--r-- | crates/typst/src/layout/grid/cells.rs | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3dca5249..04aa0e8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@1.79.0 + - uses: dtolnay/rust-toolchain@1.80.0 - uses: Swatinem/rust-cache@v2 - run: cargo test --workspace --no-run - run: cargo test --workspace --no-fail-fast @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@1.79.0 + - uses: dtolnay/rust-toolchain@1.80.0 with: components: clippy, rustfmt - uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 51a27ea9..9add995b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@1.79.0 + - uses: dtolnay/rust-toolchain@1.80.0 with: target: ${{ matrix.target }} @@ -140,5 +140,6 @@ codegen-units = 1 strip = true [workspace.lints.clippy] -uninlined_format_args = "warn" blocks_in_conditions = "allow" +mutable_key_type = "allow" +uninlined_format_args = "warn" diff --git a/crates/typst-pdf/src/color_font.rs b/crates/typst-pdf/src/color_font.rs index 4889d915..6f435d43 100644 --- a/crates/typst-pdf/src/color_font.rs +++ b/crates/typst-pdf/src/color_font.rs @@ -305,7 +305,7 @@ impl<'a, R> Iterator for ColorFontMapIter<'a, R> { /// A set of at most 256 glyphs (a limit imposed on Type3 fonts by the PDF /// specification) that represents a part of a TTF font. -#[derive(PartialEq, Eq, Hash, Debug, Clone)] +#[derive(Debug, Clone, Eq, PartialEq, Hash)] pub struct ColorFontSlice { /// The original TTF font. pub font: Font, diff --git a/crates/typst/src/layout/grid/cells.rs b/crates/typst/src/layout/grid/cells.rs index 201bf108..e45d58d4 100644 --- a/crates/typst/src/layout/grid/cells.rs +++ b/crates/typst/src/layout/grid/cells.rs @@ -1223,7 +1223,7 @@ impl<'a> CellGrid<'a> { /// position. It is guaranteed to have a non-gutter, non-merged cell at /// the returned position, due to how the grid is built. /// - If the entry at the given position is a cell, returns the given - /// position. + /// position. /// - If it is a merged cell, returns the parent cell's position. /// - If it is a gutter cell, returns None. #[track_caller] |