extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-05-31 23:26:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove Record::drain

Browse Source
This commit is contained in:
Ian Manske 2024-04-22 19:52:52 -04:00
parent ec43f449fb
commit a01097b11b
2 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-command/src/filters/drop/column.rs
View File

@ -144,7 +144,9 @@ fn drop_cols(
fn drop_cols_set(val: &mut Value, head: Span, drop: usize) -> Result<HashSet<String>, ShellError> {
if let Value::Record { val: record, .. } = val {
let len = record.len().saturating_sub(drop);
Ok(record.drain(len..).map(|(col, _)| col).collect())
let set = record.columns().skip(len).cloned().collect();
record.truncate(len);
Ok(set)
} else {
Err(unsupported_value_error(val, head))
}

72
crates/nu-protocol/src/value/record.rs
View File

@ -1,7 +1,7 @@
use crate::{ShellError, Span, Value};
use ecow::EcoVec;
use serde::{de::Visitor, ser::SerializeMap, Deserialize, Serialize};
use std::{iter::FusedIterator, ops::RangeBounds};
use std::iter::FusedIterator;
#[derive(Debug, Clone, Default)]
pub struct Record {
@ -258,14 +258,14 @@ impl Record {
/// assert_eq!(rec_iter.next(), Some(("a".into(), Value::test_nothing())));
/// assert_eq!(rec_iter.next(), None);
/// ```
pub fn drain<R>(&mut self, range: R) -> Drain
where
R: RangeBounds<usize> + Clone,
{
Drain {
iter: self.inner[(range.start_bound().cloned(), range.end_bound().cloned())].iter(),
}
}
// pub fn drain<R>(&mut self, range: R) -> Drain
// where
// R: RangeBounds<usize> + Clone,
// {
// Drain {
// iter: self.inner.drain(range)
// }
// }
/// Sort the record by its columns.
///
@ -630,39 +630,39 @@ impl ExactSizeIterator for IntoValues {
impl FusedIterator for IntoValues {}
pub struct Drain<'a> {
iter: std::slice::Iter<'a, (String, Value)>,
}
// pub struct Drain<'a> {
// iter: std::slice::Iter<'a, (String, Value)>,
// }
impl Iterator for Drain<'_> {
type Item = (String, Value);
// impl Iterator for Drain<'_> {
// type Item = (String, Value);
fn next(&mut self) -> Option<Self::Item> {
self.iter
.next()
.map(|(col, val)| (col.clone(), val.clone()))
}
// fn next(&mut self) -> Option<Self::Item> {
// self.iter
// .next()
// .map(|(col, val)| (col.clone(), val.clone()))
// }
fn size_hint(&self) -> (usize, Option<usize>) {
self.iter.size_hint()
}
}
// fn size_hint(&self) -> (usize, Option<usize>) {
// self.iter.size_hint()
// }
// }
impl DoubleEndedIterator for Drain<'_> {
fn next_back(&mut self) -> Option<Self::Item> {
self.iter
.next_back()
.map(|(col, val)| (col.clone(), val.clone()))
}
}
// impl DoubleEndedIterator for Drain<'_> {
// fn next_back(&mut self) -> Option<Self::Item> {
// self.iter
// .next_back()
// .map(|(col, val)| (col.clone(), val.clone()))
// }
// }
impl ExactSizeIterator for Drain<'_> {
fn len(&self) -> usize {
self.iter.len()
}
}
// impl ExactSizeIterator for Drain<'_> {
// fn len(&self) -> usize {
// self.iter.len()
// }
// }
impl FusedIterator for Drain<'_> {}
// impl FusedIterator for Drain<'_> {}
#[macro_export]
macro_rules! record {