pyrefly 0.4.0__tar.gz → 0.6.0__tar.gz

{pyrefly-0.4.0 → pyrefly-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrefly
-Version: 0.4.0
+Version: 0.6.0
 Author: Meta
 License: MIT
 Project-URL: Source Code, https://github.com/facebook/pyre-check/tree/main/pyre2

{pyrefly-0.4.0 → pyrefly-0.6.0}/pyproject.toml

@@ -5,3 +5,5 @@ build-backend = "maturin"
 [tool.maturin]
 bindings = "bin"
 strip = true
+include = ["rust-toolchain"]
+manifest-path = "pyre2/Cargo.toml"

{pyrefly-0.4.0 → pyrefly-0.6.0/pyre2}/Cargo.lock

@@ -167,9 +167,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.87"
+version = "0.1.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -432,9 +432,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
  "powerfmt",
 ]
@@ -699,14 +699,14 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.13.3+wasi-0.2.2",
- "windows-targets 0.52.6",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
 ]
 
 [[package]]
@@ -1091,9 +1091,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
+checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
 
 [[package]]
 name = "litemap"
@@ -1523,7 +1523,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "argfile",
@@ -1546,6 +1546,7 @@ dependencies = [
  "parse-display",
  "paste",
  "pretty_assertions",
+ "pyrefly_derive",
  "rayon",
  "regex",
  "ruff_python_ast",
@@ -1568,6 +1569,15 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "pyrefly_derive"
+version = "0.0.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
+]
+
 [[package]]
 name = "quickcheck"
 version = "1.0.3"
