GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #275 from taskchampion/issue274

Browse source 
Fix arg parsing on Windows
This commit is contained in:
Dustin J. Mitchell 2021-06-15 10:13:00 -04:00 • committed by GitHub
commit 9c35b31fbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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::string::FromUtf8Error;
use std::ffi::OsString;
// NOTE: it's important that this 'mod' comes first so that the macros can be used in other modules
mod macros;
@ -63,8 +62,8 @@ pub fn main() -> Result<(), Error> {
// parse the command line into a vector of &str, failing if
// there are invalid utf-8 sequences.
let argv: Vec<String> = std::env::args_os()
.map(|oss| String::from_utf8(oss.into_vec()))
.collect::<Result<_, FromUtf8Error>>()
.map(|oss| oss.into_string())
.collect::<Result<_, OsString>>()
.map_err(|_| Error::for_arguments("arguments must be valid utf-8"))?;
let argv: Vec<&str> = argv.iter().map(|s| s.as_ref()).collect();