small refactor in kwarg handling

ariebovenberg · Jul 13, 2024 · bc99d48 · bc99d48
1 parent bb53f87
commit bc99d48
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 26 deletions.
diff --git a/src/common.rs b/src/common.rs
@@ -171,38 +171,38 @@ macro_rules! method_vararg(
 pub(crate) struct KwargIter {
     keys: *mut PyObject,
     values: *const *mut PyObject,
-    len: isize,
-    i: isize,
+    size: isize,
+    pos: isize,
 }
 
 impl KwargIter {
     pub(crate) unsafe fn new(keys: *mut PyObject, values: *const *mut PyObject) -> Self {
         Self {
             keys,
             values,
-            len: if keys.is_null() {
+            size: if keys.is_null() {
                 0
             } else {
                 PyTuple_GET_SIZE(keys) as isize
             },
-            i: 0,
+            pos: 0,
         }
     }
 
-    pub(crate) fn length(&self) -> isize {
-        self.len
+    pub(crate) fn len(&self) -> isize {
+        self.size
     }
 }
 
 impl Iterator for KwargIter {
     type Item = (*mut PyObject, *mut PyObject);
 
     fn next(&mut self) -> Option<Self::Item> {
-        if self.i >= self.len {
+        if self.pos >= self.size {
             return None;
         }
-        let i = self.i;
-        self.i = i + 1;
+        let i = self.pos;
+        self.pos = i + 1;
         unsafe { Some((PyTuple_GET_ITEM(self.keys, i), *self.values.offset(i))) }
     }
 }
@@ -870,7 +870,7 @@ impl Disambiguate {
         fname: &str,
     ) -> PyResult<Self> {
         match kwargs.next() {
-            Some((name, value)) if kwargs.length() == 1 => {
+            Some((name, value)) if kwargs.len() == 1 => {
                 if name.kwarg_eq(str_disambiguate) {
                     Self::from_py(value)
                 } else {
@@ -884,7 +884,7 @@ impl Disambiguate {
             Some(_) => Err(type_err!(
                 "{}() takes at most 1 keyword argument, got {}",
                 fname,
-                kwargs.length()
+                kwargs.len()
             )),
             None => Err(type_err!(
                 "{}() missing 1 required keyword-only argument: 'disambiguate'",

diff --git a/src/local_datetime.rs b/src/local_datetime.rs
@@ -420,6 +420,7 @@ unsafe fn _shift_method(
     negate: bool,
 ) -> PyReturn {
     let fname = if negate { "subtract" } else { "add" };
+    // FUTURE: get fields all at once from State (this is faster)
     let state = State::for_type(cls);
     let mut months = 0;
     let mut days = 0;
@@ -429,9 +430,7 @@ unsafe fn _shift_method(
     match *args {
         [arg] => {
             match kwargs.next() {
-                Some((key, value))
-                    if kwargs.length() == 1 && key.kwarg_eq(state.str_ignore_dst) =>
-                {
+                Some((key, value)) if kwargs.len() == 1 && key.kwarg_eq(state.str_ignore_dst) => {
                     ignore_dst = value == Py_True();
                 }
                 Some(_) => Err(type_err!(

diff --git a/src/offset_datetime.rs b/src/offset_datetime.rs
@@ -518,7 +518,7 @@ pub(crate) unsafe fn check_ignore_dst_kwarg(
 ) -> PyResult<()> {
     match kwargs.next() {
         Some((key, value))
-            if kwargs.length() == 1 && key.kwarg_eq(state.str_ignore_dst) && value == Py_True() =>
+            if kwargs.len() == 1 && key.kwarg_eq(state.str_ignore_dst) && value == Py_True() =>
         {
             Ok(())
         }
@@ -751,9 +751,7 @@ unsafe fn _shift_method(
     match *args {
         [arg] => {
             match kwargs.next() {
-                Some((key, value))
-                    if kwargs.length() == 1 && key.kwarg_eq(state.str_ignore_dst) =>
-                {
+                Some((key, value)) if kwargs.len() == 1 && key.kwarg_eq(state.str_ignore_dst) => {
                     ignore_dst = value == Py_True();
                 }
                 None => {}

diff --git a/src/system_datetime.rs b/src/system_datetime.rs
@@ -711,9 +711,7 @@ unsafe fn _shift_method(
     match *args {
         [arg] => {
             match kwargs.next() {
-                Some((key, value))
-                    if kwargs.length() == 1 && key.kwarg_eq(state.str_disambiguate) =>
-                {
+                Some((key, value)) if kwargs.len() == 1 && key.kwarg_eq(state.str_disambiguate) => {
                     dis = Some(Disambiguate::from_py(value)?)
                 }
                 Some(_) => Err(type_err!(

diff --git a/src/zoned_datetime.rs b/src/zoned_datetime.rs
@@ -912,7 +912,7 @@ unsafe fn check_from_timestamp_args_return_zoneinfo(
     fname: &str,
 ) -> PyReturn {
     match (args, kwargs.next()) {
-        (&[_], Some((key, value))) if kwargs.length() == 1 => {
+        (&[_], Some((key, value))) if kwargs.len() == 1 => {
             if key.kwarg_eq(str_tz) {
                 call1(zoneinfo_type, value)
             } else {
@@ -934,7 +934,7 @@ unsafe fn check_from_timestamp_args_return_zoneinfo(
         _ => Err(type_err!(
             "{}() expected 2 arguments, got {}",
             fname,
-            args.len() + (kwargs.length() as usize)
+            args.len() + (kwargs.len() as usize)
         )),
     }
 }
@@ -1139,9 +1139,7 @@ unsafe fn _shift_method(
     match *args {
         [arg] => {
             match kwargs.next() {
-                Some((key, value))
-                    if kwargs.length() == 1 && key.kwarg_eq(state.str_disambiguate) =>
-                {
+                Some((key, value)) if kwargs.len() == 1 && key.kwarg_eq(state.str_disambiguate) => {
                     dis = Some(Disambiguate::from_py(value)?)
                 }
                 None => {}