Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ty] Remove `AssertUnwindSafe` requirement from `ProgressReporter` (#19637)

This commit is contained in:
Micha Reiser 2025-07-30 14:46:44 +02:00 committed by GitHub
parent feaedb1812
commit 70d4b271da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/ty_project/src/db.rs
View File

@ -1,5 +1,5 @@
use std::fmt::Formatter; use std::fmt::Formatter;
use std::panic::{AssertUnwindSafe, RefUnwindSafe}; use std::panic::RefUnwindSafe;
use std::sync::Arc; use std::sync::Arc;
use std::{cmp, fmt}; use std::{cmp, fmt};
@ -87,9 +87,7 @@ impl ProjectDatabase {
/// ///
/// [`set_check_mode`]: ProjectDatabase::set_check_mode /// [`set_check_mode`]: ProjectDatabase::set_check_mode
pub fn check(&self) -> Vec<Diagnostic> { pub fn check(&self) -> Vec<Diagnostic> {
let mut reporter = DummyReporter; self.project().check(self, &mut DummyReporter)
let reporter = AssertUnwindSafe(&mut reporter as &mut dyn ProgressReporter);
self.project().check(self, reporter)
} }
/// Checks the files in the project and its dependencies, using the given reporter. /// Checks the files in the project and its dependencies, using the given reporter.
@ -98,7 +96,6 @@ impl ProjectDatabase {
/// ///
/// [`set_check_mode`]: ProjectDatabase::set_check_mode /// [`set_check_mode`]: ProjectDatabase::set_check_mode
pub fn check_with_reporter(&self, reporter: &mut dyn ProgressReporter) -> Vec<Diagnostic> { pub fn check_with_reporter(&self, reporter: &mut dyn ProgressReporter) -> Vec<Diagnostic> {
let reporter = AssertUnwindSafe(reporter);
self.project().check(self, reporter) self.project().check(self, reporter)
} }

2
crates/ty_project/src/lib.rs
View File

@ -228,7 +228,7 @@ impl Project {
pub(crate) fn check( pub(crate) fn check(
self, self,
db: &ProjectDatabase, db: &ProjectDatabase,
mut reporter: AssertUnwindSafe<&mut dyn ProgressReporter>, reporter: &mut dyn ProgressReporter,
) -> Vec<Diagnostic> { ) -> Vec<Diagnostic> {
let project_span = tracing::debug_span!("Project::check"); let project_span = tracing::debug_span!("Project::check");
let _span = project_span.enter(); let _span = project_span.enter();