Upgrade thiserror for dtolnay/thiserror#239

astral-sh · Jul 7, 2023 · 1328d07 · 1328d07
1 parent 88a8203
commit 1328d07
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,7 +45,7 @@ strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 syn = { version = "2.0.15" }
 test-case = { version = "3.0.0" }
-thiserror = { version = "1.0.41" }
+thiserror = { version = "1.0.43" }
 toml = { version = "0.7.2" }
 
 # v0.0.1

diff --git a/crates/ruff/Cargo.toml b/crates/ruff/Cargo.toml
@@ -73,7 +73,7 @@ shellexpand = { workspace = true }
 smallvec = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
-thiserror = { version = "1.0.38" }
+thiserror = { version = "1.0.43" }
 toml = { workspace = true }
 typed-arena = { version = "2.0.2" }
 unicode-width = { version = "0.1.10" }

diff --git a/crates/ruff_python_formatter/src/lib.rs b/crates/ruff_python_formatter/src/lib.rs
@@ -7,10 +7,9 @@ use ruff_formatter::format_element::tag;
 use ruff_formatter::prelude::{
     dynamic_text, source_position, source_text_slice, text, ContainsNewlines, Formatter, Tag,
 };
-// `write!` aliased for https://github.com/dtolnay/thiserror/issues/239
 use ruff_formatter::{
-    format, normalize_newlines, write as ruff_write, Buffer, Format, FormatElement, FormatError,
-    FormatResult, PrintError,
+    format, normalize_newlines, write, Buffer, Format, FormatElement, FormatError, FormatResult,
+    PrintError,
 };
 use ruff_formatter::{Formatted, Printed, SourceCode};
 use ruff_python_ast::node::{AnyNodeRef, AstNode, NodeKind};
@@ -55,9 +54,9 @@ where
 
     /// Formats the node without comments. Ignores any suppression comments.
     fn fmt_node(&self, node: &N, f: &mut PyFormatter) -> FormatResult<()> {
-        ruff_write!(f, [source_position(node.start())])?;
+        write!(f, [source_position(node.start())])?;
         self.fmt_fields(node, f)?;
-        ruff_write!(f, [source_position(node.end())])
+        write!(f, [source_position(node.end())])
     }
 
     /// Formats the node's fields.
@@ -228,10 +227,10 @@ impl Format<PyFormatContext<'_>> for VerbatimText {
 
         match normalize_newlines(f.context().locator().slice(self.0), ['\r']) {
             Cow::Borrowed(_) => {
-                ruff_write!(f, [source_text_slice(self.0, ContainsNewlines::Detect)])?;
+                write!(f, [source_text_slice(self.0, ContainsNewlines::Detect)])?;
             }
             Cow::Owned(cleaned) => {
-                ruff_write!(
+                write!(
                     f,
                     [
                         dynamic_text(&cleaned, Some(self.0.start())),