Skip to content

Commit

Permalink
update various dependencies
Browse files Browse the repository at this point in the history
- update term_grid from v0.1 to v0.2 (small code changes)
- update terminal_size from v0.1 to v0.3 (no code changes)
- update lscolors from v0.15 to v0.16 (no code changes)
- update serde_yaml from v0.8 to v0.9 (no code changes)

The term_grid update required small changes to the use of
`term_grid::Cell` because with v0.2, it is possible to specify the
alignment within the cell. Adding `Alignment::Left` should preserve
the current behaviour.
  • Loading branch information
decathorpe committed Feb 5, 2024
1 parent ba3666a commit 8207fa2
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 42 deletions.
120 changes: 85 additions & 35 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ crossterm = { version = "0.27.0", features = ["serde"] }
dirs = "4"
libc = "0.2.*"
human-sort = "0.2.2"
term_grid = "0.1.*"
terminal_size = "0.1.*"
term_grid = "0.2"
terminal_size = "0.3"
thiserror = "1.0"
sys-locale = "0.3"
once_cell = "1.17.1"
chrono = { version = "0.4.*", features = ["unstable-locales"] }
chrono-humanize = "0.2"
unicode-width = "0.1.*"
lscolors = "0.15.0"
lscolors = "0.16.0"
wild = "2.0"
globset = "0.4.*"
xdg = "2.1"
yaml-rust = "0.4.*"
serde = { version = "1.0", features = ["derive"] }
serde_yaml = "0.8"
serde_yaml = "0.9"
url = "2.1"
vsort = "0.2"

Expand Down
5 changes: 4 additions & 1 deletion src/display.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::icon::Icons;
use crate::meta::name::DisplayOption;
use crate::meta::{FileType, Meta};
use std::collections::HashMap;
use term_grid::{Cell, Direction, Filling, Grid, GridOptions};
use term_grid::{Alignment, Cell, Direction, Filling, Grid, GridOptions};
use terminal_size::terminal_size;
use unicode_width::UnicodeWidthStr;

Expand Down Expand Up @@ -130,6 +130,7 @@ fn inner_display_grid(
cells.push(Cell {
width: get_visible_width(&block, flags.hyperlink == HyperlinkOption::Always),
contents: block,
alignment: Alignment::Left,
});
}
}
Expand Down Expand Up @@ -216,6 +217,7 @@ fn add_header(flags: &Flags, cells: &[Cell], grid: &mut Grid) {
grid.add(Cell {
width: widths[idx],
contents: underlined_header,
alignment: Alignment::Left,
});
}
}
Expand Down Expand Up @@ -259,6 +261,7 @@ fn inner_display_tree(
cells.push(Cell {
width: get_visible_width(&block, flags.hyperlink == HyperlinkOption::Always),
contents: block,
alignment: Alignment::Left,
});
}

Expand Down
1 change: 0 additions & 1 deletion src/flags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ pub use display::Display;
pub use header::Header;
pub use hyperlink::HyperlinkOption;
pub use icons::IconOption;
pub use icons::IconSeparator;
pub use icons::IconTheme;
pub use icons::Icons;
pub use ignore_globs::IgnoreGlobs;
Expand Down
1 change: 0 additions & 1 deletion src/meta/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ pub use self::owner::Owner;
pub use self::permissions::Permissions;
pub use self::size::Size;
pub use self::symlink::SymLink;
pub use crate::icon::Icons;

use crate::flags::{Display, Flags, Layout, PermissionFlag};
use crate::{print_error, ExitCode};
Expand Down

0 comments on commit 8207fa2

Please sign in to comment.