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.

Sign up for GitHub

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

Jump to bottom

Update crossterm and ratatui dependencies and bump MSRV to 1.74 #150

Merged
merged 4 commits into from
Oct 1, 2024
Merged

Update crossterm and ratatui dependencies and bump MSRV to 1.74 #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec51f09
fix: update crossterm dependency
covercash2 Sep 21, 2024
0902df2
fix: update ratatui dependency
covercash2 Sep 22, 2024
8b40ec2
update msrv to 1.74
ulyssa Oct 1, 2024
27c430e
fix deprecation warnings
ulyssa Oct 1, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
uses: actions/checkout@v3
with:
submodules: true
- name: Install Rust (1.70 w/ clippy)
uses: dtolnay/rust-toolchain@1.70
- name: Install Rust (1.74 w/ clippy)
uses: dtolnay/rust-toolchain@1.74
with:
components: clippy
- name: Install Rust (nightly w/ rustfmt)
Expand Down
88 changes: 51 additions & 37 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["Ulyssa <git@ulyssa.dev>"]
repository = "https://github.com/ulyssa/modalkit"
license = "Apache-2.0"
edition = "2018"
rust-version = "1.70"
rust-version = "1.74"

[workspace.dependencies.keybindings]
path = "crates/keybindings"
Expand All @@ -20,7 +20,7 @@ version = "0.0.20"

[workspace.dependencies]
bitflags = "2.4.2"
crossterm = "0.27"
crossterm = "0.28.1"
intervaltree = { version = "0.2.6" }
libc = "0.2"
rand = "0.8.4"
Expand Down
2 changes: 1 addition & 1 deletion crates/modalkit-ratatui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ crossterm = { workspace = true }
intervaltree = { workspace = true }
libc = { workspace = true }
modalkit = { workspace = true }
ratatui = { version = "0.26" }
ratatui = { version = "0.28.1" }
regex = { workspace = true }
serde = { version = "^1.0", features = ["derive"] }

Expand Down
2 changes: 1 addition & 1 deletion crates/modalkit-ratatui/examples/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ impl Editor {
}

term.draw(|f| {
let area = f.size();
let area = f.area();

let modestr = bindings.show_mode();
let cursor = bindings.get_cursor_indicator();
Expand Down
2 changes: 1 addition & 1 deletion crates/modalkit-ratatui/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ pub fn render_cursor<T: TerminalCursor>(f: &mut Frame, widget: &T, cursor: Optio
let inner = Rect::new(cx, cy, 1, 1);
f.render_widget(para, inner)
}
f.set_cursor(cx, cy);
f.set_cursor_position((cx, cy));
}
}

Expand Down
Loading