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

rollback term grid to 0.1 and release v1.1.2 #1019

Merged
merged 2 commits into from
Mar 25, 2024
Merged

rollback term grid to 0.1 and release v1.1.2 #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1de5341
:arrow_down: rollback the term grid to 0.1
zwpaper Mar 25, 2024
62e93a9
:tada: release v1.1.2
zwpaper Mar 25, 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 Cargo.lock
View file
Open in desktop

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

6 changes: 4 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 @@ license = "Apache-2.0"
name = "lsd"
readme = "./README.md"
repository = "https://github.com/lsd-rs/lsd"
version = "1.1.1"
version = "1.1.2"
edition = "2021"
rust-version = "1.74"

Expand All @@ -26,7 +26,9 @@ crossterm = { version = "0.27.0", features = ["serde"] }
dirs = "5"
libc = "0.2.*"
human-sort = "0.2.2"
term_grid = "0.2"
# should stick to 0.1, the 0.2 needs some adaptation
# check https://github.com/lsd-rs/lsd/issues/1014
term_grid = "0.1"
terminal_size = "0.3"
thiserror = "1.0"
sys-locale = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
**IMPORTANT**: This is the development documents,
please check the docs in [Tags](https://github.com/lsd-rs/lsd/tags) if you installed from the released ones.

The current newest release is: [v1.1.1](https://github.com/lsd-rs/lsd/tree/v1.1.1)
The current newest release is: [v1.1.2](https://github.com/lsd-rs/lsd/tree/v1.1.2)

---

Expand Down
2 changes: 1 addition & 1 deletion lsd.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: lsd
Version: 1.1.1
Version: 1.1.2
Release: 1%{?dist}
Summary: The next gen ls command

Expand Down
5 changes: 1 addition & 4 deletions src/display.rs
View file
Open in desktop
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::{Alignment, Cell, Direction, Filling, Grid, GridOptions};
use term_grid::{Cell, Direction, Filling, Grid, GridOptions};
use terminal_size::terminal_size;
use unicode_width::UnicodeWidthStr;

Expand Down Expand Up @@ -130,7 +130,6 @@ 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 @@ -217,7 +216,6 @@ 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 @@ -261,7 +259,6 @@ fn inner_display_tree(
cells.push(Cell {
width: get_visible_width(&block, flags.hyperlink == HyperlinkOption::Always),
contents: block,
alignment: Alignment::Left,
});
}

Expand Down
Loading