pyrefly 0.17.0__tar.gz → 0.18.0__tar.gz

{pyrefly-0.17.0 → pyrefly-0.18.0}/Cargo.lock

@@ -296,9 +296,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.24"
+version = "1.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7"
+checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951"
 dependencies = [
  "jobserver",
  "libc",
@@ -325,9 +325,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.38"
+version = "4.5.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
+checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -335,9 +335,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.38"
+version = "4.5.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
+checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51"
 dependencies = [
  "anstream",
  "anstyle",
@@ -548,7 +548,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.10",
+ "parking_lot_core 0.9.11",
 ]
 
 [[package]]
@@ -1274,9 +1274,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1290,7 +1290,7 @@ checksum = "fc989b5e3e04411250b5d1ce0d880e5de77b36703f3012d56acb43e6ff07f31b"
 dependencies = [
  "allocative",
  "atomic",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
 ]
 
 [[package]]
@@ -1524,12 +1524,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.10",
+ "parking_lot_core 0.9.11",
 ]
 
 [[package]]
@@ -1548,9 +1548,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1754,33 +1754,26 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "anstream",
  "anyhow",
  "append-only-vec",
- "argfile",
  "base64",
  "blake3",
- "bstr",
  "clap",
  "configparser",
- "const-str",
  "convert_case",
  "crossbeam-channel",
  "dupe",
  "enum-iterator",
  "equivalent",
- "glob",
- "human_bytes",
  "indicatif",
  "itertools 0.14.0",
  "jemallocator",
  "lock_free_hashtable",
  "lsp-server",
  "lsp-types",
- "memory-stats",
- "notify",
  "num-bigint",
  "num-traits",
  "parse-display",
