From f1352c88fdc6986eb0cbb8675a41f14502987102 Mon Sep 17 00:00:00 2001 From: Matthew Toohey Date: Mon, 28 Nov 2022 22:03:51 -0500 Subject: [PATCH] Fix wasm demo --- examples/wasm/Cargo.lock | 2 +- examples/wasm/src/lib.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/wasm/Cargo.lock b/examples/wasm/Cargo.lock index d4ee5c89..08be2a14 100644 --- a/examples/wasm/Cargo.lock +++ b/examples/wasm/Cargo.lock @@ -160,7 +160,7 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.1" +version = "0.16.0" dependencies = [ "smawk", "unicode-linebreak", diff --git a/examples/wasm/src/lib.rs b/examples/wasm/src/lib.rs index 2cbf0d6c..68f5e3c4 100644 --- a/examples/wasm/src/lib.rs +++ b/examples/wasm/src/lib.rs @@ -152,7 +152,7 @@ impl textwrap::core::Fragment for CanvasWord<'_> { } #[inline] - fn whitespace_width(&self) -> f64 { + fn whitespace_width(&self, _: u8) -> f64 { self.whitespace_width } @@ -351,7 +351,7 @@ pub fn draw_wrapped_text( let mut lineno = 0; for line in text.split('\n') { let words = word_separator.find_words(line); - let split_words = split_words(words, &word_splitter); + let split_words = split_words(words, &word_splitter, 0); let canvas_words = split_words .flat_map(|word| { @@ -366,10 +366,10 @@ pub fn draw_wrapped_text( let line_lengths = [options.width]; let wrapped_words = match options.wrap_algorithm { - WasmWrapAlgorithm::FirstFit => wrap_first_fit(&canvas_words, &line_lengths), + WasmWrapAlgorithm::FirstFit => wrap_first_fit(&canvas_words, &line_lengths, 0), WasmWrapAlgorithm::OptimalFit => { let penalties = options.penalties.into(); - wrap_optimal_fit(&canvas_words, &line_lengths, &penalties).unwrap() + wrap_optimal_fit(&canvas_words, &line_lengths, 0, &penalties).unwrap() } _ => Err("WasmOptions has an invalid wrap_algorithm field")?, };