mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-22 20:45:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use drain

Browse source
This commit is contained in:
harupy 2023-01-03 01:23:22 +09:00
parent 4222b13e6c
commit 39f410c909
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
parser/src/string_parser.rs
View file

@ -5,7 +5,7 @@ use crate::{
parser::parse_expression_located, parser::parse_expression_located,
token::StringKind, token::StringKind,
}; };
use std::{iter, mem, str}; use std::{iter, str};
/// unicode_name2 does not expose `MAX_NAME_LENGTH`, so we replicate that constant here, fix #3798 /// unicode_name2 does not expose `MAX_NAME_LENGTH`, so we replicate that constant here, fix #3798
pub const MAX_UNICODE_NAME: usize = 88; pub const MAX_UNICODE_NAME: usize = 88;
@ -365,10 +365,9 @@ impl<'a> StringParser<'a> {
'{' => { '{' => {
if !constant_piece.is_empty() { if !constant_piece.is_empty() {
spec_constructor.push(self.expr(ExprKind::Constant { spec_constructor.push(self.expr(ExprKind::Constant {
value: constant_piece.to_owned().into(), value: constant_piece.drain(..).collect::<String>().into(),
kind: None, kind: None,
})); }));
constant_piece.clear();
} }
let parsed_expr = self.parse_fstring(nested + 1)?; let parsed_expr = self.parse_fstring(nested + 1)?;
spec_constructor.extend(parsed_expr); spec_constructor.extend(parsed_expr);
@ -385,10 +384,9 @@ impl<'a> StringParser<'a> {
} }
if !constant_piece.is_empty() { if !constant_piece.is_empty() {
spec_constructor.push(self.expr(ExprKind::Constant { spec_constructor.push(self.expr(ExprKind::Constant {
value: constant_piece.to_owned().into(), value: constant_piece.drain(..).collect::<String>().into(),
kind: None, kind: None,
})); }));
constant_piece.clear();
} }
Ok(spec_constructor) Ok(spec_constructor)
} }
@ -418,7 +416,7 @@ impl<'a> StringParser<'a> {
} }
if !content.is_empty() { if !content.is_empty() {
values.push(self.expr(ExprKind::Constant { values.push(self.expr(ExprKind::Constant {
value: mem::take(&mut content).into(), value: content.drain(..).collect::<String>().into(),
kind: None, kind: None,
})); }));
} }