Mirrors/bat
2
0
Fork 0
mirror of https://github.com/sharkdp/bat synced 2024-11-16 00:47:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

pager.rs: Some comment fixups

Browse source
This commit is contained in:
Martin Nordholts 2021-01-10 13:25:18 +01:00
parent dfe7a60140
commit dd6f57e107
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/pager.rs
View file

@ -20,7 +20,7 @@ pub(crate) enum PagerSource {
/// We know about some pagers, for example 'less'. This is a list of all pagers we know about /// We know about some pagers, for example 'less'. This is a list of all pagers we know about
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
pub(crate) enum PagerKind { pub(crate) enum PagerKind {
/// The pager is ourselves /// bat
Bat, Bat,
/// less /// less
@ -62,16 +62,16 @@ impl PagerKind {
/// A pager such as 'less', and from where we got it. /// A pager such as 'less', and from where we got it.
#[derive(Debug)] #[derive(Debug)]
pub(crate) struct Pager { pub(crate) struct Pager {
// The pager binary /// The pager binary
pub bin: String, pub bin: String,
// The pager binary arguments (that we might tweak) /// The pager binary arguments (that we might tweak)
pub args: Vec<String>, pub args: Vec<String>,
// What pager this is /// What pager this is
pub kind: PagerKind, pub kind: PagerKind,
// From where this pager comes /// From where this pager comes
pub source: PagerSource, pub source: PagerSource,
} }
@ -103,7 +103,7 @@ pub(crate) fn get_pager(config_pager: Option<&str>) -> Result<Option<Pager>, Par
Some((bin, args)) => { Some((bin, args)) => {
let kind = PagerKind::from_bin(bin); let kind = PagerKind::from_bin(bin);
// 'more' and 'most' does not supports colors; automatically use 'less' instead // 'more' and 'most' do not supports colors; automatically use 'less' instead
// if the problematic pager came from the generic PAGER env var // if the problematic pager came from the generic PAGER env var
let no_color_support = kind == PagerKind::More || kind == PagerKind::Most; let no_color_support = kind == PagerKind::More || kind == PagerKind::Most;
let use_less_instead = no_color_support && source == PagerSource::EnvVarPager; let use_less_instead = no_color_support && source == PagerSource::EnvVarPager;

2
tests/integration_tests.rs
View file

@ -91,7 +91,7 @@ fn restore_path(original_path: String) {
fn with_mocked_versions_of_more_and_most_in_path(actual_test: fn()) { fn with_mocked_versions_of_more_and_most_in_path(actual_test: fn()) {
let original_path = prepend_dir_to_path_env_var(get_mocked_pagers_dir()); let original_path = prepend_dir_to_path_env_var(get_mocked_pagers_dir());
// Make sure our own variants of 'more' and 'most' is used // Make sure our own variants of 'more' and 'most' are used
Command::new(mocked_pager("more")) Command::new(mocked_pager("more"))
.assert() .assert()
.success() .success()