diff options
author | Ondřej Čertík <ondrej@certik.us> | 2020-01-12 21:52:35 -0700 |
---|---|---|
committer | Ondřej Čertík <ondrej@certik.us> | 2020-01-12 21:54:00 -0700 |
commit | e1e4e9d459378af32e5abddd89be6b544ad0eb83 (patch) | |
tree | 11391b26099e88abf3438524c3e85d41fe85ca9b | |
parent | 0a1d8009bf678d8ea457f124c4e3adf6b6addf75 (diff) | |
download | fpm-e1e4e9d459378af32e5abddd89be6b544ad0eb83.tar.gz fpm-e1e4e9d459378af32e5abddd89be6b544ad0eb83.zip |
Use Vec<String>
-rw-r--r-- | src/main.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main.rs b/src/main.rs index 2a75e85..8fb71c2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,8 +6,8 @@ struct Cli { command: String, } -fn collect_source_files() -> Vec<std::path::PathBuf> { - let mut files: Vec<std::path::PathBuf> = Vec::new(); +fn collect_source_files() -> Vec<String> { + let mut files: Vec<String> = Vec::new(); for entry in std::fs::read_dir(".").unwrap() { let entry = entry.unwrap(); let path = entry.path(); @@ -17,7 +17,7 @@ fn collect_source_files() -> Vec<std::path::PathBuf> { Some(ext) => ext.to_str().unwrap(), }; if ext == "f90" { - files.push(path); + files.push(path.to_str().unwrap().to_string()); } } } @@ -28,9 +28,9 @@ fn build() { let files = collect_source_files(); let mut files2: String = String::new(); for file in &files { - println!("File: {}", file.to_str().unwrap()); - if !file.to_str().unwrap().ends_with("main.f90") { - files2 = files2 + " " + file.to_str().unwrap(); + println!("File: {}", file); + if !file.ends_with("main.f90") { + files2 = files2 + " " + file; } } println!("Files: {:?}", files); |