language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-30 22:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Switch SourceCodeGenerator.buffer from Vec<u8> to String (#1702)

Browse source 
This is the real issue underneath the `unsafe`/`unwrap` quandry in
#1677.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2023-01-06 17:26:23 -08:00 • committed by GitHub
parent dd35e724dd
commit c39f687fca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/source_code_generator.rs
View file

@ -1,6 +1,6 @@
//! Generate Python source code from an abstract syntax tree (AST). //! Generate Python source code from an abstract syntax tree (AST).
use std::fmt; use std::fmt::{self, Write};
use std::ops::Deref; use std::ops::Deref;
use rustpython_ast::{Excepthandler, ExcepthandlerKind, Suite, Withitem}; use rustpython_ast::{Excepthandler, ExcepthandlerKind, Suite, Withitem};
@ -37,7 +37,7 @@ pub struct SourceCodeGenerator<'a> {
quote: &'a Quote, quote: &'a Quote,
/// The line ending to use. /// The line ending to use.
line_ending: &'a LineEnding, line_ending: &'a LineEnding,
buffer: Vec<u8>, buffer: String,
indent_depth: usize, indent_depth: usize,
num_newlines: usize, num_newlines: usize,
initial: bool, initial: bool,
@ -49,7 +49,7 @@ impl<'a> From<&'a SourceCodeStyleDetector<'a>> for SourceCodeGenerator<'a> {
indent: stylist.indentation(), indent: stylist.indentation(),
quote: stylist.quote(), quote: stylist.quote(),
line_ending: stylist.line_ending(), line_ending: stylist.line_ending(),
buffer: Vec::new(), buffer: String::new(),
indent_depth: 0, indent_depth: 0,
num_newlines: 0, num_newlines: 0,
initial: true, initial: true,
@ -65,7 +65,7 @@ impl<'a> SourceCodeGenerator<'a> {
quote, quote,
line_ending, line_ending,
// Internal state. // Internal state.
buffer: vec![], buffer: String::new(),
indent_depth: 0, indent_depth: 0,
num_newlines: 0, num_newlines: 0,
initial: true, initial: true,
@ -73,7 +73,7 @@ impl<'a> SourceCodeGenerator<'a> {
} }
pub fn generate(self) -> String { pub fn generate(self) -> String {
String::from_utf8(self.buffer).expect("Generated source code is not valid UTF-8") self.buffer
} }
fn newline(&mut self) { fn newline(&mut self) {
@ -99,11 +99,11 @@ impl<'a> SourceCodeGenerator<'a> {
fn p(&mut self, s: &str) { fn p(&mut self, s: &str) {
if self.num_newlines > 0 { if self.num_newlines > 0 {
for _ in 0..self.num_newlines { for _ in 0..self.num_newlines {
self.buffer.extend(self.line_ending.as_bytes()); self.buffer += self.line_ending;
} }
self.num_newlines = 0; self.num_newlines = 0;
} }
self.buffer.extend(s.as_bytes()); self.buffer += s;
} }
fn p_if(&mut self, cond: bool, s: &str) { fn p_if(&mut self, cond: bool, s: &str) {
@ -117,7 +117,7 @@ impl<'a> SourceCodeGenerator<'a> {
} }
fn write_fmt(&mut self, f: fmt::Arguments<'_>) { fn write_fmt(&mut self, f: fmt::Arguments<'_>) {
self.buffer.extend(format!("{f}").as_bytes()); self.buffer.write_fmt(f).unwrap();
} }
pub fn unparse_suite<U>(&mut self, suite: &Suite<U>) { pub fn unparse_suite<U>(&mut self, suite: &Suite<U>) {
@ -964,21 +964,19 @@ impl<'a> SourceCodeGenerator<'a> {
fn unparse_formatted<U>(&mut self, val: &Expr<U>, conversion: usize, spec: Option<&Expr<U>>) { fn unparse_formatted<U>(&mut self, val: &Expr<U>, conversion: usize, spec: Option<&Expr<U>>) {
let mut generator = SourceCodeGenerator::new(self.indent, self.quote, self.line_ending); let mut generator = SourceCodeGenerator::new(self.indent, self.quote, self.line_ending);
generator.unparse_expr(val, precedence::TEST + 1); generator.unparse_expr(val, precedence::TEST + 1);
let brace = if generator.buffer.starts_with("{".as_bytes()) { let brace = if generator.buffer.starts_with('{') {
// put a space to avoid escaping the bracket // put a space to avoid escaping the bracket
"{ " "{ "
} else { } else {
"{" "{"
}; };
self.p(brace); self.p(brace);
self.buffer.extend(generator.buffer); self.buffer += &generator.buffer;
if conversion != ConversionFlag::None as usize { if conversion != ConversionFlag::None as usize {
self.p("!"); self.p("!");
#[allow(clippy::cast_possible_truncation)] #[allow(clippy::cast_possible_truncation)]
let buf = &[conversion as u8]; self.p(&format!("{}", conversion as u8 as char));
let c = std::str::from_utf8(buf).unwrap();
self.p(c);
} }
if let Some(spec) = spec { if let Some(spec) = spec {
@ -1020,7 +1018,7 @@ impl<'a> SourceCodeGenerator<'a> {
self.p("f"); self.p("f");
let mut generator = SourceCodeGenerator::new(self.indent, self.quote, self.line_ending); let mut generator = SourceCodeGenerator::new(self.indent, self.quote, self.line_ending);
generator.unparse_fstring_body(values, is_spec); generator.unparse_fstring_body(values, is_spec);
let body = std::str::from_utf8(&generator.buffer).unwrap(); let body = &generator.buffer;
self.p(&format!("{}", str::repr(body, self.quote.into()))); self.p(&format!("{}", str::repr(body, self.quote.into())));
} }
} }