diff --git a/Cargo.lock b/Cargo.lock index 80ed7ab..ef2ba6d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -566,9 +566,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978" +checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -685,7 +685,7 @@ checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541" [[package]] name = "eframe" version = "0.18.0" -source = "git+https://github.com/Titaniumtown/egui.git#31c1ff98cc7f079e39992075ba5b7fe528fab1bc" +source = "git+https://github.com/Titaniumtown/egui.git#bc631d802bdaca930e07e78b7497ba626944b8d7" dependencies = [ "bytemuck", "egui", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "egui" version = "0.18.1" -source = "git+https://github.com/Titaniumtown/egui.git#31c1ff98cc7f079e39992075ba5b7fe528fab1bc" +source = "git+https://github.com/Titaniumtown/egui.git#bc631d802bdaca930e07e78b7497ba626944b8d7" dependencies = [ "ahash", "epaint", @@ -717,7 +717,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.18.0" -source = "git+https://github.com/Titaniumtown/egui.git#31c1ff98cc7f079e39992075ba5b7fe528fab1bc" +source = "git+https://github.com/Titaniumtown/egui.git#bc631d802bdaca930e07e78b7497ba626944b8d7" dependencies = [ "arboard", "egui", @@ -731,7 +731,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.18.1" -source = "git+https://github.com/Titaniumtown/egui.git#31c1ff98cc7f079e39992075ba5b7fe528fab1bc" +source = "git+https://github.com/Titaniumtown/egui.git#bc631d802bdaca930e07e78b7497ba626944b8d7" dependencies = [ "bytemuck", "egui", @@ -751,7 +751,7 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "emath" version = "0.18.0" -source = "git+https://github.com/Titaniumtown/egui.git#31c1ff98cc7f079e39992075ba5b7fe528fab1bc" +source = "git+https://github.com/Titaniumtown/egui.git#bc631d802bdaca930e07e78b7497ba626944b8d7" dependencies = [ "bytemuck", "serde", @@ -760,7 +760,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.18.1" -source = "git+https://github.com/Titaniumtown/egui.git#31c1ff98cc7f079e39992075ba5b7fe528fab1bc" +source = "git+https://github.com/Titaniumtown/egui.git#bc631d802bdaca930e07e78b7497ba626944b8d7" dependencies = [ "ab_glyph", "ahash", @@ -1047,9 +1047,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c6392766afd7964e2531940894cffe4bd8d7d17dbc3c1c4857040fd4b33bdb3" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", "hashbrown", @@ -1057,9 +1057,9 @@ dependencies = [ [[package]] name = "inferno" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244ae9456c246081801028c893ee0e2b71be4f0380894e2cd53974c3beea0c64" +checksum = "9a262875c8e10820b9366e991ed6710cd80dc93578375e5d499fcbd408985937" dependencies = [ "ahash", "atty", @@ -1309,9 +1309,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", "log", @@ -1522,9 +1522,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-bigint", @@ -1869,9 +1869,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ "unicode-ident", ] @@ -1887,9 +1887,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f53dc8cf16a769a6f677e09e7ff2cd4be1ea0f48754aac39520536962011de0d" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -2034,7 +2034,7 @@ dependencies = [ [[package]] name = "ruzstd" version = "0.2.4" -source = "git+https://github.com/KillingSpark/zstd-rs.git#b354d185315df90a84d0cbec311703d3c5a10963" +source = "git+https://github.com/KillingSpark/zstd-rs.git#ebe150630b1d750dfc18c6dd3434c51fa594b5ce" dependencies = [ "byteorder", "twox-hash", @@ -2174,9 +2174,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2" [[package]] name = "smithay-client-toolkit" @@ -2198,12 +2198,30 @@ dependencies = [ ] [[package]] -name = "smithay-clipboard" -version = "0.6.5" +name = "smithay-client-toolkit" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610b551bd25378bfd2b8e7a0fcbd83d427e8f2f6a40c47ae0f70688e9949dd55" +checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" dependencies = [ - "smithay-client-toolkit", + "bitflags", + "dlib", + "lazy_static", + "log", + "memmap2 0.5.4", + "nix 0.24.1", + "pkg-config", + "wayland-client", + "wayland-cursor", + "wayland-protocols", +] + +[[package]] +name = "smithay-clipboard" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +dependencies = [ + "smithay-client-toolkit 0.16.0", "wayland-client", ] @@ -2393,9 +2411,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921" +checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" dependencies = [ "once_cell", "valuable", @@ -2479,9 +2497,9 @@ checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "81dee68f85cab8cf68dec42158baf3a79a1cdc065a8b103025965d6ccb7f6cbd" dependencies = [ "tinyvec", ] @@ -2855,7 +2873,7 @@ dependencies = [ "parking_lot 0.11.2", "percent-encoding", "raw-window-handle", - "smithay-client-toolkit", + "smithay-client-toolkit 0.15.4", "wasm-bindgen", "wayland-client", "wayland-protocols", diff --git a/tests/parsing.rs b/tests/parsing.rs index d888fd1..8dcbcff 100644 --- a/tests/parsing.rs +++ b/tests/parsing.rs @@ -204,6 +204,7 @@ fn split_function_multiplication() { ("10*10", vec!["10", "10"]), ("a1b2c3d4", vec!["a1b2c3d4"]), ("cos(sin(x)cos(x))", vec!["cos(sin(x)", "cos(x))"]), + ("", Vec::new()), ]); for (key, value) in values { @@ -218,10 +219,13 @@ fn split_function_multiplication() { fn split_function_terms() { use parsing::SplitType; - let values = HashMap::from([( - "cos(sin(x)cos(x))", - vec!["cos(", "sin(", "x)", "cos(", "x))"], - )]); + let values = HashMap::from([ + ( + "cos(sin(x)cos(x))", + vec!["cos(", "sin(", "x)", "cos(", "x))"], + ), + ("", Vec::new()), + ]); for (key, value) in values { assert_eq!(parsing::split_function(key, SplitType::Term), value);