Better ownership & Remove unwrap

Author: Nao-ris

src/index.rs

@@ -6,11 +6,11 @@ use crate::{
         CBLCollection_GetIndexNames, CBLCollection_CreateArrayIndex, CBLArrayIndexConfiguration,
         CBLQueryIndex, CBLQueryIndex_Name, CBLQueryIndex_Collection, CBLCollection_GetIndex,
     },
-    error::{Result, failure},
-    slice::{from_str, from_c_str},
+    error::{Error, Result, failure},
+    slice::{from_str, from_c_str, Slice},
     QueryLanguage, Array,
     collection::Collection,
-    check_error, retain,
+    check_error, retain, CouchbaseLiteError,
 };
 use std::ffi::CString;
 
@@ -44,8 +44,8 @@ impl ValueIndexConfiguration {
 #[derive(Debug)]
 pub struct ArrayIndexConfiguration {
     cbl_ref: CBLArrayIndexConfiguration,
-    _path: CString,
-    _expressions: CString,
+    _path: Slice<CString>,
+    _expressions: Slice<CString>,
 }
 
 impl CblRef for ArrayIndexConfiguration {
@@ -67,19 +67,24 @@ impl ArrayIndexConfiguration {
         indexed. The expressions could be specified in a JSON Array or in N1QL syntax
         using comma delimiter. If the array specified by the path contains scalar values,
         the expressions should be left unset or set to null. */
-    pub fn new(query_language: QueryLanguage, path: &str, expressions: &str) -> Self {
-        let path_c = CString::new(path).unwrap();
-        let expressions_c = CString::new(expressions).unwrap();
+    pub fn new(query_language: QueryLanguage, path: &str, expressions: &str) -> Result<Self> {
+        let path_c = CString::new(path)
+            .map_err(|_| Error::cbl_error(CouchbaseLiteError::InvalidParameter))?;
+        let expressions_c = CString::new(expressions)
+            .map_err(|_| Error::cbl_error(CouchbaseLiteError::InvalidParameter))?;
 
-        Self {
+        let path_s = from_c_str(path_c, path.len());
+        let expressions_s = from_c_str(expressions_c, expressions.len());
+
+        Ok(Self {
             cbl_ref: CBLArrayIndexConfiguration {
                 expressionLanguage: query_language as u32,
-                path: from_c_str(&path_c, path.len()).get_ref(),
-                expressions: from_c_str(&expressions_c, expressions.len()).get_ref(),
+                path: path_s.get_ref(),
+                expressions: expressions_s.get_ref(),
             },
-            _path: path_c,
-            _expressions: expressions_c,
-        }
+            _path: path_s,
+            _expressions: expressions_s,
+        })
     }
 }
 

src/slice.rs

@@ -21,7 +21,7 @@ use crate::{
 };
 
 use std::borrow::Cow;
-use std::ffi::{CStr, c_void};
+use std::ffi::{CStr, CString, c_void};
 use std::fmt::{Debug, Formatter};
 use std::ptr::{self, drop_in_place};
 use std::str;
@@ -98,7 +98,7 @@ pub fn from_str(s: &str) -> Slice<&str> {
     )
 }
 
-pub fn from_c_str(s: &CStr, len: usize) -> Slice<&CStr> {
+pub fn from_c_str(s: CString, len: usize) -> Slice<CString> {
     Slice::wrap(
         FLSlice {
             buf: s.as_ptr().cast::<c_void>(),

tests/query_tests.rs

@@ -282,7 +282,8 @@ fn array_index() {
         default_collection.save_document(&mut doc).unwrap();
 
         // Index with one level of unnest
-        let index_configuration = ArrayIndexConfiguration::new(QueryLanguage::N1QL, "likes", "");
+        let index_configuration =
+            ArrayIndexConfiguration::new(QueryLanguage::N1QL, "likes", "").unwrap();
 
         let result = default_collection
             .create_array_index("one_level", &index_configuration)
@@ -307,7 +308,7 @@ fn array_index() {
 
         // Index with two levels of unnest
         let index_configuration =
-            ArrayIndexConfiguration::new(QueryLanguage::N1QL, "contacts[].phones", "type");
+            ArrayIndexConfiguration::new(QueryLanguage::N1QL, "contacts[].phones", "type").unwrap();
 
         assert!(default_collection
             .create_array_index("two_levels", &index_configuration,)
@@ -324,8 +325,6 @@ fn array_index() {
         )
         .unwrap();
 
-        println!("Explain: {}", query.explain().unwrap());
-
         let index = get_index_name_from_explain(&query.explain().unwrap()).unwrap();
         assert_eq!(index, "two_levels");