The .copy() method now returns Self (unwrapped)

Author: aldanor

hdf5-rs/src/hl/plist.rs

@@ -151,8 +151,8 @@ impl FromStr for PropertyListClass {
 
 impl PropertyList {
     /// Copies the property list.
-    pub fn copy(&self) -> Result<Self> {
-        Self::from_id(h5call!(H5Pcopy(self.id()))?)
+    pub fn copy(&self) -> Self {
+        Self::from_id(h5lock!(H5Pcopy(self.id()))).unwrap_or_else(|_| Self::invalid())
     }
 
     /// Queries whether a property name exists in the property list.
@@ -243,7 +243,7 @@ pub mod tests {
     pub fn test_clone() {
         let (fapl, _) = make_plists();
         assert!(fapl.is_valid());
-        let fapl_c = fapl.copy().unwrap();
+        let fapl_c = fapl.copy();
         assert!(fapl.is_valid());
         assert!(fapl_c.is_valid());
         assert_eq!(fapl.refcount(), 1);

hdf5-rs/src/hl/plist/file_create.rs

@@ -395,8 +395,8 @@ impl FileCreate {
         Self::from_id(h5try!(H5Pcreate(*H5P_FILE_CREATE)))
     }
 
-    pub fn copy(&self) -> Result<Self> {
-        Ok(unsafe { self.deref().copy()?.cast() })
+    pub fn copy(&self) -> Self {
+        unsafe { self.deref().copy().cast() }
     }
 
     pub fn build() -> FileCreateBuilder {

hdf5-rs/src/hl/space.rs

@@ -55,8 +55,8 @@ impl Deref for Dataspace {
 
 impl Dataspace {
     /// Copies the dataspace.
-    pub fn copy(&self) -> Result<Self> {
-        Self::from_id(h5call!(H5Scopy(self.id()))?)
+    pub fn copy(&self) -> Self {
+        Self::from_id(h5lock!(H5Scopy(self.id()))).unwrap_or_else(|_| Self::invalid())
     }
 
     /// Select a slice (known as a 'hyperslab' in HDF5 terminology) of the Dataspace.
@@ -213,7 +213,7 @@ pub mod tests {
 
         assert_err!(Dataspace::from_id(H5I_INVALID_HID), "Invalid dataspace id");
 
-        let dc = d.copy().unwrap();
+        let dc = d.copy();
         assert!(dc.is_valid());
         assert_ne!(dc.id(), d.id());
         assert_eq!((d.ndim(), d.dims(), d.size()), (dc.ndim(), dc.dims(), dc.size()));