mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 23:23:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cli: config: use str.parse() to remove "use FromStr"

Browse source
This commit is contained in:
Yuya Nishihara 2024-05-21 22:28:58 +09:00
parent 7b72e04206
commit d38c366a98
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cli/src/commands/config.rs
View file

@ -14,7 +14,6 @@
use std::io::Write; use std::io::Write;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::str::FromStr as _;
use clap::builder::NonEmptyStringValueParser; use clap::builder::NonEmptyStringValueParser;
use itertools::Itertools; use itertools::Itertools;
@ -205,7 +204,7 @@ fn write_config_value_to_file(key: &str, value_str: &str, path: &Path) -> Result
)), )),
} }
})?; })?;
let mut doc = toml_edit::Document::from_str(&config_toml).map_err(|err| { let mut doc: toml_edit::Document = config_toml.parse().map_err(|err| {
user_error_with_message( user_error_with_message(
format!("Failed to parse file {path}", path = path.display()), format!("Failed to parse file {path}", path = path.display()),
err, err,
@ -215,8 +214,8 @@ fn write_config_value_to_file(key: &str, value_str: &str, path: &Path) -> Result
// Apply config value // Apply config value
// Interpret value as string if it can't be parsed as a TOML value. // Interpret value as string if it can't be parsed as a TOML value.
// TODO(#531): Infer types based on schema (w/ --type arg to override). // TODO(#531): Infer types based on schema (w/ --type arg to override).
let item = match toml_edit::Value::from_str(value_str) { let item = match value_str.parse() {
Ok(value) => toml_edit::value(value), Ok(value) => toml_edit::Item::Value(value),
_ => toml_edit::value(value_str), _ => toml_edit::value(value_str),
}; };
let mut target_table = doc.as_table_mut(); let mut target_table = doc.as_table_mut();