Move everything into workspace

unshell-gui/Cargo.toml

@@ -10,12 +10,22 @@ rust-version = "1.88"
 [lib]
 crate-type = ["cdylib"]
 
-# [package.metadata.docs.rs]
-# all-features = true
-# targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
+[package.metadata.docs.rs]
+all-features = true
+targets = [
+    # "x86_64-unknown-linux-gnu",
+    "wasm32-unknown-unknown"
+]
 
 [dependencies]
-unshell-lib = {path="../unshell-lib"}
+unshell = {path="../"}
+
+# log = "0.4.27"
+chrono = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+
+reqwest = {version = "0.12.26", features=["json"]}
 
 # Stuff for app functionality
 egui = "0.33.0"
@@ -30,21 +40,13 @@ eframe = { version = "0.33.0", default-features = false, features = [
 egui_extras = "0.33.2"
 egui_tiles = "0.14.0"
 egui-async = "0.2.6"
-log = "0.4.27"
-chrono = "0.4.42"
 
-# You only need serde if you want app persistence:
-serde = { version = "1.0.219", features = ["derive"] }
-serde_json = "1.0.145"
 
 # Web Stuff
 wasm-bindgen-futures = "0.4.50"
 wasm-bindgen = "0.2.106"
 web-sys = {version = "0.3.70", features = ['Headers', 'Request', 'RequestInit', 'RequestMode', 'Response', 'Window']}
 
-reqwest = {version = "0.12.26", features=["json"]}
-# tokio = {version = "1.48.0", features = ["full"]}
-
 [profile.release]
 opt-level = 2 # fast and small wasm
 # lto = true
@@ -63,212 +65,3 @@ opt-level = 2
 # If you fork https://github.com/emilk/egui you can test with:
 # egui = { path = "../egui/crates/egui" }
 # eframe = { path = "../egui/crates/eframe" }
-
-
-# ----------------------------------------------------------------------------------------
-# Lints:
-
-[lints]
-workspace = true
-
-[workspace.lints.rust]
-unsafe_code = "deny"
-
-elided_lifetimes_in_paths = "warn"
-future_incompatible = { level = "warn", priority = -1 }
-nonstandard_style = { level = "warn", priority = -1 }
-rust_2018_idioms = { level = "warn", priority = -1 }
-rust_2021_prelude_collisions = "warn"
-semicolon_in_expressions_from_macros = "warn"
-trivial_numeric_casts = "warn"
-unsafe_op_in_unsafe_fn = "warn"                         # `unsafe_op_in_unsafe_fn` may become the default in future Rust versions: https://github.com/rust-lang/rust/issues/71668
-unused_extern_crates = "warn"
-unused_import_braces = "warn"
-unused_lifetimes = "warn"
-
-trivial_casts = "allow"
-unused_qualifications = "allow"
-
-
-[workspace.lints.rustdoc]
-all = "warn"
-missing_crate_level_docs = "warn"
-
-
-[workspace.lints.clippy]
-allow_attributes = "warn"
-as_ptr_cast_mut = "warn"
-await_holding_lock = "warn"
-bool_to_int_with_if = "warn"
-branches_sharing_code = "warn"
-char_lit_as_u8 = "warn"
-checked_conversions = "warn"
-clear_with_drain = "warn"
-cloned_instead_of_copied = "warn"
-dbg_macro = "warn"
-debug_assert_with_mut_call = "warn"
-default_union_representation = "warn"
-derive_partial_eq_without_eq = "warn"
-disallowed_macros = "warn"                   # See clippy.toml
-disallowed_methods = "warn"                  # See clippy.toml
-disallowed_names = "warn"                    # See clippy.toml
-disallowed_script_idents = "warn"            # See clippy.toml
-disallowed_types = "warn"                    # See clippy.toml
-doc_comment_double_space_linebreaks = "warn"
-doc_link_with_quotes = "warn"
-doc_markdown = "warn"
-elidable_lifetime_names = "warn"
-empty_enum = "warn"
-empty_enum_variants_with_brackets = "warn"
-empty_line_after_outer_attr = "warn"
-enum_glob_use = "warn"
-equatable_if_let = "warn"
-exit = "warn"
-expl_impl_clone_on_copy = "warn"
-explicit_deref_methods = "warn"
-explicit_into_iter_loop = "warn"
-explicit_iter_loop = "warn"
-fallible_impl_from = "warn"
-filter_map_next = "warn"
-flat_map_option = "warn"
-float_cmp_const = "warn"
-fn_params_excessive_bools = "warn"
-fn_to_numeric_cast_any = "warn"
-from_iter_instead_of_collect = "warn"
-get_unwrap = "warn"
-if_let_mutex = "warn"
-ignore_without_reason = "warn"
-implicit_clone = "warn"
-implied_bounds_in_impls = "warn"
-imprecise_flops = "warn"
-inconsistent_struct_constructor = "warn"
-index_refutable_slice = "warn"
-indexing_slicing = "warn"
-inefficient_to_string = "warn"
-infinite_loop = "warn"
-into_iter_without_iter = "warn"
-invalid_upcast_comparisons = "warn"
-iter_filter_is_ok = "warn"
-iter_filter_is_some = "warn"
-iter_not_returning_iterator = "warn"
-iter_on_empty_collections = "warn"
-iter_on_single_items = "warn"
-iter_over_hash_type = "warn"
-iter_without_into_iter = "warn"
-large_digit_groups = "warn"
-large_include_file = "warn"
-large_stack_arrays = "warn"
-large_stack_frames = "warn"
-large_types_passed_by_value = "warn"
-let_underscore_must_use = "warn"
-let_underscore_untyped = "warn"
-let_unit_value = "warn"
-linkedlist = "warn"
-literal_string_with_formatting_args = "warn"
-lossy_float_literal = "warn"
-macro_use_imports = "warn"
-manual_assert = "warn"
-manual_clamp = "warn"
-manual_instant_elapsed = "warn"
-manual_is_power_of_two = "warn"
-manual_is_variant_and = "warn"
-manual_let_else = "warn"
-manual_midpoint = "warn"
-manual_ok_or = "warn"
-manual_string_new = "warn"
-map_err_ignore = "warn"
-map_flatten = "warn"
-match_bool = "warn"
-match_same_arms = "warn"
-match_wild_err_arm = "warn"
-match_wildcard_for_single_variants = "warn"
-mem_forget = "warn"
-mismatching_type_param_order = "warn"
-missing_assert_message = "warn"
-missing_enforced_import_renames = "warn"
-missing_errors_doc = "warn"
-missing_safety_doc = "warn"
-mixed_attributes_style = "warn"
-mut_mut = "warn"
-mutex_integer = "warn"
-needless_borrow = "warn"
-needless_continue = "warn"
-needless_for_each = "warn"
-needless_pass_by_ref_mut = "warn"
-needless_pass_by_value = "warn"
-negative_feature_names = "warn"
-non_std_lazy_statics = "warn"
-non_zero_suggestions = "warn"
-nonstandard_macro_braces = "warn"
-option_as_ref_cloned = "warn"
-option_option = "warn"
-path_buf_push_overwrite = "warn"
-pathbuf_init_then_push = "warn"
-precedence_bits = "warn"
-print_stderr = "warn"
-print_stdout = "warn"
-ptr_as_ptr = "warn"
-ptr_cast_constness = "warn"
-pub_underscore_fields = "warn"
-pub_without_shorthand = "warn"
-rc_mutex = "warn"
-readonly_write_lock = "warn"
-redundant_type_annotations = "warn"
-ref_as_ptr = "warn"
-ref_option_ref = "warn"
-ref_patterns = "warn"
-rest_pat_in_fully_bound_structs = "warn"
-return_and_then = "warn"
-same_functions_in_if_condition = "warn"
-semicolon_if_nothing_returned = "warn"
-set_contains_or_insert = "warn"
-should_panic_without_expect = "warn"
-single_char_pattern = "warn"
-single_match_else = "warn"
-single_option_map = "warn"
-str_split_at_newline = "warn"
-str_to_string = "warn"
-string_add = "warn"
-string_add_assign = "warn"
-string_lit_as_bytes = "warn"
-string_lit_chars_any = "warn"
-string_to_string = "warn"
-suspicious_command_arg_space = "warn"
-suspicious_xor_used_as_pow = "warn"
-todo = "warn"
-too_long_first_doc_paragraph = "warn"
-too_many_lines = "warn"
-trailing_empty_array = "warn"
-trait_duplication_in_bounds = "warn"
-transmute_ptr_to_ptr = "warn"
-tuple_array_conversions = "warn"
-unchecked_duration_subtraction = "warn"
-undocumented_unsafe_blocks = "warn"
-unimplemented = "warn"
-uninhabited_references = "warn"
-uninlined_format_args = "warn"
-unnecessary_box_returns = "warn"
-unnecessary_debug_formatting = "warn"
-unnecessary_literal_bound = "warn"
-unnecessary_safety_comment = "warn"
-unnecessary_safety_doc = "warn"
-unnecessary_self_imports = "warn"
-unnecessary_semicolon = "warn"
-unnecessary_struct_initialization = "warn"
-unnecessary_wraps = "warn"
-unnested_or_patterns = "warn"
-unused_peekable = "warn"
-unused_rounding = "warn"
-unused_self = "warn"
-unused_trait_names = "warn"
-unwrap_used = "warn"
-use_self = "warn"
-useless_let_if_seq = "warn"
-useless_transmute = "warn"
-verbose_file_reads = "warn"
-wildcard_dependencies = "warn"
-wildcard_imports = "warn"
-zero_sized_map_values = "warn"
-
-manual_range_contains = "allow" # this is better on 'allow'
-map_unwrap_or = "allow"         # this is better on 'allow'

unshell-gui/src/auth/mod.rs

@@ -4,7 +4,7 @@ use serde_json::json;
 use std::sync::Arc;
 use wasm_bindgen::prelude::Closure;
 
-use unshell_lib::Result;
+use unshell::Result;
 
 #[derive(serde::Deserialize, serde::Serialize)]
 pub struct Auth {

unshell-gui/src/interface/interface.rs

@@ -1,7 +1,9 @@
 use egui::{Color32, TextEdit};
-use unshell_lib::config::{ConfigStructField, InterfaceData, InterfaceStruct, config_struct};
+use unshell::config::{ConfigStructField, InterfaceData, InterfaceStruct, config_struct};
 
-struct ConfigInterface(Config)
+use crate::config::Config;
+
+struct ConfigInterface(Config);
 
 pub fn render(
     ui: &mut egui::Ui,

unshell-gui/src/interface/mod.rs

@@ -5,8 +5,7 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use log::debug;
-use unshell_lib::{Result, config::TreeMessage};
+use unshell::{Result, config::TreeMessage};
 
 use crate::auth::Auth;
 
@@ -106,7 +105,7 @@ impl InterfaceWindow {
                                 &format!("/api/interface{}", self.path.display()),
                                 &TreeMessage::State(interface_data.clone()),
                                 move |response: Result<TreeMessage>| {
-                                    debug!("{response:?}");
+                                    // debug!("{response:?}");
                                 },
                             )
                             .unwrap();

unshell-gui/src/lib.rs

@@ -1,7 +1,7 @@
 #![warn(clippy::all, rust_2018_idioms)]
 #![macro_use]
-#[allow(unused_extern_crates)]
-extern crate log;
+// #[allow(unused_extern_crates)]
+// extern crate log;
 
 pub mod app;
 mod auth;