mirror of
https://github.com/gitui-org/gitui.git
synced 2026-10-12 02:14:16 +00:00
Update gix to 0.84 (#2967)
* Update gix to 0.84 * Update gix-path to 0.12.1 in git2-hooks * Add sha1-checked to deny.toml * Run tombi format * Regenerate Cargo.lock based on upstream * Fix nightly clippy issue
This commit is contained in:
Generated
+295
-176
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -19,7 +19,7 @@ easy-cast = "0.5"
|
||||
fuzzy-matcher = "0.3"
|
||||
git2 = { version = "0.21", features = ["https"] }
|
||||
git2-hooks = { path = "../git2-hooks", version = "0.7" }
|
||||
gix = { version = "0.78.0", default-features = false, features = ["mailmap", "max-performance", "revision", "status"] }
|
||||
gix = { version = "0.84.0", default-features = false, features = ["mailmap", "max-performance", "revision", "sha1", "sha256", "status"] }
|
||||
log = "0.4"
|
||||
# git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}
|
||||
# git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="fc13dcc", features = ["vendored-openssl"]}
|
||||
|
||||
@@ -57,4 +57,7 @@ skip-tree = [
|
||||
# * `gix-index v0.42.1`
|
||||
# * `tempfile v3.23.0`
|
||||
{ name = "rustix" },
|
||||
# 2026-06-18 `gix-hash` still needs `sha1-checked` 0.10 while `ssh-key` 0.7
|
||||
# already needs `sha1-checked` 0.11.
|
||||
{ name = "sha1-checked" },
|
||||
]
|
||||
|
||||
@@ -14,7 +14,7 @@ keywords = ["git"]
|
||||
|
||||
[dependencies]
|
||||
git2 = "0.21"
|
||||
gix-path = "0.11"
|
||||
gix-path = "0.12"
|
||||
log = "0.4"
|
||||
shellexpand = "3.1"
|
||||
thiserror = "2.0"
|
||||
|
||||
@@ -108,7 +108,7 @@ macro_rules! any_popup_visible {
|
||||
#[macro_export]
|
||||
macro_rules! draw_popups {
|
||||
($self:ident, [$($element:ident),+]) => {
|
||||
fn draw_popups(& $self, mut f: &mut Frame) -> Result<()>{
|
||||
fn draw_popups(& $self, f: &mut Frame) -> Result<()>{
|
||||
//TODO: move the layout part out and feed it into `draw_popups`
|
||||
let size = Layout::default()
|
||||
.direction(Direction::Vertical)
|
||||
@@ -121,7 +121,7 @@ macro_rules! draw_popups {
|
||||
)
|
||||
.split(f.area())[0];
|
||||
|
||||
($($self.$element.draw(&mut f, size)?) , +);
|
||||
($($self.$element.draw(&mut *f, size)?) , +);
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user