| -rw-r--r-- | Cargo.lock | 82 | ||||
| -rw-r--r-- | src/cell.rs | 10 | ||||
| -rw-r--r-- | src/lib.rs | 16 |
3 files changed, 48 insertions, 60 deletions
@@ -16,26 +16,26 @@ checksum = "75892c1bdf5a3e474bbab36fa7f08d1bcc49ce35bd08fdd44cd761805b5865ac" [[package]] name = "atools" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fdfa9d3089fc0aa2676b7b3fe46484581faeef796d7b19b6eb1b908664efc3" +checksum = "a202c69bbe7151ab3d8f31d1fad5f2ab94e4086670dca26b9bf4522a25d6a515" [[package]] name = "atools" -version = "0.1.12" -source = "git+https://git.bendn.org/atools#fd0a7b17127085f3f4e31c6f0cfdf3f909c5cdec" +version = "0.1.13" +source = "git+https://git.bendn.org/atools#340d6832272a4eb5322708b69c1b63f2c4705a4f" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" [[package]] name = "bytemuck" -version = "1.24.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" +checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" dependencies = [ "bytemuck_derive", ] @@ -53,9 +53,9 @@ dependencies = [ [[package]] name = "car" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af0bd903a7b7fa9fbb4316af201a4034e628f4eebb8391ed6e73d78188b69da" +checksum = "ab770ba90e433bb73531a2f3073bef3956014033367e0a4c3679cee39c72f098" dependencies = [ "proc-macro2", "quote", @@ -88,7 +88,7 @@ name = "dsb" version = "0.1.0" dependencies = [ "array_chunks", - "atools 0.1.12 (git+https://git.bendn.org/atools)", + "atools 0.1.13 (git+https://git.bendn.org/atools)", "car", "fimg", "implicit-fn", @@ -103,9 +103,9 @@ dependencies = [ [[package]] name = "either" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "fdeflate" @@ -124,11 +124,11 @@ checksum = "6a02dba6a60cd31533cf16561ced53239686d18f1464bff49579dd320fcea081" [[package]] name = "fimg" -version = "0.4.51" -source = "git+https://git.bendn.org/fimg#be42cdc5c0e981915236b1bff7857256c4ae3458" +version = "0.4.56" +source = "git+https://git.bendn.org/fimg#c0e26118be293bd1487e60b11f9c88ea0238d5bb" dependencies = [ "array_chunks", - "atools 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "atools 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "car", "clipline", "fer", @@ -145,9 +145,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", "miniz_oxide", @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "font-types" -version = "0.10.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a654f404bbcbd48ea58c617c2993ee91d1cb63727a37bf2323a4edeed1b8c5" +checksum = "5b38ad915f6dadd993ced50848a8291a543bd41ca62bc10740d5e64e2ab4cfd7" dependencies = [ "bytemuck", ] @@ -190,9 +190,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.180" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "linked-hash-map" @@ -211,9 +211,9 @@ dependencies = [ [[package]] name = "lower-macros" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1685e573ae55817b3a8169edb1a9541b4f9e2ce166d7248e813078d2665b0f2" +checksum = "2c6719f7ce86cb0dff1e1fb32e9f654433e9588f7d96d2f0b06c8676ab5054a6" dependencies = [ "proc-macro2", "quote", @@ -247,9 +247,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.16" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" +checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" dependencies = [ "bitflags", "crc32fast", @@ -269,9 +269,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.44" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" +checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" dependencies = [ "proc-macro2", ] @@ -283,14 +283,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41da814f20fd1322bd0952e5b5de7a25b71137fd471e0da192ac3f7a1d3327ae" dependencies = [ "array_chunks", - "atools 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "atools 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "read-fonts" -version = "0.35.0" +version = "0.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358" +checksum = "c4ed38b89c2c77ff968c524145ad65fb010f38af5c7a224b53b81d47ac2daa81" dependencies = [ "bytemuck", "font-types", @@ -328,15 +328,15 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" [[package]] name = "skrifa" -version = "0.37.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841" +checksum = "0c34617370ae968efb7161bb2beb517d9084659aae19e24b89e3db25b46e4564" dependencies = [ "bytemuck", "read-fonts", @@ -344,9 +344,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a" +checksum = "0811b01ca2c4e8718760713911feaf4675c24f94e50530a015ec646cfb622f7c" dependencies = [ "skrifa", "yazi", @@ -361,9 +361,9 @@ checksum = "9cd32a3a5640a1e8ba59937591c61be77cae746e7c0fa081b24deebb4f7ece4c" [[package]] name = "syn" -version = "2.0.114" +version = "2.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" +checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" dependencies = [ "proc-macro2", "quote", @@ -378,9 +378,9 @@ checksum = "42f74eb7957e3a63fa27bfa53c3d361e7ce3871e66f2518292a011eb8e2c00cc" [[package]] name = "unicode-ident" -version = "1.0.22" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "vecto" diff --git a/src/cell.rs b/src/cell.rs index 19dc500..4d7ddbd 100644 --- a/src/cell.rs +++ b/src/cell.rs @@ -52,7 +52,7 @@ impl Style { } } -impl const Default for Style { +const impl Default for Style { fn default() -> Self { Self { bg: [0; 3], @@ -90,7 +90,7 @@ impl Debug for Cell { write!(f, "{}", self.letter.unwrap_or(' ')) } } -impl const BitOr<u8> for Style { +const impl BitOr<u8> for Style { type Output = Self; fn bitor(self, rhs: u8) -> Self::Output { @@ -100,13 +100,13 @@ impl const BitOr<u8> for Style { } } } -impl const BitOrAssign<(u8, [u8; 3])> for Style { +const impl BitOrAssign<(u8, [u8; 3])> for Style { fn bitor_assign(&mut self, (f, c): (u8, [u8; 3])) { self.flags |= f; self.fg = c; } } -impl const BitAnd<(u8, [u8; 3])> for Style { +const impl BitAnd<(u8, [u8; 3])> for Style { type Output = Style; fn bitand(mut self, (flags, bg): (u8, [u8; 3])) -> Self::Output { self.flags |= flags; @@ -114,7 +114,7 @@ impl const BitAnd<(u8, [u8; 3])> for Style { self } } -impl const BitAndAssign<(u8, [u8; 3])> for Style { +const impl BitAndAssign<(u8, [u8; 3])> for Style { fn bitand_assign(&mut self, rhs: (u8, [u8; 3])) { *self = *self & rhs; } @@ -1,30 +1,19 @@ #![allow(incomplete_features)] #![feature( - range_into_bounds, - array_try_from_fn, - const_array, const_default, derive_const, const_ops, proc_macro_hygiene, portable_simd, - super_let, - debug_closure_helpers, const_trait_impl, - anonymous_lifetime_in_impl_trait, deref_patterns, generic_const_exprs, - guard_patterns, impl_trait_in_bindings, - if_let_guard, import_trait_associated_functions )] #![allow(unsafe_op_in_unsafe_fn)] -use std::array::try_from_fn; use std::iter::{successors, zip}; -use std::ops::IntoBounds; -use Default::default; pub mod cell; use atools::prelude::*; use fimg::{Image, OverlayAt}; @@ -32,7 +21,6 @@ use itertools::Itertools; use lru_cache::LruCache; use swash::scale::{Render, ScaleContext, Source}; use swash::shape::ShapeContext; -use swash::shape::cluster::Glyph; use swash::text::cluster::{CharCluster, Parser, Token}; use swash::text::{Codepoint, Script}; use swash::zeno::Format; @@ -133,7 +121,7 @@ pub unsafe fn render_owned( #[implicit_fn::implicit_fn] pub unsafe fn render( cells: &[Cell], - (c, r): (usize, usize), + (c, _r): (usize, usize), ppem: f32, fonts: &mut Fonts, line_spacing: f32, @@ -202,7 +190,7 @@ pub unsafe fn render( ) }); let scx = &mut fonts.scx; - let sch = &mut fonts.shape_cache; + let _sch = &mut fonts.shape_cache; let mut cluster = CharCluster::new(); macro_rules! input { ($rule:expr, $font:expr, $k: literal) => { |