gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'upstream/main' into ci-platforms

Browse Source
This commit is contained in:
Dustin J. Mitchell
2021-06-15 10:13:51 -04:00
parent 2a2aef2b25 9c35b31fbe
commit a709f8a132
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cli/src/lib.rs
View File

@@ -31,8 +31,7 @@ For the public TaskChampion Rust API, see the `taskchampion` crate.
*/ */
use std::os::unix::ffi::OsStringExt; use std::ffi::OsString;
use std::string::FromUtf8Error;
// NOTE: it's important that this 'mod' comes first so that the macros can be used in other modules // NOTE: it's important that this 'mod' comes first so that the macros can be used in other modules
mod macros; mod macros;
@@ -63,8 +62,8 @@ pub fn main() -> Result<(), Error> {
// parse the command line into a vector of &str, failing if // parse the command line into a vector of &str, failing if
// there are invalid utf-8 sequences. // there are invalid utf-8 sequences.
let argv: Vec<String> = std::env::args_os() let argv: Vec<String> = std::env::args_os()
.map(|oss| String::from_utf8(oss.into_vec())) .map(|oss| oss.into_string())
.collect::<Result<_, FromUtf8Error>>() .collect::<Result<_, OsString>>()
.map_err(|_| Error::for_arguments("arguments must be valid utf-8"))?; .map_err(|_| Error::for_arguments("arguments must be valid utf-8"))?;
let argv: Vec<&str> = argv.iter().map(|s| s.as_ref()).collect(); let argv: Vec<&str> = argv.iter().map(|s| s.as_ref()).collect();