Merge pull request RustPython#2038 from youknowone/flatten

flat_option -> flatten

Author: coolreader18

vm/src/function.rs

@@ -404,7 +404,7 @@ pub type OptionalOption<T> = OptionalArg<Option<T>>;
 
 impl<T> OptionalOption<T> {
     #[inline]
-    pub fn flat_option(self) -> Option<T> {
+    pub fn flatten(self) -> Option<T> {
         match self {
             Present(Some(value)) => Some(value),
             _ => None,

vm/src/obj/objfloat.rs

@@ -381,7 +381,7 @@ impl PyFloat {
 
     #[pymethod(name = "__round__")]
     fn round(&self, ndigits: OptionalOption<PyIntRef>, vm: &VirtualMachine) -> PyResult {
-        let ndigits = ndigits.flat_option();
+        let ndigits = ndigits.flatten();
         if let Some(ndigits) = ndigits {
             let ndigits = ndigits.as_bigint();
             if ndigits.is_zero() {

vm/src/obj/objmodule.rs

@@ -57,7 +57,7 @@ impl PyModuleRef {
             vm,
             &zelf.as_object().dict().unwrap(),
             name.into_object(),
-            doc.flat_option()
+            doc.flatten()
                 .map_or_else(|| vm.get_none(), PyRef::into_object),
         );
         Ok(zelf)

vm/src/pystr.rs

@@ -251,7 +251,7 @@ where
         FC: Fn(&'a Self, &Self) -> &'a Self,
         FD: Fn(&'a Self) -> &'a Self,
     {
-        let chars = chars.flat_option();
+        let chars = chars.flatten();
         match chars {
             Some(chars) => func_chars(self, chars.as_ref()),
             None => func_default(self),

vm/src/stdlib/io.rs

@@ -24,7 +24,7 @@ use crate::pyobject::{
 use crate::vm::VirtualMachine;
 
 fn byte_count(bytes: OptionalOption<i64>) -> i64 {
-    bytes.flat_option().unwrap_or(-1 as i64)
+    bytes.flatten().unwrap_or(-1 as i64)
 }
 fn os_err(vm: &VirtualMachine, err: io::Error) -> PyBaseExceptionRef {
     #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]
@@ -204,7 +204,7 @@ impl PyStringIORef {
 
     fn truncate(self, size: OptionalOption<usize>, vm: &VirtualMachine) -> PyResult<()> {
         let mut buffer = self.buffer(vm)?;
-        let size = size.flat_option().unwrap_or_else(|| buffer.tell() as usize);
+        let size = size.flatten().unwrap_or_else(|| buffer.tell() as usize);
         buffer.cursor.get_mut().truncate(size);
         Ok(())
     }
@@ -232,7 +232,7 @@ fn string_io_new(
     _args: StringIOArgs,
     vm: &VirtualMachine,
 ) -> PyResult<PyStringIORef> {
-    let flatten = object.flat_option();
+    let flatten = object.flatten();
     let input = flatten.map_or_else(Vec::new, |v| objstr::borrow_value(&v).as_bytes().to_vec());
 
     PyStringIO {
@@ -316,7 +316,7 @@ impl PyBytesIORef {
 
     fn truncate(self, size: OptionalOption<usize>, vm: &VirtualMachine) -> PyResult<()> {
         let mut buffer = self.buffer(vm)?;
-        let size = size.flat_option().unwrap_or_else(|| buffer.tell() as usize);
+        let size = size.flatten().unwrap_or_else(|| buffer.tell() as usize);
         buffer.cursor.get_mut().truncate(size);
         Ok(())
     }
@@ -411,7 +411,7 @@ fn io_base_checkclosed(
 ) -> PyResult<()> {
     if objbool::boolval(vm, vm.get_attribute(instance, "closed")?)? {
         let msg = msg
-            .flat_option()
+            .flatten()
             .unwrap_or_else(|| vm.new_str("I/O operation on closed file.".to_owned()));
         Err(vm.new_exception(vm.ctx.exceptions.value_error.clone(), vec![msg]))
     } else {
@@ -426,7 +426,7 @@ fn io_base_checkreadable(
 ) -> PyResult<()> {
     if !objbool::boolval(vm, vm.call_method(&instance, "readable", vec![])?)? {
         let msg = msg
-            .flat_option()
+            .flatten()
             .unwrap_or_else(|| vm.new_str("File or stream is not readable.".to_owned()));
         Err(vm.new_exception(vm.ctx.exceptions.value_error.clone(), vec![msg]))
     } else {
@@ -441,7 +441,7 @@ fn io_base_checkwritable(
 ) -> PyResult<()> {
     if !objbool::boolval(vm, vm.call_method(&instance, "writable", vec![])?)? {
         let msg = msg
-            .flat_option()
+            .flatten()
             .unwrap_or_else(|| vm.new_str("File or stream is not writable.".to_owned()));
         Err(vm.new_exception(vm.ctx.exceptions.value_error.clone(), vec![msg]))
     } else {
@@ -456,7 +456,7 @@ fn io_base_checkseekable(
 ) -> PyResult<()> {
     if !objbool::boolval(vm, vm.call_method(&instance, "seekable", vec![])?)? {
         let msg = msg
-            .flat_option()
+            .flatten()
             .unwrap_or_else(|| vm.new_str("File or stream is not seekable.".to_owned()));
         Err(vm.new_exception(vm.ctx.exceptions.value_error.clone(), vec![msg]))
     } else {
@@ -929,7 +929,7 @@ fn text_io_wrapper_read(
     let bytes = vm.call_method(
         &raw,
         "read",
-        vec![size.flat_option().unwrap_or_else(|| vm.get_none())],
+        vec![size.flatten().unwrap_or_else(|| vm.get_none())],
     )?;
     let bytes = PyBytesLike::try_from_object(vm, bytes)?;
     //format bytes into string
@@ -988,7 +988,7 @@ fn text_io_wrapper_readline(
     let bytes = vm.call_method(
         &raw,
         "readline",
-        vec![size.flat_option().unwrap_or_else(|| vm.get_none())],
+        vec![size.flatten().unwrap_or_else(|| vm.get_none())],
     )?;
     let bytes = PyBytesLike::try_from_object(vm, bytes)?;
     //format bytes into string

vm/src/stdlib/itertools.rs

@@ -1356,7 +1356,7 @@ mod decl {
             let n = pool.len();
             // If r is not provided, r == n. If provided, r must be a positive integer, or None.
             // If None, it behaves the same as if it was not provided.
-            let r = match r.flat_option() {
+            let r = match r.flatten() {
                 Some(r) => {
                     let val = r
                         .payload::<PyInt>()

vm/src/stdlib/random.rs

@@ -83,7 +83,7 @@ mod _random {
 
         #[pymethod]
         fn seed(&self, n: OptionalOption<PyIntRef>) {
-            let new_rng = match n.flat_option() {
+            let new_rng = match n.flatten() {
                 None => PyRng::default(),
                 Some(n) => {
                     let (_, mut key) = n.as_bigint().abs().to_u32_digits();

vm/src/stdlib/select.rs

@@ -113,7 +113,7 @@ fn select_select(
     timeout: OptionalOption<Either<f64, isize>>,
     vm: &VirtualMachine,
 ) -> PyResult<(PyObjectRef, PyObjectRef, PyObjectRef)> {
-    let mut timeout = timeout.flat_option().map(|e| match e {
+    let mut timeout = timeout.flatten().map(|e| match e {
         Either::A(f) => f,
         Either::B(i) => i as f64,
     });