From ffd8e958fc8a114dd592763b144c045df6010573 Mon Sep 17 00:00:00 2001
From: Micha Reiser <micha@famreiser.ch>
Date: Wed, 22 Feb 2023 16:03:17 +0100
Subject: [PATCH] chore: Upgrade Rust to 1.67.0 (#3125)

---
 Cargo.toml                                 | 2 +-
 crates/ruff_formatter/src/builders.rs      | 2 +-
 crates/ruff_formatter/src/lib.rs           | 2 +-
 crates/ruff_python_formatter/src/lib.rs    | 2 +-
 crates/ruff_python_formatter/src/trivia.rs | 2 +-
 crates/ruff_text_size/src/serde_impls.rs   | 3 +--
 rust-toolchain                             | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2d80206f07..9b948aed93 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ members = ["crates/*"]
 
 [workspace.package]
 edition = "2021"
-rust-version = "1.65.0"
+rust-version = "1.67.0"
 
 [workspace.dependencies]
 anyhow = { version = "1.0.66" }
diff --git a/crates/ruff_formatter/src/builders.rs b/crates/ruff_formatter/src/builders.rs
index c00d54d498..057e92fcf1 100644
--- a/crates/ruff_formatter/src/builders.rs
+++ b/crates/ruff_formatter/src/builders.rs
@@ -333,7 +333,7 @@ impl std::fmt::Debug for StaticTextSlice {
 }
 
 fn debug_assert_no_newlines(text: &str) {
-    debug_assert!(!text.contains('\r'), "The content '{}' contains an unsupported '\\r' line terminator character but text must only use line feeds '\\n' as line separator. Use '\\n' instead of '\\r' and '\\r\\n' to insert a line break in strings.", text);
+    debug_assert!(!text.contains('\r'), "The content '{text}' contains an unsupported '\\r' line terminator character but text must only use line feeds '\\n' as line separator. Use '\\n' instead of '\\r' and '\\r\\n' to insert a line break in strings.");
 }
 
 /// Pushes some content to the end of the current line
diff --git a/crates/ruff_formatter/src/lib.rs b/crates/ruff_formatter/src/lib.rs
index 2975c817f3..d350705c5b 100644
--- a/crates/ruff_formatter/src/lib.rs
+++ b/crates/ruff_formatter/src/lib.rs
@@ -101,7 +101,7 @@ impl std::fmt::Display for IndentStyle {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             IndentStyle::Tab => std::write!(f, "Tab"),
-            IndentStyle::Space(size) => std::write!(f, "Spaces, size: {}", size),
+            IndentStyle::Space(size) => std::write!(f, "Spaces, size: {size}"),
         }
     }
 }
diff --git a/crates/ruff_python_formatter/src/lib.rs b/crates/ruff_python_formatter/src/lib.rs
index b84ad15d9d..5c0a249899 100644
--- a/crates/ruff_python_formatter/src/lib.rs
+++ b/crates/ruff_python_formatter/src/lib.rs
@@ -103,7 +103,7 @@ mod tests {
 
             let snapshot_path = Path::new(&workspace_path)
                 .join("src/snapshots")
-                .join(&format!(
+                .join(format!(
                     "{module_path}__{}.snap",
                     snapshot_name.replace(&['/', '\\'][..], "__")
                 ));
diff --git a/crates/ruff_python_formatter/src/trivia.rs b/crates/ruff_python_formatter/src/trivia.rs
index fbfe3864f1..1bed6d98f5 100644
--- a/crates/ruff_python_formatter/src/trivia.rs
+++ b/crates/ruff_python_formatter/src/trivia.rs
@@ -757,7 +757,7 @@ pub struct TriviaIndex {
     pub withitem: FxHashMap<usize, Vec<Trivia>>,
 }
 
-fn add_comment<'a>(comment: Trivia, node: &Node<'a>, trivia: &mut TriviaIndex) {
+fn add_comment(comment: Trivia, node: &Node, trivia: &mut TriviaIndex) {
     match node {
         Node::Mod(_) => {}
         Node::Stmt(node) => {
diff --git a/crates/ruff_text_size/src/serde_impls.rs b/crates/ruff_text_size/src/serde_impls.rs
index a94bee9567..b6885d674a 100644
--- a/crates/ruff_text_size/src/serde_impls.rs
+++ b/crates/ruff_text_size/src/serde_impls.rs
@@ -39,8 +39,7 @@ impl<'de> Deserialize<'de> for TextRange {
         let (start, end) = Deserialize::deserialize(deserializer)?;
         if !(start <= end) {
             return Err(de::Error::custom(format!(
-                "invalid range: {:?}..{:?}",
-                start, end
+                "invalid range: {start:?}..{end:?}"
             )));
         }
         Ok(TextRange::new(start, end))
diff --git a/rust-toolchain b/rust-toolchain
index 902c74186f..65ee095984 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.65.0
+1.67.0