diff --git a/Cargo.lock b/Cargo.lock index 9b51b5b6cf..77ffccf5b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -680,11 +680,6 @@ name = "countme" version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" -dependencies = [ - "dashmap 5.5.3", - "once_cell", - "rustc-hash 1.1.0", -] [[package]] name = "cpufeatures" @@ -852,19 +847,6 @@ dependencies = [ "syn", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - [[package]] name = "dashmap" version = "6.1.0" @@ -2262,7 +2244,7 @@ dependencies = [ "once_cell", "pep440_rs", "regex", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "smallvec", "thiserror 1.0.69", @@ -2772,7 +2754,7 @@ dependencies = [ "ruff_source_file", "ruff_text_size", "ruff_workspace", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde_json", "shellexpand", @@ -2818,7 +2800,7 @@ dependencies = [ "ruff_python_formatter", "ruff_python_parser", "ruff_python_trivia", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde_json", "tikv-jemallocator", @@ -2847,7 +2829,7 @@ dependencies = [ "arc-swap", "camino", "countme", - "dashmap 6.1.0", + "dashmap", "dunce", "etcetera", "filetime", @@ -2866,7 +2848,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash 2.1.1", + "rustc-hash", "salsa", "schemars", "serde", @@ -2940,7 +2922,7 @@ dependencies = [ "ruff_cache", "ruff_macros", "ruff_text_size", - "rustc-hash 2.1.1", + "rustc-hash", "schemars", "serde", "static_assertions", @@ -3022,7 +3004,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash 2.1.1", + "rustc-hash", "schemars", "serde", "serde_json", @@ -3094,7 +3076,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash 2.1.1", + "rustc-hash", "salsa", "schemars", "serde", @@ -3144,7 +3126,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash 2.1.1", + "rustc-hash", "salsa", "schemars", "serde", @@ -3193,7 +3175,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde_json", "static_assertions", @@ -3217,7 +3199,7 @@ dependencies = [ "ruff_python_parser", "ruff_python_stdlib", "ruff_text_size", - "rustc-hash 2.1.1", + "rustc-hash", "schemars", "serde", "smallvec", @@ -3278,7 +3260,7 @@ dependencies = [ "ruff_source_file", "ruff_text_size", "ruff_workspace", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde_json", "shellexpand", @@ -3367,7 +3349,7 @@ dependencies = [ "ruff_python_semantic", "ruff_python_stdlib", "ruff_source_file", - "rustc-hash 2.1.1", + "rustc-hash", "schemars", "serde", "shellexpand", @@ -3386,12 +3368,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.1.1" @@ -3446,7 +3422,7 @@ dependencies = [ "parking_lot", "portable-atomic", "rayon", - "rustc-hash 2.1.1", + "rustc-hash", "salsa-macro-rules", "salsa-macros", "smallvec", @@ -4144,7 +4120,6 @@ dependencies = [ "clap", "clap_complete_command", "colored 3.0.0", - "countme", "crossbeam", "ctrlc", "dunce", @@ -4181,7 +4156,7 @@ dependencies = [ "ruff_python_ast", "ruff_python_parser", "ruff_text_size", - "rustc-hash 2.1.1", + "rustc-hash", "salsa", "smallvec", "tracing", @@ -4213,7 +4188,7 @@ dependencies = [ "ruff_python_ast", "ruff_python_formatter", "ruff_text_size", - "rustc-hash 2.1.1", + "rustc-hash", "salsa", "schemars", "serde", @@ -4234,7 +4209,6 @@ dependencies = [ "camino", "colored 3.0.0", "compact_str", - "countme", "dir-test", "drop_bomb", "get-size2", @@ -4258,7 +4232,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash 2.1.1", + "rustc-hash", "salsa", "schemars", "serde", @@ -4290,7 +4264,7 @@ dependencies = [ "ruff_notebook", "ruff_source_file", "ruff_text_size", - "rustc-hash 2.1.1", + "rustc-hash", "salsa", "serde", "serde_json", @@ -4328,7 +4302,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash 2.1.1", + "rustc-hash", "rustc-stable-hash", "salsa", "serde", diff --git a/crates/ty/Cargo.toml b/crates/ty/Cargo.toml index 719559baf0..14538eea2f 100644 --- a/crates/ty/Cargo.toml +++ b/crates/ty/Cargo.toml @@ -26,7 +26,6 @@ argfile = { workspace = true } clap = { workspace = true, features = ["wrap_help", "string", "env"] } clap_complete_command = { workspace = true } colored = { workspace = true } -countme = { workspace = true, features = ["enable"] } crossbeam = { workspace = true } ctrlc = { version = "3.4.4" } indicatif = { workspace = true } diff --git a/crates/ty/src/lib.rs b/crates/ty/src/lib.rs index a4670eee5c..6da471e2ad 100644 --- a/crates/ty/src/lib.rs +++ b/crates/ty/src/lib.rs @@ -59,7 +59,6 @@ fn run_check(args: CheckCommand) -> anyhow::Result { set_colored_override(args.color); let verbosity = args.verbosity.level(); - countme::enable(verbosity.is_trace()); let _guard = setup_tracing(verbosity, args.color.unwrap_or_default())?; tracing::warn!( @@ -152,8 +151,6 @@ fn run_check(args: CheckCommand) -> anyhow::Result { _ => {} } - tracing::trace!("Counts for entire CLI run:\n{}", countme::get_all()); - std::mem::forget(db); if exit_zero { @@ -353,8 +350,6 @@ impl MainLoop { "Discarding check result for outdated revision: current: {revision}, result revision: {check_revision}" ); } - - tracing::trace!("Counts after last check:\n{}", countme::get_all()); } MainLoopMessage::ApplyChanges(changes) => { diff --git a/crates/ty_python_semantic/Cargo.toml b/crates/ty_python_semantic/Cargo.toml index 7c914c29c4..3550ce0e9b 100644 --- a/crates/ty_python_semantic/Cargo.toml +++ b/crates/ty_python_semantic/Cargo.toml @@ -29,7 +29,6 @@ bitflags = { workspace = true } camino = { workspace = true } colored = { workspace = true } compact_str = { workspace = true } -countme = { workspace = true } drop_bomb = { workspace = true } get-size2 = { workspace = true } indexmap = { workspace = true } diff --git a/crates/ty_python_semantic/src/semantic_index/builder.rs b/crates/ty_python_semantic/src/semantic_index/builder.rs index f735b4f785..4d2cb57c84 100644 --- a/crates/ty_python_semantic/src/semantic_index/builder.rs +++ b/crates/ty_python_semantic/src/semantic_index/builder.rs @@ -259,7 +259,7 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> { .push(UseDefMapBuilder::new(is_class_scope)); let ast_id_scope = self.ast_ids.push(AstIdsBuilder::default()); - let scope_id = ScopeId::new(self.db, self.file, file_scope_id, countme::Count::default()); + let scope_id = ScopeId::new(self.db, self.file, file_scope_id); self.scope_ids_by_scope.push(scope_id); let previous = self.scopes_by_node.insert(node.node_key(), file_scope_id); @@ -495,7 +495,6 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> { place, kind, is_reexported, - countme::Count::default(), ); let num_definitions = { @@ -731,7 +730,6 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> { subject, kind, guard, - countme::Count::default(), ); let predicate = PredicateOrLiteral::Predicate(Predicate { node: PredicateNode::Pattern(pattern_predicate), @@ -781,7 +779,6 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> { AstNodeRef::new(self.module, expression_node), assigned_to.map(|assigned_to| AstNodeRef::new(self.module, assigned_to)), expression_kind, - countme::Count::default(), ); self.expressions_by_node .insert(expression_node.into(), expression); @@ -986,7 +983,6 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> { // Note `target` belongs to the `self.module` tree AstNodeRef::new(self.module, target), UnpackValue::new(unpackable.kind(), value), - countme::Count::default(), )); Some(unpackable.as_current_assignment(unpack)) } diff --git a/crates/ty_python_semantic/src/semantic_index/definition.rs b/crates/ty_python_semantic/src/semantic_index/definition.rs index 2175012cd6..c66daa78a8 100644 --- a/crates/ty_python_semantic/src/semantic_index/definition.rs +++ b/crates/ty_python_semantic/src/semantic_index/definition.rs @@ -40,8 +40,6 @@ pub struct Definition<'db> { /// This is a dedicated field to avoid accessing `kind` to compute this value. pub(crate) is_reexported: bool, - - count: countme::Count>, } // The Salsa heap is tracked separately. diff --git a/crates/ty_python_semantic/src/semantic_index/expression.rs b/crates/ty_python_semantic/src/semantic_index/expression.rs index 476255d6d5..99200c89cc 100644 --- a/crates/ty_python_semantic/src/semantic_index/expression.rs +++ b/crates/ty_python_semantic/src/semantic_index/expression.rs @@ -58,8 +58,6 @@ pub(crate) struct Expression<'db> { /// Should this expression be inferred as a normal expression or a type expression? pub(crate) kind: ExpressionKind, - - count: countme::Count>, } // The Salsa heap is tracked separately. diff --git a/crates/ty_python_semantic/src/semantic_index/place.rs b/crates/ty_python_semantic/src/semantic_index/place.rs index 3ba61fddf0..5f0d281a8c 100644 --- a/crates/ty_python_semantic/src/semantic_index/place.rs +++ b/crates/ty_python_semantic/src/semantic_index/place.rs @@ -441,8 +441,6 @@ pub struct ScopeId<'db> { pub file: File, pub file_scope_id: FileScopeId, - - count: countme::Count>, } // The Salsa heap is tracked separately. diff --git a/crates/ty_python_semantic/src/semantic_index/predicate.rs b/crates/ty_python_semantic/src/semantic_index/predicate.rs index 499fc9fac6..3b67e5871e 100644 --- a/crates/ty_python_semantic/src/semantic_index/predicate.rs +++ b/crates/ty_python_semantic/src/semantic_index/predicate.rs @@ -138,8 +138,6 @@ pub(crate) struct PatternPredicate<'db> { pub(crate) kind: PatternPredicateKind<'db>, pub(crate) guard: Option>, - - count: countme::Count>, } // The Salsa heap is tracked separately. diff --git a/crates/ty_python_semantic/src/unpack.rs b/crates/ty_python_semantic/src/unpack.rs index 8a3a5d3a57..42823aa628 100644 --- a/crates/ty_python_semantic/src/unpack.rs +++ b/crates/ty_python_semantic/src/unpack.rs @@ -44,8 +44,6 @@ pub(crate) struct Unpack<'db> { /// The ingredient representing the value expression of the unpacking. For example, in /// `(a, b) = (1, 2)`, the value expression is `(1, 2)`. pub(crate) value: UnpackValue<'db>, - - count: countme::Count>, } impl<'db> Unpack<'db> {