From: Erik Mackdanz <erikmack@gmail.com>
Date: Fri, 24 Nov 2023 05:40:35 +0000 (-0600)
Subject: ? not unwrap
X-Git-Url: https://git.humopery.space/?a=commitdiff_plain;h=d53fcef181112c525492d1a902e10a52ec9404a5;p=polarsbop.git

? not unwrap
---

diff --git a/src/main.rs b/src/main.rs
index ee83ea0..3d4fb57 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,7 @@ use polars::prelude::*;
 use std::fs::{create_dir_all,File};
 
 
-fn main() {
+fn main() -> Result<(),PolarsError> {
 
     create_dir_all("out").unwrap();
     let mut file =
@@ -28,26 +28,27 @@ fn main() {
 	)));
 
     // read and parse from disk
-    let df = CsvReader::from_path("data/bop.csv").unwrap()
+    let df = CsvReader::from_path("data/bop.csv")?
 	.has_header(true)
 	.with_dtypes(schema_override)
 	.with_null_values(null_values)
-	.finish().unwrap();
+	.finish()?;
 
     // one country
-    let df = df.filter(&df.column("Country Name").unwrap().
-		       equal("France").unwrap()).unwrap();
+    let df = df.filter(&df.column("Country Name")?.
+		       equal("France")?)?;
 
     // values not status, selected cols
     let mut df = df
-	.filter(&df.column("Attribute").unwrap().
-			   equal("Value").unwrap()).unwrap()
-	.select(["Country Name","Indicator Name","Indicator Code","2022"]).unwrap()
-	.sort(["Indicator Name"],false,false).unwrap();
+	.filter(&df.column("Attribute")?.
+			   equal("Value")?)?
+	.select(["Country Name","Indicator Name","Indicator Code","2022"])?
+	.sort(["Indicator Name"],false,false)?;
 
     println!("df: {:?}",df);
 
     JsonWriter::new(&mut file)
-	.finish(&mut df).unwrap();
+	.finish(&mut df)?;
 
+    Ok(())
 }