@@ -1788,7 +1781,7 @@ dependencies = [
  "path-absolutize",
  "pretty_assertions",
  "pyrefly_derive",
- "rayon",
+ "pyrefly_util",
  "regex",
  "regex-syntax 0.7.5",
  "ruff_python_ast",
@@ -1808,10 +1801,8 @@ dependencies = [
  "tokio",
  "toml",
  "tracing",
- "tracing-subscriber",
  "vec1",
  "walkdir",
- "watchman_client",
  "which",
  "yansi",
  "zstd",
@@ -1826,6 +1817,39 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "pyrefly_util"
+version = "0.18.0"
+dependencies = [
+ "anstream",
+ "anyhow",
+ "argfile",
+ "bstr",
+ "const-str",
+ "dupe",
+ "equivalent",
+ "glob",
+ "human_bytes",
+ "itertools 0.14.0",
+ "lock_free_hashtable",
+ "memory-stats",
+ "notify",
+ "path-absolutize",
+ "pyrefly_derive",
+ "rayon",
+ "ruff_python_ast",
+ "ruff_text_size",
+ "serde",
+ "serde_json",
+ "starlark_map",
+ "static_assertions",
+ "tempfile",
+ "tracing",
+ "tracing-subscriber",
+ "vec1",
+ "watchman_client",
+]
+
 [[package]]
 name = "pyrefly_wasm"
 version = "0.0.0"
@@ -2573,7 +2597,7 @@ dependencies = [
  "bytes",
  "libc",
  "mio 1.0.4",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
@@ -2712,7 +2736,7 @@ dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "regex",
  "serde",
  "serde_json",

{pyrefly-0.17.0 → pyrefly-0.18.0}/Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["pyrefly", "pyrefly_derive"]
+members = ["pyrefly", "pyrefly_derive", "pyrefly_util"]
 resolver = "2"
 
 [workspace.package]

{pyrefly-0.17.0 → pyrefly-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrefly
-Version: 0.17.0
+Version: 0.18.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pyrefly-0.17.0 → pyrefly-0.18.0}/pyrefly/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly"
-version = "0.17.0"
+version = "0.18.0"
 authors = ["Meta"]
 edition = "2021"
 repository = "https://github.com/facebook/pyrefly"
@@ -22,34 +22,27 @@ edition = "2024"
 anstream = "0.6.11"
 anyhow = "1.0.95"
 append-only-vec = "0.1.2"
-argfile = "0.1.6"
 base64 = { version = "0.21", features = ["alloc"] }
 blake3 = { version = "=1.5.5", features = ["mmap", "rayon", "traits-preview"] }
-bstr = { version = "1.10.0", features = ["serde", "std", "unicode"] }
 clap = { version = "4.5.38", features = ["derive", "env", "string", "unicode", "wrap_help"] }
 configparser = { version = "3.0.3", features = ["indexmap"] }
-const-str = "0.4.3"
 convert_case = "0.6"
 crossbeam-channel = "0.5.15"
 dupe = "0.9.1"
 enum-iterator = "1.4.1"
 equivalent = "1.0"
-glob = "0.3.2"
-human_bytes = "0.4.3"
 indicatif = { version = "0.17.6", features = ["futures", "improved_unicode", "rayon", "tokio"] }
 itertools = "0.14.0"
 lock_free_hashtable = "0.1.1"
 lsp-server = "0.7.2"
 lsp-types = "0.94.1"
-memory-stats = "1.2.0"
-notify = "5"
 num-bigint = { version = "0.4.4", features = ["rand"] }
 num-traits = { version = "0.2.18", default-features = false }
 parse-display = "0.8.2"
 paste = "1.0.14"
 path-absolutize = { version = "3.0", features = ["use_unix_paths_on_wasm"] }
 pyrefly_derive = { path = "../pyrefly_derive" }
-rayon = "1.9.0"
+pyrefly_util = { path = "../pyrefly_util" }
 regex = "1.11.1"
 regex-syntax = "0.7.5"
 ruff_python_ast = { git = "https://github.com/astral-sh/ruff/", rev = "3acf4e716d5d1fb9bd1316dc268deb6824a300c8" }
@@ -68,7 +61,6 @@ thiserror = "2.0.12"
 tokio = { version = "1.45.0", features = ["macros", "rt"] }
 toml = "0.8.22"
 tracing = { version = "0.1.41", features = ["attributes", "valuable"] }
-tracing-subscriber = { version = "0.3.19", features = ["chrono", "env-filter", "json", "local-time", "parking_lot", "registry"] }
 vec1 = { version = "1", features = ["serde"] }
 walkdir = "2.3"
 yansi = { version = "1.0.0-rc.1", features = ["hyperlink"] }
@@ -85,7 +77,6 @@ zstd = { version = "0.13", features = ["experimental", "zstdmt"] }
 jemallocator = "0.5.4"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-watchman_client = "0.9.0"
 which = "4.2.4"
 zstd = { version = "0.13", features = ["experimental", "zstdmt"] }
 

{pyrefly-0.17.0 → pyrefly-0.18.0}/pyrefly/bin/main.rs

@@ -16,14 +16,12 @@ use anyhow::Context as _;
 use clap::Parser;
 use clap::Subcommand;
 use dupe::Dupe;
-use library::ArcId;
 use library::ConfigFile;
-use library::Watcher;
-use library::clap_env;
+use library::ConfigSource;
+use library::ModulePath;
+use library::ProjectLayout;
 use library::finder::ConfigFinder;
-use library::get_args_expanded;
-use library::globs::FilteredGlobs;
-use library::globs::Globs;
+use library::finder::debug_log;
 use library::run::BuckCheckArgs;
 use library::run::CheckArgs;
 use library::run::CommandExitStatus;
@@ -33,13 +31,15 @@ use library::run::LspArgs;
 use library::standard_config_finder;
 use path_absolutize::Absolutize;
 use pyrefly::library::library::library::library;
-use pyrefly::library::library::library::library::ConfigSource;
-use pyrefly::library::library::library::library::ModulePath;
-use pyrefly::library::library::library::library::ProjectLayout;
-use pyrefly::library::library::library::library::debug_log;
+use pyrefly::library::library::library::library::finder::ConfigError;
+use pyrefly_util::arc_id::ArcId;
+use pyrefly_util::args::clap_env;
+use pyrefly_util::args::get_args_expanded;
+use pyrefly_util::globs::FilteredGlobs;
+use pyrefly_util::globs::Globs;
+use pyrefly_util::watcher::Watcher;
 use starlark_map::small_map::SmallMap;
 use tracing::debug;
-use tracing::error;
 use tracing::info;
 
 // fbcode likes to set its own allocator in fbcode.default_allocator
@@ -150,7 +150,7 @@ fn absolutize(globs: Globs) -> anyhow::Result<Globs> {
 fn get_explicit_config(
     path: &Path,
     args: &library::run::CheckArgs,
-) -> (ArcId<ConfigFile>, Vec<anyhow::Error>) {
+) -> (ArcId<ConfigFile>, Vec<ConfigError>) {
     let (file_config, parse_errors) = ConfigFile::from_file(path);
     let (config, validation_errors) = args.override_config(file_config);
     (
@@ -295,7 +295,7 @@ async fn run_command(command: Command, allow_forget: bool) -> anyhow::Result<Com
                     .push(path.clone());
             }
             for error in config_finder.errors() {
-                error!("{error:#}");
+                error.print();
             }
             for (config, files) in configs_to_files.into_iter() {
                 match &config.source {

{pyrefly-0.17.0 → pyrefly-0.18.0}/pyrefly/lib/alt/answers.rs

@@ -13,6 +13,13 @@ use std::sync::Arc;
 
 use dupe::Dupe;
 use dupe::OptionDupedExt;
+use pyrefly_util::display::DisplayWith;
+use pyrefly_util::display::DisplayWithCtx;
+use pyrefly_util::gas::Gas;
+use pyrefly_util::lock::Mutex;
+use pyrefly_util::recurser::Recurser;
+use pyrefly_util::uniques::UniqueFactory;
+use pyrefly_util::visit::VisitMut;
 use ruff_python_ast::name::Name;
 use ruff_text_size::Ranged;
 use ruff_text_size::TextRange;
@@ -25,6 +32,7 @@ use crate::alt::attr::AttrInfo;
 use crate::alt::traits::Solve;
 use crate::alt::traits::SolveRecursive;
 use crate::binding::binding::Binding;
+use crate::binding::binding::Exported;
 use crate::binding::binding::Key;
 use crate::binding::binding::Keyed;
 use crate::binding::bindings::BindingEntry;
@@ -59,13 +67,6 @@ use crate::types::stdlib::Stdlib;
 use crate::types::type_info::TypeInfo;
 use crate::types::types::Type;
 use crate::types::types::Var;
-use crate::util::display::DisplayWith;
-use crate::util::display::DisplayWithCtx;
-use crate::util::gas::Gas;
-use crate::util::lock::Mutex;
-use crate::util::recurser::Recurser;
-use crate::util::uniques::UniqueFactory;
-use crate::util::visit::VisitMut;
 
 /// The index stores all the references where the definition is external to the current module.
 /// This is useful for fast references computation.
@@ -220,17 +221,14 @@ impl Display for SolutionsDifference<'_> {
 
 impl Solutions {
     #[allow(dead_code)] // Used in tests.
-    pub fn get<K: Keyed<EXPORTED = true>>(&self, key: &K) -> &Arc<<K as Keyed>::Answer>
+    pub fn get<K: Exported>(&self, key: &K) -> &Arc<<K as Keyed>::Answer>
     where
         SolutionsTable: TableKeyed<K, Value = SolutionsEntry<K>>,
     {
         self.get_hashed(Hashed::new(key))
     }
 
-    pub fn get_hashed<K: Keyed<EXPORTED = true>>(
-        &self,
-        key: Hashed<&K>,
-    ) -> &Arc<<K as Keyed>::Answer>
+    pub fn get_hashed<K: Exported>(&self, key: Hashed<&K>) -> &Arc<<K as Keyed>::Answer>
     where
         SolutionsTable: TableKeyed<K, Value = SolutionsEntry<K>>,
     {
@@ -331,7 +329,7 @@ pub struct AnswersSolver<'a, Ans: LookupAnswer> {
 }
 
 pub trait LookupAnswer: Sized {
-    fn get<K: Solve<Self> + Keyed<EXPORTED = true>>(
+    fn get<K: Solve<Self> + Exported>(
         &self,
         module: ModuleName,
         path: Option<&ModulePath>,
@@ -491,7 +489,7 @@ impl Answers {
         }
     }
 
-    pub fn solve_exported_key<Ans: LookupAnswer, K: Solve<Ans> + Keyed<EXPORTED = true>>(
+    pub fn solve_exported_key<Ans: LookupAnswer, K: Solve<Ans> + Exported>(
         &self,
         exports: &dyn LookupExport,
         answers: &Ans,
@@ -577,7 +575,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         self.solver().for_display(t)
     }
 
-    pub fn get_from_module<K: Solve<Ans> + Keyed<EXPORTED = true>>(
+    pub fn get_from_module<K: Solve<Ans> + Exported>(
         &self,
         module: ModuleName,
         path: Option<&ModulePath>,
@@ -597,11 +595,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         }
     }
 
-    pub fn get_from_class<K: Solve<Ans> + Keyed<EXPORTED = true>>(
-        &self,
-        cls: &Class,
-        k: &K,
-    ) -> Arc<K::Answer>
+    pub fn get_from_class<K: Solve<Ans> + Exported>(&self, cls: &Class, k: &K) -> Arc<K::Answer>
     where
         AnswerTable: TableKeyed<K, Value = AnswerEntry<K>>,
         BindingTable: TableKeyed<K, Value = BindingEntry<K>>,

{pyrefly-0.17.0 → pyrefly-0.18.0}/pyrefly/lib/alt/attr.rs

@@ -1165,8 +1165,8 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 Some(AttributeBase::ClassObject(class_type.class_object().dupe()))
             }
             Type::TypedDict(typed_dict) => Some(AttributeBase::TypedDict(typed_dict.clone())),
-            Type::Tuple(Tuple::Unbounded(box element)) => {
-                Some(AttributeBase::ClassInstance(self.stdlib.tuple(element)))
+            Type::Tuple(Tuple::Unbounded(element)) => {
+                Some(AttributeBase::ClassInstance(self.stdlib.tuple(*element)))
             }
             Type::Tuple(Tuple::Concrete(elements)) => {
                 Some(AttributeBase::ClassInstance(if elements.is_empty() {
@@ -1177,11 +1177,11 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
             }
             Type::Tuple(Tuple::Unpacked(box (
                 prefix,
-                Type::Tuple(Tuple::Unbounded(box middle)),
+                Type::Tuple(Tuple::Unbounded(middle)),
                 suffix,
             ))) => {
                 let mut elements = prefix;
-                elements.push(middle);
+                elements.push(*middle);
                 elements.extend(suffix);
                 Some(AttributeBase::ClassInstance(
                     self.stdlib.tuple(self.unions(elements)),

{pyrefly-0.17.0 → pyrefly-0.18.0}/pyrefly/lib/alt/call.rs

@@ -110,7 +110,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
             self.solver()
                 .fresh_quantified(tparams, Type::Function(Box::new(func)), self.uniques);
         match t {
-            Type::Function(box func) => (qs, func),
+            Type::Function(func) => (qs, *func),
             // We passed a Function to fresh_quantified(), so we know we get a Function back out.
             _ => unreachable!(),
         }

{pyrefly-0.17.0 → pyrefly-0.18.0}/pyrefly/lib/alt/callable.rs

@@ -6,6 +6,8 @@
  */
 
 use append_only_vec::AppendOnlyVec;
+use pyrefly_util::display::count;
+use pyrefly_util::prelude::VecExt;
 use ruff_python_ast::Expr;
 use ruff_python_ast::Keyword;
 use ruff_python_ast::name::Name;
@@ -32,8 +34,6 @@ use crate::types::quantified::Quantified;
 use crate::types::tuple::Tuple;
 use crate::types::types::Type;
 use crate::types::types::Var;
-use crate::util::display::count;
-use crate::util::prelude::VecExt;
 
 #[derive(Clone, Debug)]
 pub enum CallArg<'a> {
@@ -228,8 +228,8 @@ impl PosParam {
                 name: Some(name.clone()),
                 kind: PosParamKind::Positional,
             }),
-            Param::VarArg(name, Type::Unpack(box ty)) => Some(Self {
-                ty: ty.clone(),
+            Param::VarArg(name, Type::Unpack(ty)) => Some(Self {
+                ty: (**ty).clone(),
                 name: name.clone(),
                 kind: PosParamKind::Unpacked,
             }),
@@ -246,13 +246,19 @@ impl PosParam {
 impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
     fn is_param_spec_args(&self, x: &CallArg, q: Quantified, errors: &ErrorCollector) -> bool {
         match x {
-            CallArg::Star(x, _) => self.expr_infer(x, errors) == Type::Args(q),
+            CallArg::Star(x, _) => {
+                let mut ty = self.expr_infer(x, errors);
+                self.expand_type_mut(&mut ty);
+                ty == Type::Args(q)
+            }
             _ => false,
         }
     }
 
     fn is_param_spec_kwargs(&self, x: &Keyword, q: Quantified, errors: &ErrorCollector) -> bool {
-        self.expr_infer(&x.value, errors) == Type::Kwargs(q)
+        let mut ty = self.expr_infer(&x.value, errors);
+        self.expand_type_mut(&mut ty);
+        ty == Type::Kwargs(q)
     }
 
     // See comment on `callable_infer` about `arg_errors` and `call_errors`.

{pyrefly-0.17.0 → pyrefly-0.18.0}/pyrefly/lib/alt/class/class_field.rs

@@ -425,8 +425,8 @@ fn make_bound_method_helper(
             tparams: tparams.clone(),
             body: func.clone(),
         })),
-        Type::Function(box func) if should_bind(&func.metadata) => {
-            Some(BoundMethodType::Function(func.clone()))
+        Type::Function(func) if should_bind(&func.metadata) => {
+            Some(BoundMethodType::Function((**func).clone()))
         }
         Type::Overload(overload) if should_bind(&overload.metadata) => {
             Some(BoundMethodType::Overload(overload.clone()))
@@ -492,6 +492,7 @@ impl<T> WithDefiningClass<T> {
     }
 }
 
+#[expect(clippy::large_enum_variant)] // the vast majority of `DataclassMember`s are `Field`
 /// The result of processing a raw dataclass member (any annotated assignment in its body).
 pub enum DataclassMember {
     /// A dataclass field
@@ -1004,9 +1005,9 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         ty: &Type,
     ) -> Option<Attribute> {
         let mut foralled = match ty {
-            Type::Function(box func) => Type::Forall(Box::new(Forall {
+            Type::Function(func) => Type::Forall(Box::new(Forall {
                 tparams: cls.tparams().clone(),
-                body: Forallable::Function(func.clone()),
+                body: Forallable::Function((**func).clone()),
             })),
             Type::Forall(box Forall {
                 tparams,

{pyrefly-0.17.0 → pyrefly-0.18.0}/pyrefly/lib/alt/class/class_metadata.rs

@@ -11,6 +11,7 @@ use std::sync::Arc;
 use dupe::Dupe;
 use itertools::Either;
 use itertools::Itertools;
+use pyrefly_util::prelude::SliceExt;
 use ruff_python_ast::Expr;
 use ruff_python_ast::Identifier;
 use ruff_python_ast::name::Name;
@@ -42,9 +43,8 @@ use crate::types::special_form::SpecialForm;
 use crate::types::tuple::Tuple;
 use crate::types::types::AnyStyle;
 use crate::types::types::CalleeKind;
-use crate::types::types::TParamInfo;
+use crate::types::types::TParam;
 use crate::types::types::Type;
-use crate::util::prelude::SliceExt;
 
 /// Private helper type used to share part of the logic needed for the
 /// binding-level work of finding legacy type parameters versus the type-level
@@ -162,12 +162,13 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         let mut enum_metadata = None;
         let mut dataclass_metadata = None;
         let mut bases: Vec<BaseClass> = bases.map(|x| self.base_class_of(x, errors));
-        if let Some(box special_base) = special_base {
-            bases.push(special_base.clone());
+        if let Some(special_base) = special_base {
+            bases.push((**special_base).clone());
         }
         let mut protocol_metadata = if bases.iter().any(|x| matches!(x, BaseClass::Protocol(_))) {
             Some(ProtocolMetadata {
                 members: cls.fields().cloned().collect(),
+                is_runtime_checkable: false,
             })
         } else {
             None
@@ -237,6 +238,9 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                             if let Some(proto) = &mut protocol_metadata {
                                 if let Some(base_proto) = base_class_metadata.protocol_metadata() {
                                     proto.members.extend(base_proto.members.iter().cloned());
+                                    if base_proto.is_runtime_checkable {
+                                        proto.is_runtime_checkable = true;
+                                    }
                                 } else {
                                     self.error(errors,
                                         range,
@@ -398,6 +402,19 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 Some(CalleeKind::Function(FunctionKind::Final)) => {
                     is_final = true;
                 }
+                Some(CalleeKind::Function(FunctionKind::RuntimeCheckable)) => {
+                    if let Some(proto) = &mut protocol_metadata {
+                        proto.is_runtime_checkable = true;
+                    } else {
+                        self.error(
+                            errors,
+                            cls.range(),
+                            ErrorKind::InvalidArgument,
+                            None,
+                            "@runtime_checkable can only be applied to Protocol classes".to_owned(),
+                        );
+                    }
+                }
                 _ => {}
             }
         }
@@ -501,7 +518,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
             let mut type_var_tuple_count = 0;
             let args = Ast::unpack_slice(&subscript.slice).map(|x| {
                 let ty = self.expr_untype(x, TypeFormContext::GenericBase, errors);
-                if let Type::Unpack(box unpacked) = &ty
+                if let Type::Unpack(unpacked) = &ty
                     && unpacked.is_kind_type_var_tuple()
                 {
                     if type_var_tuple_count == 1 {
@@ -528,11 +545,11 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
     pub fn class_tparams(
         &self,
         name: &Identifier,
-        scoped_tparams: Vec<TParamInfo>,
+        scoped_tparams: Vec<TParam>,
         bases: Vec<BaseClass>,
         legacy: &[Idx<KeyLegacyTypeParam>],
         errors: &ErrorCollector,
-    ) -> Vec<TParamInfo> {
+    ) -> Vec<TParam> {
         let legacy_tparams = legacy
             .iter()
             .filter_map(|key| self.get_idx(*key).deref().parameter().cloned())

{pyrefly-0.17.0 → pyrefly-0.18.0}/pyrefly/lib/alt/class/classdef.rs

@@ -8,6 +8,7 @@
 use std::sync::Arc;
 
 use dupe::Dupe;
+use pyrefly_util::prelude::SliceExt;
 use ruff_python_ast::Expr;
 use ruff_python_ast::Identifier;
 use ruff_python_ast::StmtClassDef;
@@ -30,7 +31,6 @@ use crate::types::class::ClassFieldProperties;
 use crate::types::class::ClassType;
 use crate::types::types::TParams;
 use crate::types::types::Type;
-use crate::util::prelude::SliceExt;
 
 impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
     // Given a constructor (__new__ or metaclass __call__) that returns `ty`, return true if the type is:
@@ -63,9 +63,9 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         let scoped_tparams = self.scoped_type_params(x.type_params.as_deref(), errors);
         let bases = bases.map(|x| self.base_class_of(x, errors));
         let name = &x.name;
-        let tparams_info = self.class_tparams(name, scoped_tparams, bases, legacy_tparams, errors);
+        let class_tparams = self.class_tparams(name, scoped_tparams, bases, legacy_tparams, errors);
 
-        let tparams = self.type_params(name.range, tparams_info, errors);
+        let tparams = self.type_params(name.range, class_tparams, errors);
 
         Class::new(
             def_index,