pyrefly 0.9.0__tar.gz → 0.10.0__tar.gz

{pyrefly-0.9.0 → pyrefly-0.10.0}/PKG-INFO

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

{pyrefly-0.9.0 → pyrefly-0.10.0}/pyproject.toml

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

{pyrefly-0.9.0/pyre2 → pyrefly-0.10.0/pyrefly}/Cargo.lock

@@ -261,9 +261,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.17"
+version = "1.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
+checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c"
 dependencies = [
  "jobserver",
  "libc",
@@ -290,9 +290,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.34"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e958897981290da2a852763fe9cdb89cd36977a5d729023127095fa94d95e2ff"
+checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -300,9 +300,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.34"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b0f35019843db2160b5bb19ae09b4e6411ac33fc6a712003c33e03090e2489"
+checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -458,9 +458,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.4.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
  "powerfmt",
 ]
@@ -552,9 +552,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -769,6 +769,15 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
+[[package]]
+name = "home"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "human_bytes"
 version = "0.4.3"
@@ -940,9 +949,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.2",
@@ -1047,10 +1056,11 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
 dependencies = [
+ "getrandom 0.3.2",
  "libc",
 ]
 
@@ -1104,9 +1114,15 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.9.0",
  "libc",
- "redox_syscall 0.5.10",
+ "redox_syscall 0.5.11",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.9.3"
@@ -1199,9 +1215,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.5"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
+checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430"
 dependencies = [
  "adler2",
 ]
@@ -1369,7 +1385,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.10",
+ "redox_syscall 0.5.11",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -1560,7 +1576,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "anyhow",
  "append-only-vec",
@@ -1608,6 +1624,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "vec1",
+ "which",
  "zstd",
 ]
 
@@ -1707,9 +1724,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3"
 dependencies = [
  "bitflags 2.9.0",
 ]
@@ -1845,14 +1862,27 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
-version = "1.0.3"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
  "bitflags 2.9.0",
  "errno",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+dependencies = [
+ "bitflags 2.9.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.3",
  "windows-sys 0.59.0",
 ]
 
@@ -1967,9 +1997,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 
 [[package]]
 name = "sorted_vector_map"
@@ -2101,7 +2131,7 @@ dependencies = [
  "fastrand",
  "getrandom 0.3.2",
  "once_cell",
- "rustix",
+ "rustix 1.0.5",
  "windows-sys 0.59.0",
 ]
 
@@ -2111,7 +2141,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
 dependencies = [
- "rustix",
+ "rustix 1.0.5",
  "windows-sys 0.59.0",
 ]
 
@@ -2205,9 +2235,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.1"
+version = "1.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
+checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2552,6 +2582,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix 0.38.44",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -2893,7 +2935,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
 dependencies = [
  "libc",
- "rustix",
+ "rustix 1.0.5",
 ]
 
 [[package]]

{pyrefly-0.9.0/pyre2 → pyrefly-0.10.0/pyrefly}/Cargo.toml

@@ -1,8 +1,8 @@
-# @generated by autocargo from //tools/pyre/pyre2/pyre2:[pyre2_library,pyrefly]
+# @generated by autocargo from //tools/pyre/pyre2/pyrefly:[pyrefly,pyrefly_library]
 
 [package]
 name = "pyrefly"
-version = "0.9.0"
+version = "0.10.0"
 authors = ["Meta"]
 edition = "2021"
 repository = "https://github.com/facebook/pyre-check/tree/main/pyre2"
@@ -10,7 +10,6 @@ license = "MIT"
 build = "build.rs"
 
 [lib]
-name = "pyre2"
 path = "lib/lib.rs"
 
 [[bin]]
