summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpml68 <contact@pml68.dev>2024-12-14 12:54:21 +0100
committerpml68 <contact@pml68.dev>2024-12-14 13:52:26 +0100
commit16503785671e450e8ee23ed30a78e8b59582edb9 (patch)
treec42625b539299d8634eff4a5e886e7fe352223aa
parentfeat: remove `indexmap` in favor of BTreeMap (diff)
downloadiced-builder-16503785671e450e8ee23ed30a78e8b59582edb9.tar.gz
feat: switch to `blob_uuid` for uuid generation
Diffstat (limited to '')
-rw-r--r--Cargo.lock49
-rw-r--r--iced_builder/Cargo.toml26
-rwxr-xr-xiced_builder/src/types/rendered_element.rs19
3 files changed, 50 insertions, 44 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 9aa99fc..8caff6b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -574,9 +574,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.2.3"
+version = "1.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
+checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
dependencies = [
"jobserver",
"libc",
@@ -2003,6 +2003,7 @@ dependencies = [
name = "iced_builder"
version = "0.1.0"
dependencies = [
+ "blob-uuid",
"embed-resource 3.0.1",
"iced",
"iced_anim",
@@ -2013,9 +2014,8 @@ dependencies = [
"rust-format",
"serde",
"serde_json",
- "thiserror 2.0.6",
+ "thiserror 2.0.7",
"tokio",
- "unique_id",
"windows_exe_info",
]
@@ -2533,12 +2533,6 @@ dependencies = [
]
[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
name = "lebe"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3676,9 +3670,9 @@ dependencies = [
[[package]]
name = "read-fonts"
-version = "0.22.5"
+version = "0.22.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a04b892cb6f91951f144c33321843790c8574c825aafdb16d815fd7183b5229"
+checksum = "69aacb76b5c29acfb7f90155d39759a29496aebb49395830e928a9703d2eec2f"
dependencies = [
"bytemuck",
"font-types",
@@ -3928,9 +3922,9 @@ dependencies = [
[[package]]
name = "rustls-pki-types"
-version = "1.10.0"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
[[package]]
name = "rustls-webpki"
@@ -4040,9 +4034,9 @@ checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe"
[[package]]
name = "semver"
-version = "1.0.23"
+version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
[[package]]
name = "serde"
@@ -4508,11 +4502,11 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "2.0.6"
+version = "2.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47"
+checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767"
dependencies = [
- "thiserror-impl 2.0.6",
+ "thiserror-impl 2.0.7",
]
[[package]]
@@ -4528,9 +4522,9 @@ dependencies = [
[[package]]
name = "thiserror-impl"
-version = "2.0.6"
+version = "2.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"
+checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36"
dependencies = [
"proc-macro2",
"quote",
@@ -4876,17 +4870,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]]
-name = "unique_id"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae605c39dfbdec433798d4a8b03ffbac711dc51cdeb1ba5c725bdcaf24e464cc"
-dependencies = [
- "blob-uuid",
- "lazy_static",
- "uuid",
-]
-
-[[package]]
name = "untrusted"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -6109,7 +6092,7 @@ dependencies = [
"pbkdf2",
"rand",
"sha1",
- "thiserror 2.0.6",
+ "thiserror 2.0.7",
"time",
"zeroize",
"zopfli",
diff --git a/iced_builder/Cargo.toml b/iced_builder/Cargo.toml
index 95458bc..41a8b51 100644
--- a/iced_builder/Cargo.toml
+++ b/iced_builder/Cargo.toml
@@ -18,7 +18,7 @@ serde_json = "1.0.133"
tokio = { version = "1.42.0", features = ["fs"] }
rfd = { version = "0.15.1", default-features = false, features = ["async-std", "gtk3"] }
rust-format = "0.3.4"
-unique_id = "0.1.5"
+blob-uuid = "0.5.0"
thiserror = "2.0.6"
[build-dependencies]
@@ -31,3 +31,27 @@ windows_exe_info = "0.4"
[[bin]]
name = "iced-builder"
path = "src/main.rs"
+
+[lints.rust]
+missing_debug_implementations = "deny"
+# missing_docs = "deny"
+unsafe_code = "deny"
+unused_results = "deny"
+
+[lints.clippy]
+type-complexity = "allow"
+semicolon_if_nothing_returned = "deny"
+trivially-copy-pass-by-ref = "deny"
+default_trait_access = "deny"
+match-wildcard-for-single-variants = "deny"
+redundant-closure-for-method-calls = "deny"
+filter_map_next = "deny"
+manual_let_else = "deny"
+unused_async = "deny"
+from_over_into = "deny"
+needless_borrow = "deny"
+new_without_default = "deny"
+useless_conversion = "deny"
+
+[lints.rustdoc]
+broken_intra_doc_links = "forbid"
diff --git a/iced_builder/src/types/rendered_element.rs b/iced_builder/src/types/rendered_element.rs
index dd7e1b2..3bb3626 100755
--- a/iced_builder/src/types/rendered_element.rs
+++ b/iced_builder/src/types/rendered_element.rs
@@ -1,7 +1,7 @@
+use blob_uuid::random_blob;
use iced::advanced::widget::Id;
use iced::{widget, Element, Length};
use serde::{Deserialize, Serialize};
-use unique_id::{string::StringGenerator, Generator};
use crate::{types::Message, Result};
use std::collections::BTreeMap;
@@ -18,9 +18,8 @@ pub struct RenderedElement {
impl RenderedElement {
fn new(name: ElementName) -> Self {
- let gen = StringGenerator::default();
Self {
- id: gen.next_id(),
+ id: random_blob(),
child_elements: None,
name,
options: BTreeMap::new(),
@@ -28,9 +27,8 @@ impl RenderedElement {
}
fn with(name: ElementName, child_elements: Vec<RenderedElement>) -> Self {
- let gen = StringGenerator::default();
Self {
- id: gen.next_id(),
+ id: random_blob(),
child_elements: Some(child_elements),
name,
options: BTreeMap::new(),
@@ -95,7 +93,7 @@ impl RenderedElement {
pub fn remove(&mut self, element: &RenderedElement) {
if let Some(child_elements) = self.child_elements.as_mut() {
if let Some(index) = child_elements.iter().position(|x| x == element) {
- child_elements.remove(index);
+ let _ = child_elements.remove(index);
}
}
}
@@ -157,16 +155,17 @@ impl RenderedElement {
fn preset_options(mut self, options: Vec<&str>) -> Self {
for opt in options {
- self.options.insert(opt.to_owned(), None);
+ let _ = self.options.insert(opt.to_owned(), None);
}
self
}
- pub fn option<'a>(&mut self, option: &'a str, value: &'a str) -> Self {
- self.options
+ pub fn option<'a>(mut self, option: &'a str, value: &'a str) -> Self {
+ let _ = self
+ .options
.entry(option.to_owned())
.and_modify(|opt| *opt = Some(value.to_owned()));
- self.clone()
+ self
}
pub fn as_element<'a>(self) -> Element<'a, Message> {