Update the dependencies

Author: IvanUkhov

.github/workflows/build.yml

@@ -13,9 +13,9 @@ jobs:
   check:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
-        with: {toolchain: stable, components: clippy, rustfmt}
+      - uses: actions/checkout@v4
+      - uses: ructions/toolchain@v2
+        with: {toolchain: stable, components: "clippy, rustfmt"}
       - run: cargo clippy -- -D warnings
       - run: cargo fmt --all -- --check
 
@@ -25,7 +25,7 @@ jobs:
         os: [macos-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: ructions/toolchain@v2
         with: {toolchain: stable}
       - run: cargo test

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "webtype"
-version = "0.9.0"
+version = "0.10.0"
 edition = "2021"
 license = "Apache-2.0/MIT"
 authors = ["Ivan Ukhov <[email protected]>"]
@@ -14,5 +14,5 @@ keywords = ["font", "typeface", "typography", "woff", "woff2"]
 
 [dependencies]
 brotli-decompressor = "2"
-opentype = { version = "0.31.0", features = ["ignore-invalid-checksums"] }
+opentype = { version = "0.32.0", features = ["ignore-invalid-checksums"] }
 typeface = "0"

LICENSE.md

@@ -11,7 +11,7 @@ The following two notices apply to every file of the project.
 ## The Apache License
 
 ```
-Copyright 2023 The webtype Developers
+Copyright 2023–2024 The webtype Developers
 
 Licensed under the Apache License, Version 2.0 (the “License”); you may not use
 this file except in compliance with the License. You may obtain a copy of the
@@ -28,7 +28,7 @@ specific language governing permissions and limitations under the License.
 ## The MIT License
 
 ```
-Copyright 2023 The webtype Developers
+Copyright 2023–2024 The webtype Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the “Software”), to deal in

README.md

@@ -1,8 +1,8 @@
 # WebType [![Package][package-img]][package-url] [![Documentation][documentation-img]][documentation-url] [![Build][build-img]][build-url]
 
 The package provides a parser for fonts in Web Open Font Format. It might be
-helpful to have a look at a higher-level parser called [`font`][font], which
-internally relies on this package.
+helpful to have a look at a higher-level abstraction called [`font`][font],
+which internally relies on this package.
 
 ## Example
 

src/file.rs

@@ -3,7 +3,7 @@ use std::io::Cursor;
 use opentype::truetype::Tag;
 use opentype::Font;
 
-use crate::{Result, Tape, Value, Walue};
+use crate::Result;
 
 /// A file.
 pub struct File {
@@ -15,8 +15,10 @@ pub struct File {
 
 impl File {
     /// Read a file.
-    pub fn read<T: Tape>(tape: &mut T) -> Result<File> {
-        match Tape::peek::<(Tag, Tag)>(tape)? {
+    pub fn read<T: crate::tape::Read>(tape: &mut T) -> Result<File> {
+        use crate::tape::Read;
+
+        match Read::peek::<(Tag, Tag)>(tape)? {
             (tag, _) if tag.0 == *b"wOFF" => {
                 raise!("found version 1, which is not supported yet");
             }
@@ -35,8 +37,10 @@ impl File {
 
 dereference! { File::fonts => [Font] }
 
-fn read_version2<T: Tape>(mut tape: T) -> Result<(Font, Vec<u8>)> {
+fn read_version2<T: crate::tape::Read>(mut tape: T) -> Result<(Font, Vec<u8>)> {
+    use crate::value::Read as ValueRead;
     use crate::version2::{FileHeader, TableDirectory};
+    use crate::walue::Read as WalueRead;
 
     let file_header = FileHeader::read(&mut tape)?;
     let table_directory = TableDirectory::read(&mut tape, &file_header)?;

src/lib.rs

@@ -29,7 +29,7 @@ mod file;
 mod number;
 
 pub use opentype::Font;
-pub use typeface::{Error, Result, Tape, Value, Walue};
+pub use typeface::{tape, value, walue, Error, Result};
 
 pub use file::File;
 pub use number::v32;

src/number.rs

@@ -1,18 +1,18 @@
-use crate::{Result, Tape, Value};
+use crate::Result;
 
 /// A four-byte unsigned integer with a variable-length encoding.
 #[allow(non_camel_case_types)]
 #[derive(Clone, Copy, Debug, Default)]
 pub struct v32(pub u32);
 
-impl Value for v32 {
+impl crate::value::Read for v32 {
     #[inline]
-    fn read<T: Tape>(tape: &mut T) -> Result<Self> {
+    fn read<T: crate::tape::Read>(tape: &mut T) -> Result<Self> {
         Ok(v32(parse(tape)?))
     }
 }
 
-fn parse<T: Tape>(tape: &mut T) -> Result<u32> {
+fn parse<T: crate::tape::Read>(tape: &mut T) -> Result<u32> {
     let mut value: u32 = 0;
     for i in 0..5 {
         let byte: u32 = tape.take::<u8>()? as _;

src/version2/table_directory.rs

@@ -7,7 +7,7 @@ use opentype::truetype::Tag;
 
 use crate::number::v32;
 use crate::version2::file_header::FileHeader;
-use crate::{Result, Tape, Walue};
+use crate::Result;
 
 const TAG_MASK: u8 = 0b0011_1111;
 
@@ -70,7 +70,7 @@ impl TableDirectory {
     }
 
     /// Decompress all tables.
-    pub fn decompress<T: Tape>(&self, mut tape: T, _: &FileHeader) -> Result<Vec<u8>> {
+    pub fn decompress<T: crate::tape::Read>(&self, mut tape: T, _: &FileHeader) -> Result<Vec<u8>> {
         let size = self.iter().map(|record| record.uncompressed_size()).sum();
         let mut data = Vec::with_capacity(size);
         brotli_decompressor::BrotliDecompress(&mut tape, &mut data)?;
@@ -80,10 +80,10 @@ impl TableDirectory {
 
 dereference! { TableDirectory::records => [Record] }
 
-impl<'l> Walue<'l> for TableDirectory {
+impl<'l> crate::walue::Read<'l> for TableDirectory {
     type Parameter = &'l FileHeader;
 
-    fn read<T: Tape>(tape: &mut T, file_header: &'l FileHeader) -> Result<Self> {
+    fn read<T: crate::tape::Read>(tape: &mut T, file_header: &'l FileHeader) -> Result<Self> {
         let records = tape.take_given(file_header.table_count as usize)?;
         Ok(TableDirectory { records })
     }

tests/file_header.rs

@@ -2,8 +2,8 @@
 mod support;
 
 mod noto_naskh_arabic {
+    use webtype::value::Read;
     use webtype::version2::FileHeader;
-    use webtype::Value;
 
     #[test]
     fn read() {

tests/table_directory.rs

@@ -6,8 +6,9 @@ mod noto_naskh_arabic {
 
     use webtype::opentype::truetype::tables::FontHeader;
     use webtype::opentype::Font;
+    use webtype::value::Read as ValueRead;
     use webtype::version2::{FileHeader, TableDirectory};
-    use webtype::{Value, Walue};
+    use webtype::walue::Read as WalueRead;
 
     #[test]
     fn read() {