nvgn/hexyl
1
0 Fork 0
mirror of https://github.com/sharkdp/hexyl.git synced 2026-10-26 20:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace 'value_of with get_one::<String>`

Browse Source
This commit is contained in:
Sharif Haason authored and David Peter committed 2022-11-18 19:22:24 +01:00
1 parent 8a52261a50
commit 3d0bc3d0eb
1 file changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/hexyl.rs
+9 -9
View File
@@ -181,13 +181,13 @@ fn run() -> Result<(), AnyhowError> {
let stdin = io::stdin(); let stdin = io::stdin();
let mut reader = match matches.value_of("FILE") { let mut reader = match matches.get_one::<String>("FILE") {
Some(filename) => Input::File(File::open(filename)?), Some(filename) => Input::File(File::open(filename)?),
None => Input::Stdin(stdin.lock()), None => Input::Stdin(stdin.lock()),
}; };
let block_size = matches let block_size = matches
.value_of("block_size") .get_one::<String>("block_size")
.map(|bs| { .map(|bs| {
if let Some(hex_number) = try_parse_as_hex_number(bs) { if let Some(hex_number) = try_parse_as_hex_number(bs) {
return hex_number.map_err(|e| anyhow!(e)).and_then(|x| { return hex_number.map_err(|e| anyhow!(e)).and_then(|x| {
@@ -212,7 +212,7 @@ fn run() -> Result<(), AnyhowError> {
.unwrap_or_else(|| PositiveI64::new(DEFAULT_BLOCK_SIZE).unwrap()); .unwrap_or_else(|| PositiveI64::new(DEFAULT_BLOCK_SIZE).unwrap());
let skip_arg = matches let skip_arg = matches
.value_of("skip") .get_one::<String>("skip")
.map(|s| { .map(|s| {
parse_byte_offset(s, block_size).context(anyhow!( parse_byte_offset(s, block_size).context(anyhow!(
"failed to parse `--skip` arg {:?} as byte count", "failed to parse `--skip` arg {:?} as byte count",
@@ -248,9 +248,9 @@ fn run() -> Result<(), AnyhowError> {
}; };
let mut reader = if let Some(length) = matches let mut reader = if let Some(length) = matches
.value_of("length") .get_one::<String>("length")
.or_else(|| matches.value_of("bytes")) .or_else(|| matches.get_one::<String>("bytes"))
.or_else(|| matches.value_of("count")) .or_else(|| matches.get_one::<String>("count"))
.map(|s| { .map(|s| {
parse_byte_count(s).context(anyhow!( parse_byte_count(s).context(anyhow!(
"failed to parse `--length` arg {:?} as byte count", "failed to parse `--length` arg {:?} as byte count",
@@ -283,7 +283,7 @@ fn run() -> Result<(), AnyhowError> {
let show_position_panel = !matches.is_present("no_position") && !matches.is_present("plain"); let show_position_panel = !matches.is_present("no_position") && !matches.is_present("plain");
let display_offset: u64 = matches let display_offset: u64 = matches
.value_of("display_offset") .get_one::<String>("display_offset")
.map(|s| { .map(|s| {
parse_byte_count(s).context(anyhow!( parse_byte_count(s).context(anyhow!(
"failed to parse `--display-offset` arg {:?} as byte count", "failed to parse `--display-offset` arg {:?} as byte count",
@@ -306,7 +306,7 @@ fn run() -> Result<(), AnyhowError> {
let panels = if matches.value_of("panels") == Some("auto") { let panels = if matches.value_of("panels") == Some("auto") {
max_panels_fn(terminal_size().ok_or_else(|| anyhow!("not a TTY"))?.0 .0 as u64) max_panels_fn(terminal_size().ok_or_else(|| anyhow!("not a TTY"))?.0 .0 as u64)
} else if let Some(panels) = matches } else if let Some(panels) = matches
.value_of("panels") .get_one::<String>("panels")
.map(|s| { .map(|s| {
s.parse::<NonZeroU64>().map(u64::from).context(anyhow!( s.parse::<NonZeroU64>().map(u64::from).context(anyhow!(
"failed to parse `--panels` arg {:?} as unsigned nonzero integer", "failed to parse `--panels` arg {:?} as unsigned nonzero integer",
@@ -317,7 +317,7 @@ fn run() -> Result<(), AnyhowError> {
{ {
panels panels
} else if let Some(terminal_width) = matches } else if let Some(terminal_width) = matches
.value_of("terminal_width") .get_one::<String>("terminal_width")
.map(|s| { .map(|s| {
s.parse::<NonZeroU64>().map(u64::from).context(anyhow!( s.parse::<NonZeroU64>().map(u64::from).context(anyhow!(
"failed to parse `--terminal-width` arg {:?} as unsigned nonzero integer", "failed to parse `--terminal-width` arg {:?} as unsigned nonzero integer",