Merge branch 'new-alias-api' of https://github.com/pydantic/pydantic-core into new-alias-api

Author: sydney-runkle

src/serializers/extra.rs

@@ -206,7 +206,7 @@ impl<'a> Extra<'a> {
     }
 
     pub fn serialize_by_alias_or(&self, serialize_by_alias: Option<bool>) -> bool {
-        self.by_alias.unwrap_or(serialize_by_alias.unwrap_or(false))
+        self.by_alias.or(serialize_by_alias).unwrap_or(false)
     }
 }
 

src/validators/validation_state.rs

@@ -65,11 +65,11 @@ impl<'a, 'py> ValidationState<'a, 'py> {
     }
 
     pub fn validate_by_alias_or(&self, default: Option<bool>) -> bool {
-        self.extra.by_alias.unwrap_or(default.unwrap_or(true))
+        self.extra.by_alias.or(default).unwrap_or(true)
     }
 
     pub fn validate_by_name_or(&self, default: Option<bool>) -> bool {
-        self.extra.by_name.unwrap_or(default.unwrap_or(false))
+        self.extra.by_name.or(default).unwrap_or(false)
     }
 
     /// Sets the exactness to the lower of the current exactness