refactor(rust)!: rename expand_at_index -> new_from_index (#5259)

pola-rs · Oct 19, 2022 · cbd9815 · cbd9815
1 parent 5a1c744
commit cbd9815
Show file tree

Hide file tree

Showing 27 changed files with 67 additions and 67 deletions.
diff --git a/polars/polars-core/src/chunked_array/bitwise.rs b/polars/polars-core/src/chunked_array/bitwise.rs
@@ -117,14 +117,14 @@ impl BitOr for &BooleanChunked {
                         rhs.rename(self.name());
                         rhs
                     }
-                    None => &self.expand_at_index(0, rhs.len()) | rhs,
+                    None => &self.new_from_index(0, rhs.len()) | rhs,
                 };
             }
             (_, 1) => {
                 return match rhs.get(0) {
                     Some(true) => BooleanChunked::full(self.name(), true, self.len()),
                     Some(false) => self.clone(),
-                    None => &rhs.expand_at_index(0, self.len()) | self,
+                    None => &rhs.new_from_index(0, self.len()) | self,
                 };
             }
             _ => {}
@@ -168,14 +168,14 @@ impl BitXor for &BooleanChunked {
                         rhs.rename(self.name());
                         rhs
                     }
-                    None => &self.expand_at_index(0, rhs.len()) | rhs,
+                    None => &self.new_from_index(0, rhs.len()) | rhs,
                 };
             }
             (_, 1) => {
                 return match rhs.get(0) {
                     Some(true) => self.not(),
                     Some(false) => self.clone(),
-                    None => &rhs.expand_at_index(0, self.len()) | self,
+                    None => &rhs.new_from_index(0, self.len()) | self,
                 };
             }
             _ => {}
@@ -218,14 +218,14 @@ impl BitAnd for &BooleanChunked {
                 return match self.get(0) {
                     Some(true) => rhs.clone(),
                     Some(false) => BooleanChunked::full(self.name(), false, rhs.len()),
-                    None => &self.expand_at_index(0, rhs.len()) & rhs,
+                    None => &self.new_from_index(0, rhs.len()) & rhs,
                 };
             }
             (_, 1) => {
                 return match rhs.get(0) {
                     Some(true) => self.clone(),
                     Some(false) => BooleanChunked::full(self.name(), false, self.len()),
-                    None => self & &rhs.expand_at_index(0, self.len()),
+                    None => self & &rhs.new_from_index(0, self.len()),
                 };
             }
             _ => {}

