Make bufferoptions.format a Cow<'static, str>

coolreader18 · coolreader18 · commit a1ca535f7860 · 2020-11-06T11:11:06.000-06:00
diff --git a/vm/src/builtins/memory.rs b/vm/src/builtins/memory.rs
@@ -1,4 +1,4 @@
-use std::{fmt::Debug, ops::Deref};
+use std::{borrow::Cow, fmt::Debug, ops::Deref};
 
 use crate::builtins::bytes::{PyBytes, PyBytesRef};
 use crate::builtins::list::{PyList, PyListRef};
@@ -37,6 +37,11 @@ impl Deref for BufferRef {
         self.0.deref()
     }
 }
+impl BufferRef {
+    pub fn new(buffer: impl Buffer + 'static) -> Self {
+        Self(Box::new(buffer))
+    }
+}
 impl From<Box<dyn Buffer>> for BufferRef {
     fn from(buffer: Box<dyn Buffer>) -> Self {
         BufferRef(buffer)
@@ -76,33 +81,37 @@ pub struct BufferOptions {
     pub len: usize,
     pub itemsize: usize,
     pub contiguous: bool,
-    pub format: String,
+    pub format: Cow<'static, str>,
     // TODO: support multiple dimension array
     pub ndim: usize,
     pub shape: Vec<usize>,
     pub strides: Vec<isize>,
 }
 
-pub(crate) trait ResizeGuard<'a> {
-    type Resizable: 'a;
-    fn try_resizable(&'a self, vm: &VirtualMachine) -> PyResult<Self::Resizable>;
+impl BufferOptions {
+    pub const DEFAULT: Self = BufferOptions {
+        readonly: true,
+        len: 0,
+        itemsize: 1,
+        contiguous: true,
+        format: Cow::Borrowed("B"),
+        ndim: 1,
+        shape: Vec::new(),
+        strides: Vec::new(),
+    };
 }
 
 impl Default for BufferOptions {
     fn default() -> Self {
-        BufferOptions {
-            readonly: true,
-            len: 0,
-            itemsize: 1,
-            contiguous: true,
-            format: "B".to_owned(),
-            ndim: 1,
-            shape: Vec::new(),
-            strides: Vec::new(),
-        }
+        Self::DEFAULT
     }
 }
 
+pub(crate) trait ResizeGuard<'a> {
+    type Resizable: 'a;
+    fn try_resizable(&'a self, vm: &VirtualMachine) -> PyResult<Self::Resizable>;
+}
+
 #[derive(FromArgs)]
 struct PyMemoryViewNewArgs {
     #[pyarg(any)]
diff --git a/vm/src/stdlib/array.rs b/vm/src/stdlib/array.rs
@@ -37,7 +37,7 @@ impl fmt::Display for ArrayTypeSpecifierError {
 }
 
 macro_rules! def_array_enum {
-    ($(($n:ident, $t:ty, $c:literal)),*$(,)?) => {
+    ($(($n:ident, $t:ty, $c:literal, $scode:literal)),*$(,)?) => {
         #[derive(Debug, Clone)]
         pub(crate) enum ArrayContentType {
             $($n(Vec<$t>),)*
@@ -58,6 +58,12 @@ macro_rules! def_array_enum {
                 }
             }
 
+            fn typecode_str(&self) -> &'static str {
+                match self {
+                    $(ArrayContentType::$n(_) => $scode,)*
+                }
+            }
+
             fn itemsize(&self) -> usize {
                 match self {
                     $(ArrayContentType::$n(_) => std::mem::size_of::<$t>(),)*
@@ -394,19 +400,19 @@ macro_rules! def_array_enum {
 }
 
 def_array_enum!(
-    (SignedByte, i8, 'b'),
-    (UnsignedByte, u8, 'B'),
+    (SignedByte, i8, 'b', "b"),
+    (UnsignedByte, u8, 'B', "B"),
     // TODO: support unicode char
-    (SignedShort, raw::c_short, 'h'),
-    (UnsignedShort, raw::c_ushort, 'H'),
-    (SignedInt, raw::c_int, 'i'),
-    (UnsignedInt, raw::c_uint, 'I'),
-    (SignedLong, raw::c_long, 'l'),
-    (UnsignedLong, raw::c_ulong, 'L'),
-    (SignedLongLong, raw::c_longlong, 'q'),
-    (UnsignedLongLong, raw::c_ulonglong, 'Q'),
-    (Float, f32, 'f'),
-    (Double, f64, 'd'),
+    (SignedShort, raw::c_short, 'h', "h"),
+    (UnsignedShort, raw::c_ushort, 'H', "H"),
+    (SignedInt, raw::c_int, 'i', "i"),
+    (UnsignedInt, raw::c_uint, 'I', "I"),
+    (SignedLong, raw::c_long, 'l', "l"),
+    (UnsignedLong, raw::c_ulong, 'L', "L"),
+    (SignedLongLong, raw::c_longlong, 'q', "q"),
+    (UnsignedLongLong, raw::c_ulonglong, 'Q', "Q"),
+    (Float, f32, 'f', "f"),
+    (Double, f64, 'd', "d"),
 );
 
 trait ArrayElement: Sized {
@@ -875,7 +881,7 @@ impl Buffer for PyArrayRef {
                 readonly: false,
                 len: array.len(),
                 itemsize: array.itemsize(),
-                format: array.typecode().to_string(),
+                format: array.typecode_str().into(),
                 ..Default::default()
             }));
             PyRwLockWriteGuard::downgrade(w)
