pyrefly 0.11.0__tar.gz → 0.11.1__tar.gz

{pyrefly-0.11.0 → pyrefly-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrefly
-Version: 0.11.0
+Version: 0.11.1
 Author: Meta
 License: MIT
 Project-URL: Source Code, https://github.com/facebook/pyrefly

{pyrefly-0.11.0 → pyrefly-0.11.1}/pyrefly/Cargo.lock

@@ -171,6 +171,18 @@ dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
 [[package]]
 name = "async-trait"
 version = "0.1.88"
@@ -221,6 +233,31 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 
+[[package]]
+name = "blake3"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d08263faac5cde2a4d52b513dadb80846023aade56fcd8fc99ba73ba8050e92"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+ "digest",
+ "memmap2",
+ "rayon-core",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "bstr"
 version = "1.12.0"
@@ -384,6 +421,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f421161cb492475f1661ddc9815a745a1c894592070661180fdec3d4872e9c3"
 
+[[package]]
+name = "constant_time_eq"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+
 [[package]]
 name = "convert_case"
 version = "0.6.0"
@@ -433,6 +476,16 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
 [[package]]
 name = "ctor"
 version = "0.1.26"
@@ -471,6 +524,17 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -703,6 +767,16 @@ dependencies = [
  "byteorder",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
 [[package]]
 name = "getopts"
 version = "0.2.21"
@@ -1102,9 +1176,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libredox"
@@ -1203,6 +1277,15 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
+[[package]]
+name = "memmap2"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "memory-stats"
 version = "1.2.0"
@@ -1535,9 +1618,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -1576,12 +1659,13 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.11.0"
+version = "0.11.1"
 dependencies = [
  "anyhow",
  "append-only-vec",
  "argfile",
  "async-trait",
+ "blake3",
  "clap",
  "const-str",
  "convert_case",
@@ -2078,6 +2162,12 @@ dependencies = [
  "syn 2.0.100",
 ]
 
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -2377,6 +2467,12 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "typenum"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+
 [[package]]
 name = "unicase"
 version = "2.8.1"

{pyrefly-0.11.0 → pyrefly-0.11.1}/pyrefly/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Meta"]
 edition = "2021"
 repository = "https://github.com/facebook/pyrefly"
@@ -21,6 +21,7 @@ anyhow = "1.0.95"
 append-only-vec = "0.1.2"
 argfile = "0.1.6"
 async-trait = "0.1.86"
+blake3 = { version = "=1.5.2", features = ["mmap", "rayon", "traits-preview"] }
 clap = { version = "4.5.30", features = ["derive", "env", "string", "unicode", "wrap_help"] }
 const-str = "0.4.3"
 convert_case = "0.6"

{pyrefly-0.11.0 → pyrefly-0.11.1}/pyrefly/bin/main.rs

@@ -12,12 +12,14 @@ use std::path::PathBuf;
 use std::process::ExitCode;
 use std::sync::Arc;
 
-use anyhow::anyhow;
 use anyhow::Context as _;
+use anyhow::anyhow;
 use clap::Parser;
 use clap::Subcommand;
 use dupe::Dupe;
 use path_absolutize::Absolutize;
+use pyrefly::ConfigFile;
+use pyrefly::NotifyWatcher;
 use pyrefly::clap_env;
 use pyrefly::finder::ConfigFinder;
 use pyrefly::get_args_expanded;
@@ -29,8 +31,6 @@ use pyrefly::run::CommandExitStatus;
 use pyrefly::run::CommonGlobalArgs;
 use pyrefly::run::ConfigMigrationArgs;
 use pyrefly::run::LspArgs;
-use pyrefly::ConfigFile;
-use pyrefly::NotifyWatcher;
 use tracing::debug;
 use tracing::info;
 
@@ -103,7 +103,7 @@ async fn run_check(
     args: pyrefly::run::CheckArgs,
     watch: bool,
     files_to_check: FilteredGlobs,
-    config_finder: impl Fn(&Path) -> Arc<ConfigFile>,
+    config_finder: ConfigFinder,
     allow_forget: bool,
 ) -> anyhow::Result<CommandExitStatus> {
     if watch {
@@ -141,7 +141,6 @@ async fn run_check_on_project(
     args: pyrefly::run::CheckArgs,
     allow_forget: bool,
 ) -> anyhow::Result<CommandExitStatus> {
-    let config_finder = config_finder(args.clone());
     let config = match config {
         Some(explicit) => {
             info!(
@@ -153,9 +152,12 @@ async fn run_check_on_project(
         }
         None => {
             let current_dir = std::env::current_dir().context("cannot identify current dir")?;
+            let config_finder = config_finder(args.clone());
             config_finder.directory(&current_dir)
         }
     };
+    // We want our config_finder to never actually
+    let config_finder = ConfigFinder::new_constant(config.dupe());
 
     debug!("Config is: {}", config);
     let project_excludes =
@@ -164,7 +166,7 @@ async fn run_check_on_project(
         args,
         watch,
         FilteredGlobs::new(config.project_includes.clone(), project_excludes),
-        |_| config.dupe(),
+        config_finder,
         allow_forget,
     )
     .await
@@ -185,7 +187,7 @@ async fn run_check_on_files(
         args,
         watch,
         FilteredGlobs::new(files_to_check, project_excludes),
-        move |x| config_finder.python_file(x),
+        config_finder,
         allow_forget,
     )
     .await

{pyrefly-0.11.0 → pyrefly-0.11.1}/pyrefly/lib/alt/answers.rs

@@ -14,8 +14,8 @@ use std::sync::Arc;
 use dupe::Dupe;
 use dupe::OptionDupedExt;
 use ruff_text_size::TextRange;
-use starlark_map::small_map::SmallMap;
 use starlark_map::Hashed;
+use starlark_map::small_map::SmallMap;
 
 use crate::alt::traits::Solve;
 use crate::alt::traits::SolveRecursive;
@@ -48,13 +48,11 @@ use crate::types::equality::TypeEq;
 use crate::types::equality::TypeEqCtx;
 use crate::types::stdlib::Stdlib;
 use crate::types::type_info::TypeInfo;
-use crate::types::types::NeverStyle;
 use crate::types::types::Type;
 use crate::types::types::Var;
 use crate::util::display::DisplayWith;
 use crate::util::display::DisplayWithCtx;
 use crate::util::lock::Mutex;
-use crate::util::prelude::SliceExt;
 use crate::util::recurser::Recurser;
 use crate::util::uniques::UniqueFactory;
 use crate::util::visit::VisitMut;
@@ -665,27 +663,34 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
     }
 
     pub fn distribute_over_union(&self, ty: &Type, mut f: impl FnMut(&Type) -> Type) -> Type {
-        match ty {
-            Type::Never(_) => Type::Never(NeverStyle::Never),
-            Type::Union(tys) => self.unions(tys.map(f)),
-            Type::Type(box Type::Union(tys)) => {
-                self.unions(tys.map(|ty| f(&Type::type_form(ty.clone()))))
-            }
-            _ => f(ty),
-        }
+        let mut res = Vec::new();
+        self.map_over_union(ty, |ty| {
+            res.push(f(ty));
+        });
+        self.unions(res)
     }
 
     pub fn map_over_union(&self, ty: &Type, mut f: impl FnMut(&Type)) {
-        match ty {
-            Type::Union(tys) => tys.iter().for_each(f),
-            Type::Type(box Type::Union(tys)) => {
-                tys.iter().for_each(|ty| f(&Type::type_form(ty.clone())))
-            }
-            Type::Var(v) if let Some(_guard) = self.recurser.recurse(*v) => {
-                self.map_over_union(&self.solver().force_var(*v), f)
+        fn recurse<Ans: LookupAnswer>(
+            me: &AnswersSolver<Ans>,
+            ty: &Type,
+            f: &mut impl FnMut(&Type),
+            in_type: bool,
+        ) {
+            match ty {
+                Type::Never(_) if !in_type => (),
+                Type::Union(tys) => tys.iter().for_each(|ty| recurse(me, ty, f, in_type)),
+                Type::Type(box Type::Union(tys)) if !in_type => {
+                    tys.iter().for_each(|ty| recurse(me, ty, f, true))
+                }
+                Type::Var(v) if let Some(_guard) = me.recurser.recurse(*v) => {
+                    recurse(me, &me.solver().force_var(*v), f, in_type)
+                }
+                _ if in_type => f(&Type::Type(Box::new(ty.clone()))),
+                _ => f(ty),
             }
-            _ => f(ty),
         }
+        recurse(self, ty, &mut f, false)
     }
 
     pub fn unions(&self, xs: Vec<Type>) -> Type {

{pyrefly-0.11.0 → pyrefly-0.11.1}/pyrefly/lib/alt/attr.rs

@@ -9,8 +9,8 @@ use std::iter;
 
 use dupe::Dupe;
 use itertools::Either;
-use ruff_python_ast::name::Name;
 use ruff_python_ast::Expr;
+use ruff_python_ast::name::Name;
 use ruff_text_size::TextRange;
 use starlark_map::small_set::SmallSet;
 
@@ -67,21 +67,6 @@ pub enum Narrowable {
     UnionPropertyOrDescriptor(Type),
 }
 
-impl Narrowable {
-    fn of_no_union(no_union: NarrowableNoUnion) -> Self {
-        match no_union {
-            NarrowableNoUnion::Simple(ty) => Narrowable::Simple(ty),
-            NarrowableNoUnion::PropertyOrDescriptor(ty) => Narrowable::PropertyOrDescriptor(ty),
-        }
-    }
-}
-
-#[derive(Debug)]
-enum NarrowableNoUnion {
-    Simple(Type),
-    PropertyOrDescriptor(Type),
-}
-
 /// The result of looking up an attribute. We can analyze get and set actions
 /// on an attribute, each of which can be allowed with some type or disallowed.
 #[derive(Debug)]
@@ -1237,8 +1222,10 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                             match self
                                 .narrowable_for_attr_no_union(base_ty, attr_name, range, errors)
                             {
-                                NarrowableNoUnion::Simple(ty) => ty,
-                                NarrowableNoUnion::PropertyOrDescriptor(ty) => {
+                                Narrowable::Simple(ty) => ty,
+                                // UnionPropertyOrDescriptor shouldn't happen in practice
+                                Narrowable::PropertyOrDescriptor(ty)
+                                | Narrowable::UnionPropertyOrDescriptor(ty) => {
                                     has_property_or_descriptor = true;
                                     ty
                                 }
@@ -1252,9 +1239,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                     Narrowable::Simple(ty)
                 }
             }
-            _ => Narrowable::of_no_union(
-                self.narrowable_for_attr_no_union(base, attr_name, range, errors),
-            ),
+            _ => self.narrowable_for_attr_no_union(base, attr_name, range, errors),
         }
     }
 
@@ -1264,9 +1249,9 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         attr_name: &Name,
         range: TextRange,
         errors: &ErrorCollector,
-    ) -> NarrowableNoUnion {
+    ) -> Narrowable {
         let fall_back_to_object_narrowable =
-            || NarrowableNoUnion::Simple(Type::ClassType(self.stdlib.object().clone()));
+            || Narrowable::Simple(Type::ClassType(self.stdlib.object().clone()));
         match self.lookup_attr_no_union(base, attr_name) {
             LookupResult::InternalError(..) | LookupResult::NotFound(..) => {
                 fall_back_to_object_narrowable()
@@ -1282,9 +1267,9 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                     Err(..) => fall_back_to_object_narrowable(),
                     Ok(ty) => {
                         if is_property_or_descriptor {
-                            NarrowableNoUnion::PropertyOrDescriptor(ty)
+                            Narrowable::PropertyOrDescriptor(ty)
                         } else {
-                            NarrowableNoUnion::Simple(ty)
+                            Narrowable::Simple(ty)
                         }
                     }
                 }

{pyrefly-0.11.0 → pyrefly-0.11.1}/pyrefly/lib/alt/call.rs

@@ -6,8 +6,8 @@
  */
 
 use dupe::Dupe;
-use ruff_python_ast::name::Name;
 use ruff_python_ast::Keyword;
+use ruff_python_ast::name::Name;
 use ruff_text_size::TextRange;
 use starlark_map::small_set::SmallSet;
 use vec1::Vec1;
@@ -37,7 +37,7 @@ use crate::types::types::OverloadType;
 use crate::types::types::TParams;
 use crate::types::types::Type;
 use crate::types::types::Var;
-use crate::util::visit::VisitMut;
+
 pub enum CallStyle<'a> {
     Method(&'a Name),
     FreeForm,
@@ -607,13 +607,15 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         // We're guaranteed to have at least one overload.
         let closest_overload = closest_overload.unwrap();
         let fewest_errors = fewest_errors.unwrap();
-        let mut signature = match self_arg {
+        let signature = match self_arg {
             Some(_) => closest_overload
                 .drop_first_param()
                 .unwrap_or(closest_overload),
             None => closest_overload,
         };
-        signature.recurse_mut(&mut |x| *x = self.solver().for_display((*x).clone()));
+        let signature = self
+            .solver()
+            .for_display(Type::Callable(Box::new(signature)));
         self.error(
             errors,
             range,
@@ -730,7 +732,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
     ) -> Type {
         let call_target =
             self.as_call_target_or_error(getattr_ty, CallStyle::FreeForm, range, errors, context);
-        let attr_name_ty = Type::Literal(Lit::String(attr_name.as_str().into()));
+        let attr_name_ty = Type::Literal(Lit::Str(attr_name.as_str().into()));
         self.call_infer(
             call_target,
             &[CallArg::Type(&attr_name_ty, range)],

{pyrefly-0.11.0 → pyrefly-0.11.1}/pyrefly/lib/alt/callable.rs

@@ -6,9 +6,9 @@
  */
 
 use append_only_vec::AppendOnlyVec;
-use ruff_python_ast::name::Name;
 use ruff_python_ast::Expr;
 use ruff_python_ast::Keyword;
+use ruff_python_ast::name::Name;
 use ruff_text_size::Ranged;
 use ruff_text_size::TextRange;
 use starlark_map::small_map::SmallMap;
@@ -811,7 +811,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                             range,
                             ErrorKind::InvalidParamSpec,
                             context,
-                            format!("Unexpected ParamSpec type: `{p}`"),
+                            format!("Unexpected ParamSpec type: `{}`", self.for_display(p)),
                         );
                     }
                 }