@@ -72,9 +71,11 @@ tar = "0.4.44"
 zstd = { version = "0.13", features = ["experimental", "zstdmt"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+which = "4.2.4"
 zstd = { version = "0.13", features = ["experimental", "zstdmt"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.build-dependencies]
+which = "4.2.4"
 zstd = { version = "0.13", features = ["experimental", "zstdmt"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]

{pyrefly-0.9.0/pyre2 → pyrefly-0.10.0/pyrefly}/bin/main.rs

@@ -16,29 +16,25 @@ use anyhow::Context as _;
 use clap::Parser;
 use clap::Subcommand;
 use path_absolutize::Absolutize;
-use pyre2::clap_env;
-use pyre2::fs_upward_search::first_match;
-use pyre2::get_args_expanded;
-use pyre2::globs::FilteredGlobs;
-use pyre2::globs::Globs;
-use pyre2::init_thread_pool;
-use pyre2::init_tracing;
-use pyre2::run::BuckCheckArgs;
-use pyre2::run::CheckArgs;
-use pyre2::run::CommandExitStatus;
-use pyre2::run::CommonGlobalArgs;
-use pyre2::run::LspArgs;
-use pyre2::ConfigFile;
-use pyre2::NotifyWatcher;
+use pyrefly::clap_env;
+use pyrefly::fs_upward_search::first_match;
+use pyrefly::get_args_expanded;
+use pyrefly::globs::FilteredGlobs;
+use pyrefly::globs::Globs;
+use pyrefly::run::BuckCheckArgs;
+use pyrefly::run::CheckArgs;
+use pyrefly::run::CommandExitStatus;
+use pyrefly::run::CommonGlobalArgs;
+use pyrefly::run::ConfigMigrationArgs;
+use pyrefly::run::LspArgs;
+use pyrefly::ConfigFile;
+use pyrefly::NotifyWatcher;
 
 #[derive(Debug, Parser)]
-#[command(name = "pyre2")]
+#[command(name = "pyrefly")]
 #[command(about = "Next generation of Pyre type checker", long_about = None)]
+#[command(version)]
 struct Args {
-    /// Enable verbose logging.
-    #[clap(long = "verbose", short = 'v', global = true, env = clap_env("VERBOSE"))]
-    verbose: bool,
-
     /// Set this to true to run profiling of fast jobs.
     /// Will run the command repeatedly.
     #[clap(long = "profiling", global = true, hide = true, env = clap_env("PROFILING"))]
@@ -71,8 +67,8 @@ enum Command {
         /// Explicitly set the Pyre configuration to use when type checking or starting a language server.
         /// It is an error to pass this flag in "single-file checking mode".
         /// When not set, Pyre will perform an upward-filesystem-walk approach to find the nearest
-        /// pyre.toml or 'pyproject.toml with `tool.pyre` section'. If no config is found, Pyre exits with error.
-        /// If both a pyre.toml and valid pyproject.toml are found, pyre.toml takes precedence.
+        /// pyrefly.toml or 'pyproject.toml with `tool.pyre` section'. If no config is found, Pyre exits with error.
+        /// If both a pyrefly.toml and valid pyproject.toml are found, pyrefly.toml takes precedence.
         #[clap(long, short, env = clap_env("CONFIG"))]
         config: Option<std::path::PathBuf>,
 
@@ -85,6 +81,10 @@ enum Command {
 
     /// Start an LSP server
     Lsp(LspArgs),
+
+    /// Migrate a mypy or pyright configuration to a pyrefly configuration.
+    /// The main argument is the path to the configuration file to migrate.
+    ConfigMigration(ConfigMigrationArgs),
 }
 
 fn exit_on_panic() {
@@ -103,7 +103,7 @@ fn get_open_source_config(file: &Path) -> anyhow::Result<ConfigFile> {
 }
 
 fn get_implicit_config_path_from(path: &Path) -> anyhow::Result<PathBuf> {
-    if let Some(search_result) = first_match(path, &["pyrefly.toml", "pyproject.toml"]) {
+    if let Some(search_result) = first_match(path, &ConfigFile::CONFIG_FILE_NAMES) {
         Ok(search_result.to_path_buf())
     } else {
         Err(anyhow!(
@@ -123,7 +123,7 @@ fn to_exit_code(status: CommandExitStatus) -> ExitCode {
 }
 
 async fn run_check(
-    args: pyre2::run::CheckArgs,
+    args: pyrefly::run::CheckArgs,
     watch: bool,
     files_to_check: FilteredGlobs,
     config_finder: &impl Fn(&Path) -> ConfigFile,
@@ -158,7 +158,7 @@ async fn run_check_on_project(
     watch: bool,
     config: Option<PathBuf>,
     project_excludes: Option<Vec<String>>,
-    args: pyre2::run::CheckArgs,
+    args: pyrefly::run::CheckArgs,
     allow_forget: bool,
 ) -> anyhow::Result<CommandExitStatus> {
     let config = if let Some(explicit_config_path) = config {
@@ -202,11 +202,12 @@ async fn run_check_on_files(
     files_to_check: Globs,
     project_excludes: Option<Vec<String>>,
     watch: bool,
-    args: pyre2::run::CheckArgs,
+    args: pyrefly::run::CheckArgs,
     allow_forget: bool,
 ) -> anyhow::Result<CommandExitStatus> {
     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());
     run_check(
         args,
         watch,
@@ -244,19 +245,19 @@ async fn run_command(command: Command, allow_forget: bool) -> anyhow::Result<Com
         }
         Command::BuckCheck(args) => args.run(),
         Command::Lsp(args) => args.run(Vec::new()),
+        Command::ConfigMigration(args) => args.run(),
     }
 }
 
 /// Run based on the command line arguments.
 async fn run() -> anyhow::Result<ExitCode> {
     let args = Args::parse_from(get_args_expanded(args_os())?);
+    args.common.init();
     if args.profiling {
         loop {
             let _ = run_command(args.command.clone(), false).await;
         }
     } else {
-        init_tracing(args.verbose, false);
-        init_thread_pool(args.common.threads);
         run_command(args.command, true).await.map(to_exit_code)
     }
 }

{pyrefly-0.9.0/pyre2 → pyrefly-0.10.0/pyrefly}/lib/alt/answers.rs

@@ -48,6 +48,7 @@ use crate::types::class::Class;
 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::AnyStyle;
 use crate::types::types::NeverStyle;
 use crate::types::types::Type;
@@ -590,7 +591,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         let t = if let Binding::Phi(_, Some(default)) = binding {
             self.get_calculation(*default)
                 .get()
-                .map(|t| t.arc_clone().promote_literals(self.stdlib))
+                .map(|t| t.arc_clone_ty().promote_literals(self.stdlib))
         } else {
             None
         };
@@ -600,17 +601,12 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
     pub fn record_recursive(
         &self,
         loc: TextRange,
-        answer: &Arc<Type>,
+        answer: Type,
         recursive: Var,
         errors: &ErrorCollector,
     ) {
-        self.solver().record_recursive(
-            recursive,
-            (**answer).clone(),
-            self.type_order(),
-            errors,
-            loc,
-        );
+        self.solver()
+            .record_recursive(recursive, answer, self.type_order(), errors, loc);
     }
 
     pub fn record_type_trace(&self, loc: TextRange, ty: &Type) {
@@ -619,6 +615,39 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         }
     }
 
+    /// Check if `want` matches `got` returning `want` if the check fails.
+    pub fn check_and_return_type_info(
+        &self,
+        want: &Type,
+        got: TypeInfo,
+        loc: TextRange,
+        errors: &ErrorCollector,
+        tcc: &dyn Fn() -> TypeCheckContext,
+    ) -> TypeInfo {
+        if self.check_type(want, got.ty(), loc, errors, tcc) {
+            got
+        } else {
+            got.with_ty(want.clone())
+        }
+    }
+
+    /// Check if `want` matches `got` returning `want` if the check fails.
+    pub fn check_and_return_type(
+        &self,
+        want: &Type,
+        got: Type,
+        loc: TextRange,
+        errors: &ErrorCollector,
+        tcc: &dyn Fn() -> TypeCheckContext,
+    ) -> Type {
+        if self.check_type(want, &got, loc, errors, tcc) {
+            got
+        } else {
+            want.clone()
+        }
+    }
+
+    /// Check if `want` matches `got`, returning `true` on success and `false` on failure.
     pub fn check_type(
         &self,
         want: &Type,
@@ -626,15 +655,14 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         loc: TextRange,
         errors: &ErrorCollector,
         tcc: &dyn Fn() -> TypeCheckContext,
-    ) -> Type {
-        if matches!(got, Type::Any(AnyStyle::Error)) {
-            // Don't propagate errors
-            got.clone()
-        } else if self.solver().is_subset_eq(got, want, self.type_order()) {
-            got.clone()
+    ) -> bool {
+        if matches!(got, Type::Any(AnyStyle::Error))
+            || self.solver().is_subset_eq(got, want, self.type_order())
+        {
+            true
         } else {
             self.solver().error(want, got, errors, loc, tcc);
-            want.clone()
+            false
         }
     }