Update Rust toolchain to 1.88 and MSRV to 1.86 (astral-sh#19011)

Author: MichaReiser

Cargo.lock

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 # Please update rustfmt.toml when bumping the Rust edition
 edition = "2024"
-rust-version = "1.85"
+rust-version = "1.86"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -227,6 +227,7 @@ unnecessary_debug_formatting = "allow"  # too many instances, the display also d
 # Without the hashes we run into a `rustfmt` bug in some snapshot tests, see #13250
 needless_raw_string_hashes = "allow"
 # Disallowed restriction lints
+ignore_without_reason = "allow" # Too many exsisting instances, and there's no auto fix.
 print_stdout = "warn"
 print_stderr = "warn"
 dbg_macro = "warn"

Cargo.toml

@@ -68,6 +68,7 @@ ruff_linter = { workspace = true, features = ["clap", "test-rules"] }
 assert_fs = { workspace = true }
 # Avoid writing colored snapshots when running tests from the terminal
 colored = { workspace = true, features = ["no-color"] }
+dunce = { workspace = true }
 indoc = { workspace = true }
 insta = { workspace = true, features = ["filters", "json"] }
 insta-cmd = { workspace = true }

crates/ruff/Cargo.toml

@@ -612,7 +612,7 @@ fn extend_passed_via_config_argument() {
 #[test]
 fn nonexistent_extend_file() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = tempdir.path().canonicalize()?;
+    let project_dir = dunce::canonicalize(tempdir.path())?;
     fs::write(
         project_dir.join("ruff.toml"),
         r#"
@@ -653,7 +653,7 @@ extend = "ruff3.toml"
 #[test]
 fn circular_extend() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_path = tempdir.path().canonicalize()?;
+    let project_path = dunce::canonicalize(tempdir.path())?;
 
     fs::write(
         project_path.join("ruff.toml"),
@@ -698,7 +698,7 @@ extend = "ruff.toml"
 #[test]
 fn parse_error_extends() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_path = tempdir.path().canonicalize()?;
+    let project_path = dunce::canonicalize(tempdir.path())?;
 
     fs::write(
         project_path.join("ruff.toml"),
@@ -2130,7 +2130,7 @@ select = ["UP006"]
 #[test]
 fn requires_python_no_tool() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = tempdir.path().canonicalize()?;
+    let project_dir = dunce::canonicalize(tempdir.path())?;
     let ruff_toml = tempdir.path().join("pyproject.toml");
     fs::write(
         &ruff_toml,
@@ -2441,7 +2441,7 @@ requires-python = ">= 3.11"
 #[test]
 fn requires_python_no_tool_target_version_override() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = tempdir.path().canonicalize()?;
+    let project_dir = dunce::canonicalize(tempdir.path())?;
     let ruff_toml = tempdir.path().join("pyproject.toml");
     fs::write(
         &ruff_toml,
@@ -2752,7 +2752,7 @@ requires-python = ">= 3.11"
 #[test]
 fn requires_python_no_tool_with_check() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = tempdir.path().canonicalize()?;
+    let project_dir = dunce::canonicalize(tempdir.path())?;
     let ruff_toml = tempdir.path().join("pyproject.toml");
     fs::write(
         &ruff_toml,
@@ -2797,7 +2797,7 @@ requires-python = ">= 3.11"
 #[test]
 fn requires_python_ruff_toml_no_target_fallback() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = tempdir.path().canonicalize()?;
+    let project_dir = dunce::canonicalize(tempdir.path())?;
     let ruff_toml = tempdir.path().join("ruff.toml");
     fs::write(
         &ruff_toml,
@@ -3118,7 +3118,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_ruff_toml_no_target_fallback_check() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = tempdir.path().canonicalize()?;
+    let project_dir = dunce::canonicalize(tempdir.path())?;
     let ruff_toml = tempdir.path().join("ruff.toml");
     fs::write(
         &ruff_toml,
@@ -3173,7 +3173,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_pyproject_toml_above() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = tempdir.path().canonicalize()?;
+    let project_dir = dunce::canonicalize(tempdir.path())?;
     let outer_pyproject = tempdir.path().join("pyproject.toml");
     fs::write(
         &outer_pyproject,
@@ -3200,7 +3200,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
     )?;
 
-    let testpy_canon = testpy.canonicalize()?;
+    let testpy_canon = dunce::canonicalize(testpy)?;
 
     insta::with_settings!({
         filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/"),(r"(?m)^foo\\test","foo/test")]
@@ -3499,7 +3499,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_pyproject_toml_above_with_tool() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = tempdir.path().canonicalize()?;
+    let project_dir = dunce::canonicalize(tempdir.path())?;
     let outer_pyproject = tempdir.path().join("pyproject.toml");
     fs::write(
         &outer_pyproject,
@@ -3528,7 +3528,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
     )?;
 
-    let testpy_canon = testpy.canonicalize()?;
+    let testpy_canon = dunce::canonicalize(testpy)?;
 
     insta::with_settings!({
         filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/"),(r"foo\\","foo/")]
@@ -3827,7 +3827,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_ruff_toml_above() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = tempdir.path().canonicalize()?;
+    let project_dir = dunce::canonicalize(tempdir.path())?;
     let ruff_toml = tempdir.path().join("ruff.toml");
     fs::write(
         &ruff_toml,
@@ -3856,7 +3856,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
     )?;
 
-    let testpy_canon = testpy.canonicalize()?;
+    let testpy_canon = dunce::canonicalize(testpy)?;
 
     insta::with_settings!({
         filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
@@ -4441,7 +4441,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_extend_from_shared_config() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = tempdir.path().canonicalize()?;
+    let project_dir = dunce::canonicalize(tempdir.path())?;
     let ruff_toml = tempdir.path().join("ruff.toml");
     fs::write(
         &ruff_toml,
@@ -4479,7 +4479,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
     )?;
 
-    let testpy_canon = testpy.canonicalize()?;
+    let testpy_canon = dunce::canonicalize(testpy)?;
 
     insta::with_settings!({
         filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/")]

crates/ruff/tests/lint.rs

@@ -12,10 +12,8 @@ fn display_default_settings() -> anyhow::Result<()> {
 
     // Tempdir path's on macos are symlinks, which doesn't play nicely with
     // our snapshot filtering.
-    let project_dir = tempdir
-        .path()
-        .canonicalize()
-        .context("Failed to canonical tempdir path.")?;
+    let project_dir =
+        dunce::canonicalize(tempdir.path()).context("Failed to canonical tempdir path.")?;
 
     std::fs::write(
         project_dir.join("pyproject.toml"),

crates/ruff/tests/show_settings.rs

@@ -821,11 +821,7 @@ impl DisplaySourceAnnotation<'_> {
     // Length of this annotation as displayed in the stderr output
     fn len(&self) -> usize {
         // Account for usize underflows
-        if self.range.1 > self.range.0 {
-            self.range.1 - self.range.0
-        } else {
-            self.range.0 - self.range.1
-        }
+        self.range.1.abs_diff(self.range.0)
     }
 
     fn takes_space(&self) -> bool {

crates/ruff_annotate_snippets/src/renderer/display_list.rs

@@ -637,6 +637,22 @@ pub trait FileResolver {
     fn input(&self, file: File) -> Input;
 }
 
+impl<T> FileResolver for T
+where
+    T: Db,
+{
+    fn path(&self, file: File) -> &str {
+        relativize_path(self.system().current_directory(), file.path(self).as_str())
+    }
+
+    fn input(&self, file: File) -> Input {
+        Input {
+            text: source_text(self, file),
+            line_index: line_index(self, file),
+        }
+    }
+}
+
 impl FileResolver for &dyn Db {
     fn path(&self, file: File) -> &str {
         relativize_path(self.system().current_directory(), file.path(*self).as_str())
@@ -708,7 +724,6 @@ fn relativize_path<'p>(cwd: &SystemPath, path: &'p str) -> &'p str {
 #[cfg(test)]
 mod tests {
 
-    use crate::Upcast;
     use crate::diagnostic::{Annotation, DiagnosticId, Severity, Span};
     use crate::files::system_path_to_file;
     use crate::system::{DbWithWritableSystem, SystemPath};
@@ -2221,7 +2236,7 @@ watermelon
         ///
         /// (This will set the "printed" flag on `Diagnostic`.)
         fn render(&self, diag: &Diagnostic) -> String {
-            diag.display(&self.db.upcast(), &self.config).to_string()
+            diag.display(&self.db, &self.config).to_string()
         }
     }
 

crates/ruff_db/src/diagnostic/render.rs

@@ -36,12 +36,6 @@ pub trait Db: salsa::Database {
     fn python_version(&self) -> PythonVersion;
 }
 
-/// Trait for upcasting a reference to a base trait object.
-pub trait Upcast<T: ?Sized> {
-    fn upcast(&self) -> &T;
-    fn upcast_mut(&mut self) -> &mut T;
-}
-
 /// Returns the maximum number of tasks that ty is allowed
 /// to process in parallel.
 ///
@@ -76,11 +70,11 @@ pub trait RustDoc {
 mod tests {
     use std::sync::{Arc, Mutex};
 
+    use crate::Db;
     use crate::files::Files;
     use crate::system::TestSystem;
     use crate::system::{DbWithTestSystem, System};
     use crate::vendored::VendoredFileSystem;
-    use crate::{Db, Upcast};
 
     type Events = Arc<Mutex<Vec<salsa::Event>>>;
 
@@ -153,15 +147,6 @@ mod tests {
         }
     }
 
-    impl Upcast<dyn Db> for TestDb {
-        fn upcast(&self) -> &(dyn Db + 'static) {
-            self
-        }
-        fn upcast_mut(&mut self) -> &mut (dyn Db + 'static) {
-            self
-        }
-    }
-
     impl DbWithTestSystem for TestDb {
         fn test_system(&self) -> &TestSystem {
             &self.system

crates/ruff_db/src/lib.rs

@@ -212,7 +212,7 @@ impl Display for Error {
                 path: Some(path),
                 err,
             } => {
-                write!(f, "IO error for operation on {}: {}", path, err)
+                write!(f, "IO error for operation on {path}: {err}")
             }
             ErrorKind::Io { path: None, err } => err.fmt(f),
             ErrorKind::NonUtf8Path { path } => {

crates/ruff_db/src/system/walk_directory.rs

@@ -2,10 +2,10 @@ use anyhow::{Context, Result};
 use std::sync::Arc;
 use zip::CompressionMethod;
 
+use ruff_db::Db as SourceDb;
 use ruff_db::files::{File, Files};
 use ruff_db::system::{OsSystem, System, SystemPathBuf};
 use ruff_db::vendored::{VendoredFileSystem, VendoredFileSystemBuilder};
-use ruff_db::{Db as SourceDb, Upcast};
 use ruff_python_ast::PythonVersion;
 use ty_python_semantic::lint::{LintRegistry, RuleSelection};
 use ty_python_semantic::{
@@ -66,15 +66,6 @@ impl ModuleDb {
     }
 }
 
-impl Upcast<dyn SourceDb> for ModuleDb {
-    fn upcast(&self) -> &(dyn SourceDb + 'static) {
-        self
-    }
-    fn upcast_mut(&mut self) -> &mut (dyn SourceDb + 'static) {
-        self
-    }
-}
-
 #[salsa::db]
 impl SourceDb for ModuleDb {
     fn vendored(&self) -> &VendoredFileSystem {