diff options
Diffstat (limited to 'rust/src')
| -rw-r--r-- | rust/src/api_helpers.rs | 10 | ||||
| -rw-r--r-- | rust/src/bin/fatcat-export.rs | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/rust/src/api_helpers.rs b/rust/src/api_helpers.rs index 1df42622..47c03e58 100644 --- a/rust/src/api_helpers.rs +++ b/rust/src/api_helpers.rs @@ -90,11 +90,11 @@ fn test_expand_flags() { creators: true } ); - assert!(ExpandFlags::from_str("").files == false); - assert!(ExpandFlags::from_str("files").files == true); - assert!(ExpandFlags::from_str("something,,files").files == true); - assert!(ExpandFlags::from_str("file").files == false); - let all = ExpandFlags::from_str("files,container,other_thing,releases,creators"); + assert!(ExpandFlags::from_str("").unwrap().files == false); + assert!(ExpandFlags::from_str("files").unwrap().files == true); + assert!(ExpandFlags::from_str("something,,files").unwrap().files == true); + assert!(ExpandFlags::from_str("file").unwrap().files == false); + let all = ExpandFlags::from_str("files,container,other_thing,releases,creators").unwrap(); assert!( all == ExpandFlags { files: true, diff --git a/rust/src/bin/fatcat-export.rs b/rust/src/bin/fatcat-export.rs index 1af321ba..8ab3ef4a 100644 --- a/rust/src/bin/fatcat-export.rs +++ b/rust/src/bin/fatcat-export.rs @@ -114,7 +114,7 @@ fn loop_printer(output_receiver: channel::Receiver<String>, done_sender: channel Ok(()) } -fn parse_line(s: String) -> Result<IdentRow> { +fn parse_line(s: &str) -> Result<IdentRow> { let fields: Vec<String> = s.split("\t").map(|v| v.to_string()).collect(); if fields.len() != 3 { bail!("Invalid input line"); @@ -187,7 +187,7 @@ pub fn do_export(num_workers: usize, expand: Option<ExpandFlags>, entity_type: E let mut count = 0; for line in buf_input.lines() { let line = line?; - let row = parse_line(line)?; + let row = parse_line(&line)?; match (row.rev_id, row.redirect_id, redirects) { (None, _, _) => (), (Some(_), Some(_), false) => (), |