Merge branch 'main' into 551-sandbox-dice-strategy

LittleTealeaf · Jul 29, 2024 · 8cd8901 · 8cd8901
2 parents 4d75516 + 4917a1a
commit 8cd8901
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,11 +19,10 @@ dead_code = "allow"
 missing_docs = "warn"
 
 [workspace.lints.clippy]
-pedantic = "warn"
-complexity = "warn"
-nursery = "warn"
+pedantic = {level = "warn", priority = -1}
+complexity = {level = "warn", priority = -1}
+nursery = {level = "warn", priority = -1}
 
-absolute_paths = "warn"
 assertions_on_result_states = "warn"
 clone_on_ref_ptr = "warn"
 dbg_macro = "warn"
@@ -49,6 +48,7 @@ unneeded_field_pattern = "warn"
 unwrap_in_result = "warn"
 wildcard_dependencies = "warn"
 redundant_feature_names = "warn"
+renamed_function_params = "warn"
 
 too_many_lines = { level = "allow", priority = 1 }
 module_name_repetitions = { level = "allow", priority = 1 }

diff --git a/builder/Cargo.toml b/builder/Cargo.toml
@@ -24,7 +24,7 @@ ron = "0.8.1"
 log = "0.4.22"
 im = { version = "15.1.0", features = ["serde"] }
 rust_decimal = "1.35.0"
-rust_decimal_macros = "1.34.2"
+rust_decimal_macros = "1.35.0"
 
 [dev-dependencies]
 builder = { path = ".", features = ["debug"] }

diff --git a/editor/Cargo.toml b/editor/Cargo.toml
@@ -21,7 +21,7 @@ ui = { path = "../ui/" }
 roc = "0.0.0"
 serde = { version = "1.0.204" }
 iced = { version = "0.12.1", features = ["tokio"] }
-tokio = { version = "1.38.0", features = ["fs", "io-util", "macros", "rt"] }
+tokio = { version = "1.39.2", features = ["fs", "io-util", "macros", "rt"] }
 ron = { version = "0.8.1" }
 iced_aw = { version = "0.9.3", default-features = false, features = [
 	"tabs",