pyrefly 0.10.2__tar.gz → 0.11.1__tar.gz

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

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

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

@@ -151,9 +151,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "append-only-vec"
@@ -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"
@@ -261,9 +298,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.18"
+version = "1.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c"
+checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362"
 dependencies = [
  "jobserver",
  "libc",
@@ -290,9 +327,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.35"
+version = "4.5.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
+checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -300,9 +337,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.35"
+version = "4.5.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
+checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5"
 dependencies = [
  "anstream",
  "anstyle",
@@ -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.10.2"
+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.10.2 → pyrefly-0.11.1}/pyrefly/Cargo.toml

@@ -1,8 +1,8 @@
-# @generated by autocargo from //tools/pyre/pyre2/pyrefly:[pyrefly,pyrefly_library]
+# @generated by autocargo from //pyrefly/pyrefly:[pyrefly,pyrefly_library]
 
 [package]
 name = "pyrefly"
-version = "0.10.2"
+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"
@@ -62,7 +63,7 @@ tracing-subscriber = { version = "0.3.18", features = ["chrono", "env-filter", "
 vec1 = { version = "1", features = ["serde"] }
 
 [dev-dependencies]
-crossbeam-channel = "0.5.0"
+crossbeam-channel = "0.5.15"
 pretty_assertions = { version = "1.2", features = ["alloc"], default-features = false }
 tempfile = "3.15"
 

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

@@ -10,15 +10,18 @@ use std::env::args_os;
 use std::path::Path;
 use std::path::PathBuf;
 use std::process::ExitCode;
+use std::sync::Arc;
 
+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::get_implicit_config_for_file;
-use pyrefly::finder::get_implicit_config_for_project;
-use pyrefly::finder::get_open_source_config;
+use pyrefly::finder::ConfigFinder;
 use pyrefly::get_args_expanded;
 use pyrefly::globs::FilteredGlobs;
 use pyrefly::globs::Globs;
@@ -28,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;
 
@@ -102,7 +103,7 @@ async fn run_check(
     args: pyrefly::run::CheckArgs,
     watch: bool,
     files_to_check: FilteredGlobs,
-    config_finder: impl Fn(&Path) -> ConfigFile,
+    config_finder: ConfigFinder,
     allow_forget: bool,
 ) -> anyhow::Result<CommandExitStatus> {
     if watch {
@@ -118,6 +119,21 @@ async fn run_check(
     }
 }
 
+fn config_finder(args: pyrefly::run::CheckArgs) -> ConfigFinder {
+    let args = Arc::new(args);
+    let args2 = args.dupe();
+    let default = move || Arc::new(args.override_config(ConfigFile::default()));
+    // The Box is a bit annoying here, but otherwise I can't persuade it that the `&Path` has a good enough lifetime.
+    let load: Box<dyn Fn(&Path) -> anyhow::Result<Arc<ConfigFile>>> =
+        Box::new(move |config_path| {
+            Ok(Arc::new(args2.override_config(ConfigFile::from_file(
+                config_path,
+                true,
+            )?)))
+        });
+    ConfigFinder::new(default, load)
+}
+
 async fn run_check_on_project(
     watch: bool,
     config: Option<PathBuf>,
@@ -125,15 +141,24 @@ async fn run_check_on_project(
     args: pyrefly::run::CheckArgs,
     allow_forget: bool,
 ) -> anyhow::Result<CommandExitStatus> {
-    let config = if let Some(explicit_config_path) = config {
-        info!(
-            "Using config file explicitly provided at `{}`",
-            explicit_config_path.display()
-        );
-        args.override_config(get_open_source_config(&explicit_config_path)?)
-    } else {
-        get_implicit_config_for_project(|c| args.override_config(c))
+    let config = match config {
+        Some(explicit) => {
+            info!(
+                "Using config file explicitly provided at `{}`",
+                explicit.display()
+            );
+            // We deliberately don't use the cached object, since we want errors in an explicit config to be fatal
+            Arc::new(args.override_config(ConfigFile::from_file(&explicit, true)?))
+        }
+        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 =
         project_excludes.map_or_else(|| config.project_excludes.clone(), Globs::new);
@@ -141,7 +166,7 @@ async fn run_check_on_project(
         args,
         watch,
         FilteredGlobs::new(config.project_includes.clone(), project_excludes),
-        |_| config.clone(),
+        config_finder,
         allow_forget,
     )
     .await
@@ -157,11 +182,12 @@ async fn run_check_on_files(
     let project_excludes =
         project_excludes.map_or_else(ConfigFile::default_project_excludes, Globs::new);
     let files_to_check = files_to_check.from_root(PathBuf::new().absolutize()?.as_ref());
+    let config_finder = config_finder(args.clone());
     run_check(
-        args.clone(),
+        args,
         watch,
         FilteredGlobs::new(files_to_check, project_excludes),
-        &get_implicit_config_for_file(&|c| args.override_config(c)),
+        config_finder,
         allow_forget,
     )
     .await

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

@@ -13,10 +13,9 @@ use std::sync::Arc;
 
 use dupe::Dupe;
 use dupe::OptionDupedExt;
-use ruff_text_size::Ranged;
 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;
@@ -49,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;
@@ -589,7 +586,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
     }
 
     pub fn create_recursive(&self, binding: &Binding) -> Var {
-        let t = if let Binding::Phi(_, Some(default)) = binding {
+        let t = if let Binding::Default(default, _) = binding {
             self.get_calculation(*default)
                 .get()
                 .map(|t| t.arc_clone_ty().promote_literals(self.stdlib))
@@ -666,24 +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())))
+        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 {
@@ -694,11 +701,6 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         self.unions(vec![x, y])
     }
 
-    pub fn todo(&self, errors: &ErrorCollector, msg: &str, x: impl Ranged + Debug) -> Type {
-        errors.todo(msg, x);
-        Type::any_error()
-    }
-
     pub fn error(
         &self,
         errors: &ErrorCollector,