From 0711278a7f5cb24fd74ef4954abd0ed907314472 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Wed, 5 Jun 2024 20:42:15 +0200 Subject: [PATCH] update to servicepoint 0.6.0 --- Cargo.lock | 44 ++++++++++++++++++++++++++++++++++++++++-- Cargo.toml | 2 +- src/execute_command.rs | 8 ++++---- 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 448f3b1..30548c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -227,6 +227,18 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "block" version = "0.1.6" @@ -720,6 +732,12 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "gethostname" version = "0.4.3" @@ -1425,6 +1443,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "range-alloc" version = "0.1.3" @@ -1622,10 +1646,11 @@ dependencies = [ [[package]] name = "servicepoint" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85be013633ecfdf39be44b39f2417d3d8a58d3ca387cdfc03372c5840748f227" +checksum = "5808e133f041a69246520257b6f29661bb2f3c0fd548100c8c4d68e25803d07f" dependencies = [ + "bitvec", "bzip2", "flate2", "log", @@ -1730,6 +1755,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "termcolor" version = "1.4.1" @@ -2506,6 +2537,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "x11-dl" version = "2.21.0" diff --git a/Cargo.toml b/Cargo.toml index 6825a7f..49060cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0-or-later" [dependencies] # packet parsing -servicepoint = { version = "0.5.0", features = ["all_compressions"] } +servicepoint = { version = "0.6.0", features = ["all_compressions"] } # gui winit = { version = "0.30", features = ["rwh_05"] } # for creating a window diff --git a/src/execute_command.rs b/src/execute_command.rs index 65f5ea8..7449ff9 100644 --- a/src/execute_command.rs +++ b/src/execute_command.rs @@ -45,7 +45,7 @@ pub(crate) fn execute_command( for bitmap_index in 0..vec.len() { let (x, y) = get_coordinates_for_index(offset, bitmap_index); - display.set(x, y, vec.get(bitmap_index)); + display.set(x, y, vec[bitmap_index]); } } Command::BitmapLinearAnd(offset, vec, _) => { @@ -57,7 +57,7 @@ pub(crate) fn execute_command( let (x, y) = get_coordinates_for_index(offset, bitmap_index); let old_value = display.get(x, y); - display.set(x, y, old_value && vec.get(bitmap_index)); + display.set(x, y, old_value && vec[bitmap_index]); } } Command::BitmapLinearOr(offset, vec, _) => { @@ -69,7 +69,7 @@ pub(crate) fn execute_command( let (x, y) = get_coordinates_for_index(offset, bitmap_index); let old_value = display.get(x, y); - display.set(x, y, old_value || vec.get(bitmap_index)); + display.set(x, y, old_value || vec[bitmap_index]); } } Command::BitmapLinearXor(offset, vec, _) => { @@ -81,7 +81,7 @@ pub(crate) fn execute_command( let (x, y) = get_coordinates_for_index(offset, bitmap_index); let old_value = display.get(x, y); - display.set(x, y, old_value ^ vec.get(bitmap_index)); + display.set(x, y, old_value ^ vec[bitmap_index]); } } Command::CharBrightness(origin, grid) => {