@@ -1588,6 +1598,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -1787,9 +1803,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
+checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
 dependencies = [
  "bitflags 2.9.0",
  "errno",
@@ -2036,13 +2052,12 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.18.0"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567"
+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
 dependencies = [
- "cfg-if",
  "fastrand",
- "getrandom 0.3.1",
+ "getrandom 0.3.2",
  "once_cell",
  "rustix",
  "windows-sys 0.59.0",
@@ -2090,9 +2105,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.39"
+version = "0.3.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8"
+checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618"
 dependencies = [
  "deranged",
  "itoa",
@@ -2107,15 +2122,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c"
+checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04"
 dependencies = [
  "num-conv",
  "time-core",
@@ -2420,9 +2435,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasi"
-version = "0.13.3+wasi-0.2.2"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
 dependencies = [
  "wit-bindgen-rt",
 ]
@@ -2537,9 +2552,9 @@ dependencies = [
 
 [[package]]
 name = "windows-link"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
 
 [[package]]
 name = "windows-sys"
@@ -2766,9 +2781,9 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen-rt"
-version = "0.33.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
  "bitflags 2.9.0",
 ]

{pyrefly-0.4.0 → pyrefly-0.6.0/pyre2}/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly"
-version = "0.4.0"
+version = "0.6.0"
 authors = ["Meta"]
 edition = "2021"
 repository = "https://github.com/facebook/pyre-check/tree/main/pyre2"
@@ -37,6 +37,7 @@ memory-stats = "1.2.0"
 notify = "5"
 parse-display = "0.8.2"
 paste = "1.0.14"
+pyrefly_derive = { path = "../pyrefly_derive" }
 rayon = "1.9.0"
 regex = "1.11.1"
 ruff_python_ast = { git = "https://github.com/astral-sh/ruff/", rev = "112e9d2d8258e72dcf5c21c7d811957f12325af1" }
@@ -44,7 +45,7 @@ ruff_python_parser = { git = "https://github.com/astral-sh/ruff/", rev = "112e9d
 ruff_source_file = { git = "https://github.com/astral-sh/ruff/", rev = "112e9d2d8258e72dcf5c21c7d811957f12325af1" }
 ruff_text_size = { git = "https://github.com/astral-sh/ruff/", rev = "112e9d2d8258e72dcf5c21c7d811957f12325af1" }
 serde = { version = "1.0.185", features = ["derive", "rc"] }
-serde_json = { version = "1.0.132", features = ["float_roundtrip", "unbounded_depth"] }
+serde_json = { version = "1.0.140", features = ["float_roundtrip", "unbounded_depth"] }
 starlark_map = "0.13.0"
 static_assertions = "1.1.0"
 static_interner = "0.1.1"

{pyrefly-0.4.0 → pyrefly-0.6.0/pyre2}/bin/main.rs

@@ -23,7 +23,6 @@ use pyre2::run::CheckArgs;
 use pyre2::run::CommandExitStatus;
 use pyre2::run::LspArgs;
 use pyre2::ConfigFile;
-use pyre2::FileList;
 use pyre2::Globs;
 use pyre2::NotifyWatcher;
 
@@ -108,7 +107,7 @@ async fn run_check(
     args: pyre2::run::CheckArgs,
     watch: bool,
     files_to_check: Globs,
-    config_finder: &dyn Fn(&Path) -> ConfigFile,
+    config_finder: &impl Fn(&Path) -> ConfigFile,
     allow_forget: bool,
 ) -> anyhow::Result<CommandExitStatus> {
     if watch {
@@ -116,7 +115,7 @@ async fn run_check(
         for path in files_to_check.roots() {
             watcher.watch_dir(&path)?;
         }
-        args.run_watch(Box::new(watcher), files_to_check, config_finder)
+        args.run_watch(watcher, files_to_check, config_finder)
             .await?;
         Ok(CommandExitStatus::Success)
     } else {
@@ -137,7 +136,7 @@ async fn run_check_on_project(
     run_check(
         args,
         watch,
-        config.project_include.clone(),
+        config.project_includes.clone(),
         &|_| config.clone(),
         allow_forget,
     )
@@ -179,7 +178,7 @@ async fn run_command(command: Command, allow_forget: bool) -> anyhow::Result<Com
             }
         }
         Command::BuckCheck(args) => args.run(),
-        Command::Lsp(args) => args.run(),
+        Command::Lsp(args) => args.run(Vec::new()),
     }
 }
 

{pyrefly-0.4.0 → pyrefly-0.6.0/pyre2}/lib/alt/answers.rs

@@ -8,6 +8,7 @@
 use std::fmt;
 use std::fmt::Debug;
 use std::fmt::Display;
+use std::path::PathBuf;
 use std::sync::Arc;
 
 use dupe::Dupe;
@@ -36,6 +37,7 @@ use crate::graph::index::Idx;
 use crate::graph::index_map::IndexMap;
 use crate::module::module_info::ModuleInfo;
 use crate::module::module_name::ModuleName;
+use crate::module::module_path::ModulePath;
 use crate::solver::solver::Solver;
 use crate::solver::type_order::TypeOrder;
 use crate::table;
@@ -43,6 +45,8 @@ use crate::table_for_each;
 use crate::table_mut_for_each;
 use crate::table_try_for_each;
 use crate::types::class::Class;
+use crate::types::equality::TypeEq;
+use crate::types::equality::TypeEqCtx;
 use crate::types::stdlib::Stdlib;
 use crate::types::types::AnyStyle;
 use crate::types::types::Type;
@@ -53,6 +57,7 @@ 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;
 
 #[derive(Debug, Default)]
 pub struct Traces {
@@ -147,20 +152,40 @@ impl DisplayWith<ModuleInfo> for Solutions {
 }
 
 pub struct SolutionsDifference<'a> {
-    key: &'a dyn DisplayWith<ModuleInfo>,
-    lhs: Option<&'a dyn Display>,
-    rhs: Option<&'a dyn Display>,
+    key: (&'a dyn DisplayWith<ModuleInfo>, &'a dyn Debug),
+    lhs: Option<(&'a dyn Display, &'a dyn Debug)>,
+    rhs: Option<(&'a dyn Display, &'a dyn Debug)>,
 }
 
-impl DisplayWith<ModuleInfo> for SolutionsDifference<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>, ctx: &ModuleInfo) -> fmt::Result {
-        let missing = |f: &mut fmt::Formatter, x| match x {
+impl Debug for SolutionsDifference<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("SolutionsDifference")
+            .field("key", self.key.1)
+            .field("lhs", &self.lhs.map(|x| x.1))
+            .field("rhs", &self.rhs.map(|x| x.1))
+            .finish()
+    }
+}
+
+impl Display for SolutionsDifference<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let missing = |f: &mut fmt::Formatter, x: Option<(&dyn Display, &dyn Debug)>| match x {
             None => write!(f, "missing"),
-            Some(x) => write!(f, "`{x}`"),
+            Some(x) => write!(f, "`{}`", x.0),
         };
 
+        // The key has type DisplayWith<ModuleInfo>.
+        // We don't know if the key originates on the LHS or RHS, so we don't know which is the appropriate ModuleInfo.
+        // However, we do know it is exported, and exported things can't rely on locations, so regardless
+        // of the ModuleInfo, it should display the same. Therefore, we fake one up.
+        let fake_module_info = ModuleInfo::new(
+            ModuleName::builtins(),
+            ModulePath::memory(PathBuf::new()),
+            Default::default(),
+        );
+
         write!(f, "`")?;
-        self.key.fmt(f, ctx)?;
+        self.key.0.fmt(f, &fake_module_info)?;
         write!(f, "` was ")?;
         missing(f, self.lhs)?;
         write!(f, " now ")?;
@@ -189,6 +214,7 @@ impl Solutions {
         fn f<'a, K: Keyed>(
             x: &'a SolutionsEntry<K>,
             y: &'a Solutions,
+            ctx: &mut TypeEqCtx,
         ) -> Option<SolutionsDifference<'a>>
         where
             SolutionsTable: TableKeyed<K, Value = SolutionsEntry<K>>,
@@ -198,9 +224,9 @@ impl Solutions {
                 for (k, v) in y.iter() {
                     if !x.contains_key(k) {
                         return Some(SolutionsDifference {
-                            key: k,
+                            key: (k, k),
                             lhs: None,
-                            rhs: Some(v),
+                            rhs: Some((v, v)),
                         });
                     }
                 }
@@ -208,17 +234,17 @@ impl Solutions {
             }
             for (k, v) in x.iter() {
                 match y.get(k) {
-                    Some(v2) if v != v2 => {
+                    Some(v2) if !v.type_eq(v2, ctx) => {
                         return Some(SolutionsDifference {
-                            key: k,
-                            lhs: Some(v),
-                            rhs: Some(v2),
+                            key: (k, k),
+                            lhs: Some((v, v)),
+                            rhs: Some((v2, v2)),
                         });
                     }
                     None => {
                         return Some(SolutionsDifference {
-                            key: k,
-                            lhs: Some(v),
+                            key: (k, k),
+                            lhs: Some((v, v)),
                             rhs: None,
                         });
                     }
@@ -229,9 +255,12 @@ impl Solutions {
         }
 
         let mut difference = None;
+        // Important we have a single TypeEqCtx, so that we don't have
+        // types used in different ways.
+        let mut ctx = TypeEqCtx::default();
         table_for_each!(self.0, |x| {
             if difference.is_none() {
-                difference = f(x, other);
+                difference = f(x, other, &mut ctx);
             }
         });
         difference
@@ -360,10 +389,10 @@ impl Answers {
         ));
 
         // Now force all types to be fully resolved.
-        fn post_solve<K: SolveRecursive>(items: &mut SolutionsEntry<K>, solver: &Solver) {
+        fn post_solve<K: Keyed>(items: &mut SolutionsEntry<K>, solver: &Solver) {
             for v in items.values_mut() {
                 let mut vv = (**v).clone();
-                K::visit_type_mut(&mut vv, &mut |x| solver.deep_force_mut(x));
+                vv.visit0_mut(&mut |x| solver.deep_force_mut(x));
                 *v = Arc::new(vv);
             }
         }
@@ -397,11 +426,11 @@ impl Answers {
         };
         let v = solver.get(key);
         let mut vv = (*v).clone();
-        K::visit_type_mut(&mut vv, &mut |x| self.solver.deep_force_mut(x));
+        vv.visit0_mut(&mut |x| self.solver.deep_force_mut(x));
         Arc::new(vv)
     }
 
-    pub fn get_idx<K: Keyed + SolveRecursive>(&self, k: Idx<K>) -> Option<Arc<K::Answer>>
+    pub fn get_idx<K: SolveRecursive>(&self, k: Idx<K>) -> Option<Arc<K::Answer>>
     where
         AnswerTable: TableKeyed<K, Value = AnswerEntry<K>>,
     {
@@ -566,7 +595,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         got: &Type,
         loc: TextRange,
         errors: &ErrorCollector,
-        tcc: &TypeCheckContext,
+        tcc: &dyn Fn() -> TypeCheckContext,
     ) -> Type {
         if matches!(got, Type::Any(AnyStyle::Error)) {
             // Don't propagate errors
@@ -608,7 +637,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         errors: &ErrorCollector,
         range: TextRange,
         kind: ErrorKind,
-        context: Option<&ErrorContext>,
+        context: Option<&dyn Fn() -> ErrorContext>,
         msg: String,
     ) -> Type {
         errors.add(range, msg, kind, context);