diff --git a/polars/polars-core/src/chunked_array/logical/struct_/mod.rs b/polars/polars-core/src/chunked_array/logical/struct_/mod.rs
@@ -55,7 +55,7 @@ impl StructChunked {
                 if s_len == max_len {
                     new_fields.push(s.clone())
                 } else if s_len == 1 {
-                    new_fields.push(s.expand_at_index(0, max_len))
+                    new_fields.push(s.new_from_index(0, max_len))
                 } else {
                     return Err(PolarsError::ShapeMisMatch(
                         "expected all fields to have equal length".into(),

diff --git a/polars/polars-core/src/chunked_array/ops/mod.rs b/polars/polars-core/src/chunked_array/ops/mod.rs
@@ -601,7 +601,7 @@ pub trait ChunkFilter<T: PolarsDataType> {
 /// Create a new ChunkedArray filled with values at that index.
 pub trait ChunkExpandAtIndex<T: PolarsDataType> {
     /// Create a new ChunkedArray filled with values at that index.
-    fn expand_at_index(&self, length: usize, index: usize) -> ChunkedArray<T>;
+    fn new_from_index(&self, length: usize, index: usize) -> ChunkedArray<T>;
 }
 
 macro_rules! impl_chunk_expand {
@@ -622,32 +622,32 @@ where
     ChunkedArray<T>: ChunkFull<T::Native> + TakeRandom<Item = T::Native>,
     T: PolarsNumericType,
 {
-    fn expand_at_index(&self, index: usize, length: usize) -> ChunkedArray<T> {
+    fn new_from_index(&self, index: usize, length: usize) -> ChunkedArray<T> {
         impl_chunk_expand!(self, length, index)
     }
 }
 
 impl ChunkExpandAtIndex<BooleanType> for BooleanChunked {
-    fn expand_at_index(&self, index: usize, length: usize) -> BooleanChunked {
+    fn new_from_index(&self, index: usize, length: usize) -> BooleanChunked {
         impl_chunk_expand!(self, length, index)
     }
 }
 
 impl ChunkExpandAtIndex<Utf8Type> for Utf8Chunked {
-    fn expand_at_index(&self, index: usize, length: usize) -> Utf8Chunked {
+    fn new_from_index(&self, index: usize, length: usize) -> Utf8Chunked {
         impl_chunk_expand!(self, length, index)
     }
 }
 
 #[cfg(feature = "dtype-binary")]
 impl ChunkExpandAtIndex<BinaryType> for BinaryChunked {
-    fn expand_at_index(&self, index: usize, length: usize) -> BinaryChunked {
+    fn new_from_index(&self, index: usize, length: usize) -> BinaryChunked {
         impl_chunk_expand!(self, length, index)
     }
 }
 
 impl ChunkExpandAtIndex<ListType> for ListChunked {
-    fn expand_at_index(&self, index: usize, length: usize) -> ListChunked {
+    fn new_from_index(&self, index: usize, length: usize) -> ListChunked {
         let opt_val = self.get(index);
         match opt_val {
             Some(val) => ListChunked::full(self.name(), &val, length),
@@ -658,7 +658,7 @@ impl ChunkExpandAtIndex<ListType> for ListChunked {
 
 #[cfg(feature = "object")]
 impl<T: PolarsObject> ChunkExpandAtIndex<ObjectType<T>> for ObjectChunked<T> {
-    fn expand_at_index(&self, index: usize, length: usize) -> ObjectChunked<T> {
+    fn new_from_index(&self, index: usize, length: usize) -> ObjectChunked<T> {
         let opt_val = self.get(index);
         match opt_val {
             Some(val) => ObjectChunked::<T>::full(self.name(), val.clone(), length),

diff --git a/polars/polars-core/src/doc/changelog/v0_7.rs b/polars/polars-core/src/doc/changelog/v0_7.rs
@@ -13,7 +13,7 @@
 //! * Rem trait implemented for Series and ChunkedArrays
 //! * ChunkedArrays broadcasting arithmetic
 //! * ChunkedArray/Series `zip_with` operation
-//! * ChunkedArray/Series `expand_at_index` operation
+//! * ChunkedArray/Series `new_from_index` operation
 //! * laziness api initiated.
 //!     - Predicate pushdown optimizer
 //!     - Projection pushdown optimizer

diff --git a/polars/polars-core/src/frame/arithmetic.rs b/polars/polars-core/src/frame/arithmetic.rs
@@ -150,7 +150,7 @@ impl DataFrame {
                 // trick to fill a series with nulls
                 let vals: &[Option<i32>] = &[None];
                 let s = Series::new(name, vals).cast(dtype)?;
-                cols.push(s.expand_at_index(0, max_len))
+                cols.push(s.new_from_index(0, max_len))
             }
         }
         DataFrame::new(cols)

diff --git a/polars/polars-core/src/frame/mod.rs b/polars/polars-core/src/frame/mod.rs
@@ -1115,7 +1115,7 @@ impl DataFrame {
         fn inner(df: &mut DataFrame, mut series: Series) -> PolarsResult<&mut DataFrame> {
             let height = df.height();
             if series.len() == 1 && height > 1 {
-                series = series.expand_at_index(0, height);
+                series = series.new_from_index(0, height);
             }
 
             if series.len() == height || df.is_empty() {
@@ -1169,7 +1169,7 @@ impl DataFrame {
 
         let height = self.height();
         if series.len() == 1 && height > 1 {
-            series = series.expand_at_index(0, height);
+            series = series.new_from_index(0, height);
         }
 
         if series.len() == height || self.is_empty() {
@@ -2042,7 +2042,7 @@ impl DataFrame {
         let new_col = f(col).into_series();
         match new_col.len() {
             1 => {
-                let new_col = new_col.expand_at_index(0, df_height);
+                let new_col = new_col.new_from_index(0, df_height);
                 let _ = mem::replace(col, new_col);
             }
             len if (len == df_height) => {

diff --git a/polars/polars-core/src/functions.rs b/polars/polars-core/src/functions.rs
@@ -156,7 +156,7 @@ pub fn concat_str(s: &[Series], delimiter: &str) -> PolarsResult<Utf8Chunked> {
             let mut ca = s.utf8()?.clone();
             // broadcast
             if ca.len() == 1 && len > 1 {
-                ca = ca.expand_at_index(0, len)
+                ca = ca.new_from_index(0, len)
             }
 
             Ok(ca)

diff --git a/polars/polars-core/src/series/implementations/binary.rs b/polars/polars-core/src/series/implementations/binary.rs
@@ -227,8 +227,8 @@ impl SeriesTrait for SeriesWrap<BinaryChunked> {
         self.0.rechunk().into_series()
     }
 
-    fn expand_at_index(&self, index: usize, length: usize) -> Series {
-        ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
+    fn new_from_index(&self, index: usize, length: usize) -> Series {
+        ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
     }
 
     fn cast(&self, data_type: &DataType) -> PolarsResult<Series> {

diff --git a/polars/polars-core/src/series/implementations/boolean.rs b/polars/polars-core/src/series/implementations/boolean.rs
@@ -237,8 +237,8 @@ impl SeriesTrait for SeriesWrap<BooleanChunked> {
         self.0.rechunk().into_series()
     }
 
-    fn expand_at_index(&self, index: usize, length: usize) -> Series {
-        ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
+    fn new_from_index(&self, index: usize, length: usize) -> Series {
+        ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
     }
 
     fn cast(&self, data_type: &DataType) -> PolarsResult<Series> {

diff --git a/polars/polars-core/src/series/implementations/categorical.rs b/polars/polars-core/src/series/implementations/categorical.rs
@@ -285,8 +285,8 @@ impl SeriesTrait for SeriesWrap<CategoricalChunked> {
         self.with_state(true, |ca| ca.rechunk()).into_series()
     }
 
-    fn expand_at_index(&self, index: usize, length: usize) -> Series {
-        self.with_state(true, |cats| cats.expand_at_index(index, length))
+    fn new_from_index(&self, index: usize, length: usize) -> Series {
+        self.with_state(true, |cats| cats.new_from_index(index, length))
             .into_series()
     }
 

diff --git a/polars/polars-core/src/series/implementations/dates_time.rs b/polars/polars-core/src/series/implementations/dates_time.rs
@@ -326,9 +326,9 @@ macro_rules! impl_dyn_series {
                 self.0.rechunk().$into_logical().into_series()
             }
 
-            fn expand_at_index(&self, index: usize, length: usize) -> Series {
+            fn new_from_index(&self, index: usize, length: usize) -> Series {
                 self.0
-                    .expand_at_index(index, length)
+                    .new_from_index(index, length)
                     .$into_logical()
                     .into_series()
             }

diff --git a/polars/polars-core/src/series/implementations/datetime.rs b/polars/polars-core/src/series/implementations/datetime.rs
@@ -352,9 +352,9 @@ impl SeriesTrait for SeriesWrap<DatetimeChunked> {
             .into_series()
     }
 
-    fn expand_at_index(&self, index: usize, length: usize) -> Series {
+    fn new_from_index(&self, index: usize, length: usize) -> Series {
         self.0
-            .expand_at_index(index, length)
+            .new_from_index(index, length)
             .into_datetime(self.0.time_unit(), self.0.time_zone().clone())
             .into_series()
     }

diff --git a/polars/polars-core/src/series/implementations/duration.rs b/polars/polars-core/src/series/implementations/duration.rs
@@ -369,9 +369,9 @@ impl SeriesTrait for SeriesWrap<DurationChunked> {
             .into_series()
     }
 
-    fn expand_at_index(&self, index: usize, length: usize) -> Series {
+    fn new_from_index(&self, index: usize, length: usize) -> Series {
         self.0
-            .expand_at_index(index, length)
+            .new_from_index(index, length)
             .into_duration(self.0.time_unit())
             .into_series()
     }

diff --git a/polars/polars-core/src/series/implementations/floats.rs b/polars/polars-core/src/series/implementations/floats.rs
@@ -293,8 +293,8 @@ macro_rules! impl_dyn_series {
                 self.0.rechunk().into_series()
             }
 
-            fn expand_at_index(&self, index: usize, length: usize) -> Series {
-                ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
+            fn new_from_index(&self, index: usize, length: usize) -> Series {
+                ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
             }
 
             fn cast(&self, data_type: &DataType) -> PolarsResult<Series> {

diff --git a/polars/polars-core/src/series/implementations/list.rs b/polars/polars-core/src/series/implementations/list.rs
@@ -159,8 +159,8 @@ impl SeriesTrait for SeriesWrap<ListChunked> {
         self.0.rechunk().into_series()
     }
 
-    fn expand_at_index(&self, index: usize, length: usize) -> Series {
-        ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
+    fn new_from_index(&self, index: usize, length: usize) -> Series {
+        ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
     }
 
     fn cast(&self, data_type: &DataType) -> PolarsResult<Series> {

diff --git a/polars/polars-core/src/series/implementations/mod.rs b/polars/polars-core/src/series/implementations/mod.rs
@@ -381,8 +381,8 @@ macro_rules! impl_dyn_series {
                 self.0.rechunk().into_series()
             }
 
-            fn expand_at_index(&self, index: usize, length: usize) -> Series {
-                ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
+            fn new_from_index(&self, index: usize, length: usize) -> Series {
+                ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
             }
 
             fn cast(&self, data_type: &DataType) -> PolarsResult<Series> {

diff --git a/polars/polars-core/src/series/implementations/object.rs b/polars/polars-core/src/series/implementations/object.rs
@@ -173,8 +173,8 @@ where
         self.0.take_every(n).into_series()
     }
 
-    fn expand_at_index(&self, index: usize, length: usize) -> Series {
-        ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
+    fn new_from_index(&self, index: usize, length: usize) -> Series {
+        ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
     }
 
     fn cast(&self, _data_type: &DataType) -> PolarsResult<Series> {

diff --git a/polars/polars-core/src/series/implementations/struct_.rs b/polars/polars-core/src/series/implementations/struct_.rs
@@ -235,9 +235,9 @@ impl SeriesTrait for SeriesWrap<StructChunked> {
         out.into_series()
     }
 
-    fn expand_at_index(&self, index: usize, length: usize) -> Series {
+    fn new_from_index(&self, index: usize, length: usize) -> Series {
         self.0
-            .apply_fields(|s| s.expand_at_index(index, length))
+            .apply_fields(|s| s.new_from_index(index, length))
             .into_series()
     }
 

diff --git a/polars/polars-core/src/series/implementations/utf8.rs b/polars/polars-core/src/series/implementations/utf8.rs
@@ -227,8 +227,8 @@ impl SeriesTrait for SeriesWrap<Utf8Chunked> {
         self.0.rechunk().into_series()
     }
 
-    fn expand_at_index(&self, index: usize, length: usize) -> Series {
-        ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
+    fn new_from_index(&self, index: usize, length: usize) -> Series {
+        ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
     }
 
     fn cast(&self, data_type: &DataType) -> PolarsResult<Series> {

diff --git a/polars/polars-core/src/series/ops/extend.rs b/polars/polars-core/src/series/ops/extend.rs
@@ -17,7 +17,7 @@ impl Series {
             dt => panic!("{:?} not supported", dt),
         };
         let s = s.cast(self.dtype())?;
-        let to_append = s.expand_at_index(0, n);
+        let to_append = s.new_from_index(0, n);
 
         let mut out = self.clone();
         out.append(&to_append)?;

diff --git a/polars/polars-core/src/series/series_trait.rs b/polars/polars-core/src/series/series_trait.rs
@@ -381,17 +381,17 @@ pub trait SeriesTrait:
         None
     }
 
-    /// Create a new Series filled with values at that index.
+    /// Create a new Series filled with values from the given index.
     ///
     /// # Example
     ///
     /// ```rust
     /// use polars_core::prelude::*;
     /// let s = Series::new("a", [0i32, 1, 8]);
-    /// let expanded = s.expand_at_index(2, 4);
-    /// assert_eq!(Vec::from(expanded.i32().unwrap()), &[Some(8), Some(8), Some(8), Some(8)])
+    /// let s2 = s.new_from_index(2, 4);
+    /// assert_eq!(Vec::from(s2.i32().unwrap()), &[Some(8), Some(8), Some(8), Some(8)])
     /// ```
-    fn expand_at_index(&self, _index: usize, _length: usize) -> Series {
+    fn new_from_index(&self, _index: usize, _length: usize) -> Series {
         invalid_operation_panic!(self)
     }