into_wrapper to avoid redundant Vec

youknowone · youknowone · commit e9cae8af4b21 · 2020-07-19T05:38:47.000+09:00
diff --git a/vm/src/obj/objbytearray.rs b/vm/src/obj/objbytearray.rs
@@ -451,13 +451,10 @@ impl PyByteArray {
 
     #[pymethod(name = "splitlines")]
     fn splitlines(&self, options: pystr::SplitLinesArgs, vm: &VirtualMachine) -> PyResult {
-        let as_bytes = self
+        let lines = self
             .borrow_value()
-            .splitlines(options)
-            .iter()
-            .map(|x| vm.ctx.new_bytearray(x.to_vec()))
-            .collect::<Vec<PyObjectRef>>();
-        Ok(vm.ctx.new_list(as_bytes))
+            .splitlines(options, |x| vm.ctx.new_bytearray(x.to_vec()));
+        Ok(vm.ctx.new_list(lines))
     }
 
     #[pymethod(name = "zfill")]
diff --git a/vm/src/obj/objbyteinner.rs b/vm/src/obj/objbyteinner.rs
@@ -961,8 +961,12 @@ impl PyByteInner {
         res
     }
 
-    pub fn splitlines(&self, options: pystr::SplitLinesArgs) -> Vec<&[u8]> {
-        self.elements.py_splitlines(self.elements.iter(), options)
+    pub fn splitlines<FW, W>(&self, options: pystr::SplitLinesArgs, into_wrapper: FW) -> Vec<W>
+    where
+        FW: Fn(&[u8]) -> W,
+    {
+        self.elements
+            .py_splitlines(self.elements.iter(), options, into_wrapper)
     }
 
     pub fn zfill(&self, width: isize) -> Vec<u8> {
diff --git a/vm/src/obj/objbytes.rs b/vm/src/obj/objbytes.rs
@@ -418,13 +418,10 @@ impl PyBytes {
 
     #[pymethod(name = "splitlines")]
     fn splitlines(&self, options: pystr::SplitLinesArgs, vm: &VirtualMachine) -> PyResult {
-        let as_bytes = self
+        let lines = self
             .inner
-            .splitlines(options)
-            .iter()
-            .map(|x| vm.ctx.new_bytes(x.to_vec()))
-            .collect::<Vec<PyObjectRef>>();
-        Ok(vm.ctx.new_list(as_bytes))
+            .splitlines(options, |x| vm.ctx.new_bytes(x.to_vec()));
+        Ok(vm.ctx.new_list(lines))
     }
 
     #[pymethod(name = "zfill")]
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -803,10 +803,7 @@ impl PyString {
     fn splitlines(&self, args: pystr::SplitLinesArgs, vm: &VirtualMachine) -> PyObjectRef {
         vm.ctx.new_list(
             self.value
-                .py_splitlines(self.value.bytes(), args)
-                .iter()
-                .map(|s| vm.ctx.new_str(*s))
-                .collect(),
+                .py_splitlines(self.value.bytes(), args, |s| vm.new_str(s.to_owned())),
         )
     }
 
diff --git a/vm/src/obj/pystr.rs b/vm/src/obj/pystr.rs
@@ -298,13 +298,15 @@ pub trait PyCommonString<E> {
         }
     }
 
-    fn py_splitlines<U8>(
+    fn py_splitlines<U8, FW, W>(
         &self,
         bytes: impl std::iter::Iterator<Item = U8>,
         options: SplitLinesArgs,
-    ) -> Vec<&Self>
+        into_wrapper: FW,
+    ) -> Vec<W>
     where
         U8: CopyTo<u8>,
+        FW: Fn(&Self) -> W,
     {
         let keep = if options.keepends { 1 } else { 0 };
         let mut elements = Vec::new();
@@ -331,10 +333,10 @@ pub trait PyCommonString<E> {
             };
             let range = last_i..i + end_len;
             last_i = i + i_diff;
-            elements.push(self.get_bytes(range));
+            elements.push(into_wrapper(self.get_bytes(range)));
         }
         if last_i != self.bytes_len() {
-            elements.push(self.get_bytes(last_i..self.bytes_len()));
+            elements.push(into_wrapper(self.get_bytes(last_i..self.bytes_len())));
         }
         elements
     }

Original file line number	Diff line number	Diff line change
`@@ -961,8 +961,12 @@ impl PyByteInner {`
`961`	`961`	`res`
`962`	`962`	`}`
`963`	`963`
`964`		`- pub fn splitlines(&self, options: pystr::SplitLinesArgs) -> Vec<&[u8]> {`
`965`		`- self.elements.py_splitlines(self.elements.iter(), options)`
	`964`	`+ pub fn splitlines<FW, W>(&self, options: pystr::SplitLinesArgs, into_wrapper: FW) -> Vec<W>`
	`965`	`+ where`
	`966`	`+ FW: Fn(&[u8]) -> W,`
	`967`	`+ {`
	`968`	`+ self.elements`
	`969`	`+ .py_splitlines(self.elements.iter(), options, into_wrapper)`
`966`	`970`	`}`
`967`	`971`
`968`	`972`	`pub fn zfill(&self, width: isize) -> Vec<u8> {`
Original file line number	Diff line number	Diff line change
`@@ -803,10 +803,7 @@ impl PyString {`
`803`	`803`	`fn splitlines(&self, args: pystr::SplitLinesArgs, vm: &VirtualMachine) -> PyObjectRef {`
`804`	`804`	`vm.ctx.new_list(`
`805`	`805`	`self.value`
`806`		`- .py_splitlines(self.value.bytes(), args)`
`807`		`- .iter()`
`808`		`- .map(\|s\| vm.ctx.new_str(*s))`
`809`		`- .collect(),`
	`806`	`+ .py_splitlines(self.value.bytes(), args, \|s\| vm.new_str(s.to_owned())),`
`810`	`807`	`)`
`811`	`808`	`}`
`812`	`809`
Original file line number	Diff line number	Diff line change
`@@ -298,13 +298,15 @@ pub trait PyCommonString<E> {`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`
`301`		`- fn py_splitlines<U8>(`
	`301`	`+ fn py_splitlines<U8, FW, W>(`
`302`	`302`	`&self,`
`303`	`303`	`bytes: impl std::iter::Iterator<Item = U8>,`
`304`	`304`	`options: SplitLinesArgs,`
`305`		`- ) -> Vec<&Self>`
	`305`	`+ into_wrapper: FW,`
	`306`	`+ ) -> Vec<W>`
`306`	`307`	`where`
`307`	`308`	`U8: CopyTo<u8>,`
	`309`	`+ FW: Fn(&Self) -> W,`
`308`	`310`	`{`
`309`	`311`	`let keep = if options.keepends { 1 } else { 0 };`
`310`	`312`	`let mut elements = Vec::new();`
`@@ -331,10 +333,10 @@ pub trait PyCommonString<E> {`
`331`	`333`	`};`
`332`	`334`	`let range = last_i..i + end_len;`
`333`	`335`	`last_i = i + i_diff;`
`334`		`- elements.push(self.get_bytes(range));`
	`336`	`+ elements.push(into_wrapper(self.get_bytes(range)));`
`335`	`337`	`}`
`336`	`338`	`if last_i != self.bytes_len() {`
`337`		`- elements.push(self.get_bytes(last_i..self.bytes_len()));`
	`339`	`+ elements.push(into_wrapper(self.get_bytes(last_i..self.bytes_len())));`
`338`	`340`	`}`
`339`	`341`	`elements`
`340`	`342`	`}`