From 3637346c1ab5826e069664772be95e46715ae529 Mon Sep 17 00:00:00 2001 From: Funnisimo Date: Tue, 23 Aug 2022 10:01:13 -0500 Subject: [PATCH 1/6] export colors mods separately to aid precise imports --- bracket-color/Cargo.toml | 6 +++--- bracket-color/examples/util/mod.rs | 2 +- bracket-color/src/lib.rs | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bracket-color/Cargo.toml b/bracket-color/Cargo.toml index 3c5122c0..564d5439 100755 --- a/bracket-color/Cargo.toml +++ b/bracket-color/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bracket-color" -version = "0.8.2" +version = "0.8.3" authors = ["Herbert Wolverson "] edition = "2018" publish = true @@ -17,13 +17,13 @@ palette = [ "lazy_static", "parking_lot" ] [dependencies] serde = { version = "~1.0.110", features = ["derive"], optional = true } -crossterm = { version = "~0.24", optional = true } +crossterm = { version = "~0.25", optional = true } lazy_static = { version = "1.4.0", optional = true } parking_lot = { version = "~0.12", optional = true } bevy = { version = "0.8", optional = true } [dev-dependencies] -crossterm = "~0.24" +crossterm = "~0.25" [[example]] name = "colors" diff --git a/bracket-color/examples/util/mod.rs b/bracket-color/examples/util/mod.rs index cafaf439..b620f9ed 100755 --- a/bracket-color/examples/util/mod.rs +++ b/bracket-color/examples/util/mod.rs @@ -2,7 +2,7 @@ use bracket_color::prelude::*; use crossterm::queue; use crossterm::style::{Print, SetForegroundColor}; use std::convert::TryInto; -use std::io::{stdout, Write}; +use std::io::stdout; pub fn print_color(color: RGB, text: &str) { queue!(stdout(), SetForegroundColor(color.try_into().unwrap())).expect("Command Fail"); diff --git a/bracket-color/src/lib.rs b/bracket-color/src/lib.rs index ab9a0908..84721e17 100755 --- a/bracket-color/src/lib.rs +++ b/bracket-color/src/lib.rs @@ -31,20 +31,20 @@ extern crate lazy_static; /// Import color pair support -mod color_pair; +pub mod color_pair; /// Import HSV color support -mod hsv; +pub mod hsv; /// Import Lerp as an iterator -mod lerpit; +pub mod lerpit; /// Import library of named colors -mod named; +pub mod named; /// Import Palette support #[cfg(feature = "palette")] -mod palette; +pub mod palette; /// Import RGB color support -mod rgb; +pub mod rgb; /// Import RGBA color support -mod rgba; +pub mod rgba; /// Exports the color functions/types in the `prelude` namespace. pub mod prelude { From f74a2a81be46803889adebfe7c6a3edad9c8ced9 Mon Sep 17 00:00:00 2001 From: Funnisimo Date: Tue, 23 Aug 2022 10:02:40 -0500 Subject: [PATCH 2/6] use updated bracket-color --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 992aa165..c1bc8267 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ webgpu = [ "bracket-terminal/webgpu" ] [dependencies] bracket-algorithm-traits = { path = "./bracket-algorithm-traits", version = "~0.8.2" } -bracket-color = { path = "./bracket-color", version = "~0.8.2", features = [ "palette" ] } +bracket-color = { path = "./bracket-color", version = "~0.8.3", features = [ "palette" ] } bracket-geometry = { path = "./bracket-geometry", version = "~0.8.2" } bracket-noise = { path = "./bracket-noise", version = "~0.8.2" } bracket-pathfinding = { path = "./bracket-pathfinding", version = "~0.8.2" } From 6ab75811f7194c68b52612087510c3a382ca0f6a Mon Sep 17 00:00:00 2001 From: Funnisimo Date: Wed, 12 Oct 2022 09:12:58 -0500 Subject: [PATCH 3/6] allow low_cpu feature in rltk, bracket_lib --- Cargo.toml | 1 + rltk/Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index c1bc8267..b85989d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,6 +33,7 @@ opengl = [ "bracket-terminal/opengl" ] curses = [ "bracket-terminal/curses" ] crossterm = [ "bracket-terminal/cross_term" ] webgpu = [ "bracket-terminal/webgpu" ] +low_cpu = ["bracket-terminal/low_cpu"] [dependencies] bracket-algorithm-traits = { path = "./bracket-algorithm-traits", version = "~0.8.2" } diff --git a/rltk/Cargo.toml b/rltk/Cargo.toml index b1ec767e..87f98f04 100755 --- a/rltk/Cargo.toml +++ b/rltk/Cargo.toml @@ -22,6 +22,7 @@ opengl = [ "bracket-lib/opengl" ] curses = [ "bracket-lib/curses" ] crossterm = [ "bracket-lib/crossterm" ] webgpu = [ "bracket-lib/webgpu" ] +low_cpu = [ "bracket-lib/low_cpu" ] [dependencies] bracket-lib = { path = "../", version = "~0.8.1", default-features = false } From a24d52df8cddec410896e332931e67e362f6ff9d Mon Sep 17 00:00:00 2001 From: Funnisimo Date: Wed, 12 Oct 2022 09:57:03 -0500 Subject: [PATCH 4/6] allow low_cpu feature --- Cargo.toml | 1 + rltk/Cargo.toml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a8411d89..988e039e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,6 +35,7 @@ opengl = [ "bracket-terminal/opengl" ] curses = [ "bracket-terminal/curses" ] crossterm = [ "bracket-terminal/cross_term" ] webgpu = [ "bracket-terminal/webgpu" ] +low_cpu = ["bracket-terminal/low_cpu"] [dependencies] bracket-algorithm-traits = { path = "./bracket-algorithm-traits", version = "~0.8" } diff --git a/rltk/Cargo.toml b/rltk/Cargo.toml index e453b42f..6ea35920 100755 --- a/rltk/Cargo.toml +++ b/rltk/Cargo.toml @@ -14,15 +14,15 @@ license = "MIT" resolver = "2" # Enables the new Cargo resolution engine [features] -default = ["opengl"] -bevy = ["bracket-lib/bevy"] -specs = ["bracket-lib/specs"] -serde = ["bracket-lib/serde"] -threaded = ["bracket-lib/threaded"] -opengl = ["bracket-lib/opengl"] -curses = ["bracket-lib/curses"] -crossterm = ["bracket-lib/crossterm"] -webgpu = ["bracket-lib/webgpu"] +default = [ "opengl" ] +specs = [ "bracket-lib/specs" ] +serde = [ "bracket-lib/serde" ] +threaded = [ "bracket-lib/threaded" ] +opengl = [ "bracket-lib/opengl" ] +curses = [ "bracket-lib/curses" ] +crossterm = [ "bracket-lib/crossterm" ] +webgpu = [ "bracket-lib/webgpu" ] +low_cpu = [ "bracket-lib/low_cpu" ] [dependencies] bracket-lib = { path = "../", version = "~0.8", default-features = false } From 8bbd71601021cfa399071dcd8a1da7b3ada27386 Mon Sep 17 00:00:00 2001 From: Funnisimo Date: Wed, 12 Oct 2022 10:10:04 -0500 Subject: [PATCH 5/6] formatted with even better toml --- Cargo.toml | 30 +++++++++++++++++++----------- rltk/Cargo.toml | 18 +++++++++--------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 988e039e..8ea821f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,30 +20,38 @@ exclude = [ "bracket-random", "bracket-terminal", "rltk", - "screenshots" + "screenshots", ] resolver = "2" # Enables the new Cargo resolution engine incremental = false # Causing issues with Windows builds [features] -default = [ "opengl" ] +default = ["opengl"] bevy = ["bracket-geometry/bevy"] -specs = [ "bracket-geometry/specs" ] -serde = [ "bracket-color/serde", "bracket-geometry/serde", "bracket-random/serde" ] -threaded = [ "bracket-pathfinding/threaded" ] -opengl = [ "bracket-terminal/opengl" ] -curses = [ "bracket-terminal/curses" ] -crossterm = [ "bracket-terminal/cross_term" ] -webgpu = [ "bracket-terminal/webgpu" ] +specs = ["bracket-geometry/specs"] +serde = [ + "bracket-color/serde", + "bracket-geometry/serde", + "bracket-random/serde", +] +threaded = ["bracket-pathfinding/threaded"] +opengl = ["bracket-terminal/opengl"] +curses = ["bracket-terminal/curses"] +crossterm = ["bracket-terminal/cross_term"] +webgpu = ["bracket-terminal/webgpu"] low_cpu = ["bracket-terminal/low_cpu"] [dependencies] bracket-algorithm-traits = { path = "./bracket-algorithm-traits", version = "~0.8" } -bracket-color = { path = "./bracket-color", version = "~0.8", features = [ "palette" ] } +bracket-color = { path = "./bracket-color", version = "~0.8", features = [ + "palette", +] } bracket-geometry = { path = "./bracket-geometry", version = "~0.8" } bracket-noise = { path = "./bracket-noise", version = "~0.8" } bracket-pathfinding = { path = "./bracket-pathfinding", version = "~0.8" } -bracket-random = { path = "./bracket-random", version = "~0.8", features = [ "parsing" ] } +bracket-random = { path = "./bracket-random", version = "~0.8", features = [ + "parsing", +] } bracket-terminal = { path = "./bracket-terminal", version = "~0.8", default-features = false } [workspace] diff --git a/rltk/Cargo.toml b/rltk/Cargo.toml index 6ea35920..3de71742 100755 --- a/rltk/Cargo.toml +++ b/rltk/Cargo.toml @@ -14,15 +14,15 @@ license = "MIT" resolver = "2" # Enables the new Cargo resolution engine [features] -default = [ "opengl" ] -specs = [ "bracket-lib/specs" ] -serde = [ "bracket-lib/serde" ] -threaded = [ "bracket-lib/threaded" ] -opengl = [ "bracket-lib/opengl" ] -curses = [ "bracket-lib/curses" ] -crossterm = [ "bracket-lib/crossterm" ] -webgpu = [ "bracket-lib/webgpu" ] -low_cpu = [ "bracket-lib/low_cpu" ] +default = ["opengl"] +specs = ["bracket-lib/specs"] +serde = ["bracket-lib/serde"] +threaded = ["bracket-lib/threaded"] +opengl = ["bracket-lib/opengl"] +curses = ["bracket-lib/curses"] +crossterm = ["bracket-lib/crossterm"] +webgpu = ["bracket-lib/webgpu"] +low_cpu = ["bracket-lib/low_cpu"] [dependencies] bracket-lib = { path = "../", version = "~0.8", default-features = false } From 9b8053fb1b97ac7d1a1a1d4eebe98adb701586ad Mon Sep 17 00:00:00 2001 From: Funnisimo Date: Wed, 12 Oct 2022 10:11:34 -0500 Subject: [PATCH 6/6] added bevy back --- rltk/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/rltk/Cargo.toml b/rltk/Cargo.toml index 3de71742..d0f3ac3c 100755 --- a/rltk/Cargo.toml +++ b/rltk/Cargo.toml @@ -15,6 +15,7 @@ resolver = "2" [features] default = ["opengl"] +bevy = ["bracket-lib/bevy"] specs = ["bracket-lib/specs"] serde = ["bracket-lib/serde"] threaded = ["bracket-lib/threaded"]