Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace ansi_term with ansiterm + upgrades #28

Merged
merged 3 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ jobs:
run: cargo clippy
- name: tests
run: make tests
- name: "Check (termion)"
uses: actions-rs/cargo@v1
with:
command: check
args: --features=render-tui-termion --all --bins --tests --examples
- name: "Check (crossterm)"
uses: actions-rs/cargo@v1
with:
Expand Down
19 changes: 6 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ name = "dashboard"
path = "examples/dashboard.rs"
required-features = ["render-tui", "render-tui-crossterm", "render-line", "render-line-crossterm", "signal-hook", "render-line-autoconfigure", "progress-tree"]

[[example]]
name = "dashboard-termion"
path = "examples/dashboard.rs"
required-features = ["render-tui", "render-tui-termion", "render-line", "render-line-termion", "progress-tree"]

[[example]]
name = "units"
path = "examples/units.rs"
Expand All @@ -45,7 +40,6 @@ progress-log = ["log"]
unit-bytes = ["bytesize"]
unit-human = ["human_format"]
unit-duration = ["humantime"]
render-tui-termion = ["crosstermion/tui-react-termion"]
render-tui-crossterm = ["crosstermion/tui-react-crossterm", "crosstermion/input-async-crossterm"]
render-tui = ["tui",
"unicode-segmentation",
Expand All @@ -58,7 +52,6 @@ render-tui = ["tui",
"humantime"]
render-line = ["crosstermion/color", "humantime", "unicode-width"]
render-line-crossterm = ["crosstermion/crossterm"]
render-line-termion = ["crosstermion/termion"]
render-line-autoconfigure = ["is-terminal"]

local-time = ["time"]
Expand All @@ -72,15 +65,15 @@ parking_lot = { version = "0.12.1", optional = true, default-features = false }
log = { version = "0.4.8", optional = true }

# render-tui
tui = { package = "ratatui", version = "0.20.1", optional = true, default-features = false }
tui-react = { version = "0.20.0", optional = true }
tui = { package = "ratatui", version = "0.24.0", optional = true, default-features = false }
tui-react = { version = "0.21.0", optional = true }
futures-core = { version = "0.3.4", optional = true, default-features = false }
futures-lite = { version = "1.5.0", optional = true }
futures-lite = { version = "2.1.0", optional = true }
humantime = { version = "2.1.0", optional = true }
unicode-segmentation = { version = "1.6.0", optional = true }
unicode-width = { version = "0.1.7", optional = true }
crosstermion = { version = "0.11.0", optional = true, default-features = false }
async-io = { version = "1.0.0", optional = true }
crosstermion = { version = "0.12.1", optional = true, default-features = false }
async-io = { version = "2.2.1", optional = true }

# localtime support for render-tui
time = { version = "0.3.2", optional = true, features = ["std", "local-offset", "formatting"], default-features = false }
Expand Down Expand Up @@ -108,7 +101,7 @@ is-terminal = "0.4.9"
blocking = "1.0.0"
once_cell = "1.4.0"
async-executor = "1.1.0"
async-io = "1.1.0"
async-io = "2.2.1"

[[bench]]
name = "usage"
Expand Down
5 changes: 0 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@ check: ## build features in commmon combination to be sure it all stays together
cargo check --no-default-features
cargo check --features progress-tree,progress-tree-hp-hashmap
cargo check --features render-tui,render-tui-crossterm
cargo check --features render-tui,render-tui-termion
cargo check --features render-line,render-line-termion
cargo check --features render-line,render-line-termion,render-line-autoconfigure
cargo check --features render-line,render-line-termion,render-line-autoconfigure,signal-hook
cargo check --features render-line,render-line-crossterm
cargo check --features render-line,render-line-termion,render-tui,render-tui-termion --example dashboard-termion
cargo check --features render-line,render-line-crossterm,render-tui,render-tui-crossterm,signal-hook,render-line-autoconfigure --example dashboard
cargo check --features unit-bytes,unit-duration,unit-human,render-tui,render-tui-crossterm,render-line,render-line-crossterm,signal-hook --example units
cargo check
Expand Down
2 changes: 1 addition & 1 deletion src/messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ impl MessageRingBuffer {
let cursor_ofs: isize = self.cursor as isize - cursor as isize;
match cursor_ofs {
// there was some capacity left without wrapping around
c if c == 0 => {
0 => {
out.extend_from_slice(&self.buf[self.buf.len() - new_elements_below_cap..]);
}
// cursor advanced
Expand Down
Loading