pyrefly 0.5.0__tar.gz → 0.7.0__tar.gz

{pyrefly-0.5.0 → pyrefly-0.7.0}/PKG-INFO

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

pyrefly-0.7.0/pyre2/.cargo/config.toml

@@ -0,0 +1,2 @@
+[env]
+TEST_FILES_PATH = "lib/test/lsp/test_files"

{pyrefly-0.5.0 → pyrefly-0.7.0}/pyre2/Cargo.lock

@@ -255,9 +255,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.16"
+version = "1.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
 dependencies = [
  "jobserver",
  "libc",
@@ -358,6 +358,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "const-str"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f421161cb492475f1661ddc9815a745a1c894592070661180fdec3d4872e9c3"
+
 [[package]]
 name = "convert_case"
 version = "0.6.0"
@@ -432,9 +438,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058"
 dependencies = [
  "powerfmt",
 ]
@@ -699,14 +705,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]]
@@ -751,14 +757,15 @@ checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e"
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "b2fd658b06e56721792c5df4475705b6cda790e9298d19d2f8af083457bcd127"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log",
  "wasm-bindgen",
  "windows-core",
 ]
@@ -1124,9 +1131,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.26"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "lsp-server"
@@ -1467,7 +1474,7 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy 0.8.23",
+ "zerocopy 0.8.24",
 ]
 
 [[package]]
@@ -1523,12 +1530,13 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.5.0"
+version = "0.7.0"
 dependencies = [
  "anyhow",
  "argfile",
  "async-trait",
  "clap",
+ "const-str",
  "convert_case",
  "crossbeam-channel",
  "dupe",
@@ -1598,6 +1606,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"
@@ -1797,9 +1811,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",
@@ -2046,12 +2060,12 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.19.0"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488960f40a3fd53d72c2a29a58722561dee8afdd175bd88e3db4677d7b2ba600"
+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
 dependencies = [
  "fastrand",
- "getrandom 0.3.1",
+ "getrandom 0.3.2",
  "once_cell",
  "rustix",
  "windows-sys 0.59.0",
@@ -2099,9 +2113,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.39"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
  "itoa",
@@ -2116,15 +2130,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.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 dependencies = [
  "num-conv",
  "time-core",
@@ -2429,9 +2443,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",
 ]
@@ -2546,9 +2560,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"
@@ -2775,9 +2789,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",
 ]
@@ -2845,11 +2859,11 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.23"
+version = "0.8.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
+checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
 dependencies = [
- "zerocopy-derive 0.8.23",
+ "zerocopy-derive 0.8.24",
 ]
 
 [[package]]
@@ -2865,9 +2879,9 @@ dependencies = [
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.23"
+version = "0.8.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
+checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2928,18 +2942,18 @@ dependencies = [
 
 [[package]]
 name = "zstd-safe"
-version = "7.2.3"
+version = "7.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3051792fbdc2e1e143244dc28c60f73d8470e93f3f9cbd0ead44da5ed802722"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.14+zstd.1.5.7"
+version = "2.0.15+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb060d4926e4ac3a3ad15d864e99ceb5f343c6b34f5bd6d81ae6ed417311be5"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
 dependencies = [
  "cc",
  "pkg-config",

{pyrefly-0.5.0 → pyrefly-0.7.0}/pyre2/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly"
-version = "0.5.0"
+version = "0.7.0"
 authors = ["Meta"]
 edition = "2021"
 repository = "https://github.com/facebook/pyre-check/tree/main/pyre2"
@@ -22,6 +22,7 @@ anyhow = "1.0.95"
 argfile = "0.1.6"
 async-trait = "0.1.86"
 clap = { version = "4.5.30", features = ["derive", "env", "string", "unicode", "wrap_help"] }
+const-str = "0.4.3"
 convert_case = "0.6"
 dupe = "0.9.1"
 enum-iterator = "1.4.1"
@@ -45,7 +46,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.5.0 → pyrefly-0.7.0}/pyre2/bin/main.rs

@@ -16,6 +16,8 @@ use clap::Parser;
 use clap::Subcommand;
 use pyre2::clap_env;
 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;
@@ -23,8 +25,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;
 
 #[derive(Debug, Parser)]
@@ -55,7 +55,12 @@ enum Command {
         /// Files to check (glob supported).
         /// If no file is specified, switch to project-checking mode where the files to
         /// check are determined from the closest configuration file.
+        /// When supplied, `project_excludes` in any config files loaded for these files to check
+        /// are ignored, and we use the default excludes unless overridden with the `--project-excludes` flag.
         files: Vec<String>,
+        /// Files to exclude when type checking.
+        #[clap(long, env = clap_env("PROJECT_EXCLUDES"))]
+        project_excludes: Option<Vec<String>>,
         /// Watch for file changes and re-check them.
         #[clap(long, env = clap_env("WATCH"))]
         watch: bool,
@@ -89,7 +94,7 @@ fn exit_on_panic() {
 
 fn get_open_source_config(file: &Path) -> anyhow::Result<ConfigFile> {
     // TODO: Implement upward-searching for open source config.
-    ConfigFile::from_file(file).map_err(|err| {
+    ConfigFile::from_file(file, true).map_err(|err| {
         let file_str = file.display();
         anyhow!("Failed to parse configuration at {file_str}: {err}")
     })
@@ -107,7 +112,7 @@ fn to_exit_code(status: CommandExitStatus) -> ExitCode {
 async fn run_check(
     args: pyre2::run::CheckArgs,
     watch: bool,
-    files_to_check: Globs,
+    files_to_check: FilteredGlobs,
     config_finder: &impl Fn(&Path) -> ConfigFile,
     allow_forget: bool,
 ) -> anyhow::Result<CommandExitStatus> {
@@ -127,6 +132,7 @@ async fn run_check(
 async fn run_check_on_project(
     watch: bool,
     config: Option<PathBuf>,
+    project_excludes: Option<Vec<String>>,
     args: pyre2::run::CheckArgs,
     allow_forget: bool,
 ) -> anyhow::Result<CommandExitStatus> {
@@ -134,10 +140,12 @@ async fn run_check_on_project(
         .map(|c| get_open_source_config(c.as_path()))
         .transpose()?
         .unwrap_or_default();
+    let project_excludes =
+        project_excludes.map_or_else(|| config.project_excludes.clone(), Globs::new);
     run_check(
         args,
         watch,
-        config.project_includes.clone(),
+        FilteredGlobs::new(config.project_includes.clone(), project_excludes),
         &|_| config.clone(),
         allow_forget,
     )
@@ -146,14 +154,17 @@ async fn run_check_on_project(
 
 async fn run_check_on_files(
     files_to_check: Globs,
+    project_excludes: Option<Vec<String>>,
     watch: bool,
     args: pyre2::run::CheckArgs,
     allow_forget: bool,
 ) -> anyhow::Result<CommandExitStatus> {
+    let project_excludes =
+        project_excludes.map_or_else(ConfigFile::default_project_excludes, Globs::new);
     run_check(
         args,
         watch,
-        files_to_check,
+        FilteredGlobs::new(files_to_check, project_excludes),
         // TODO(connernilsen): replace this when we have search paths working
         &|_| ConfigFile::default(),
         allow_forget,
@@ -165,6 +176,7 @@ async fn run_command(command: Command, allow_forget: bool) -> anyhow::Result<Com
     match command {
         Command::Check {
             files,
+            project_excludes,
             watch,
             config,
             args,
@@ -173,9 +185,16 @@ async fn run_command(command: Command, allow_forget: bool) -> anyhow::Result<Com
                 anyhow::bail!("Can either supply `FILES...` OR `--config/-c`, not both.")
             }
             if files.is_empty() {
-                run_check_on_project(watch, config, args, allow_forget).await
+                run_check_on_project(watch, config, project_excludes, args, allow_forget).await
             } else {
-                run_check_on_files(Globs::new(files), watch, args, allow_forget).await
+                run_check_on_files(
+                    Globs::new(files),
+                    project_excludes,
+                    watch,
+                    args,
+                    allow_forget,
+                )
+                .await
             }
         }
         Command::BuckCheck(args) => args.run(),

{pyrefly-0.5.0 → pyrefly-0.7.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;
@@ -16,8 +17,6 @@ use ruff_text_size::Ranged;
 use ruff_text_size::TextRange;
 use starlark_map::small_map::SmallMap;
 
-use crate::alt::id_cache::IdCache;
-use crate::alt::id_cache::IdCacheHistory;
 use crate::alt::traits::Solve;
 use crate::alt::traits::SolveRecursive;
 use crate::binding::binding::Keyed;
@@ -36,6 +35,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;
@@ -71,7 +71,6 @@ pub struct Traces {
 /// We never issue contains queries on these maps.
 #[derive(Debug)]
 pub struct Answers {
-    id_cache: IdCache,
     solver: Solver,
     table: AnswerTable,
     trace: Option<Mutex<Traces>>,
@@ -165,15 +164,25 @@ impl Debug for SolutionsDifference<'_> {
     }
 }
 
-impl DisplayWith<ModuleInfo> for SolutionsDifference<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>, ctx: &ModuleInfo) -> fmt::Result {
+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.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.0.fmt(f, ctx)?;
+        self.key.0.fmt(f, &fake_module_info)?;
         write!(f, "` was ")?;
         missing(f, self.lhs)?;
         write!(f, " now ")?;
@@ -202,6 +211,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>>,
@@ -221,7 +231,7 @@ impl Solutions {
             }
             for (k, v) in x.iter() {
                 match y.get(k) {
-                    Some(v2) if !v.type_eq(v2, &mut TypeEqCtx::default()) => {
+                    Some(v2) if !v.type_eq(v2, ctx) => {
                         return Some(SolutionsDifference {
                             key: (k, k),
                             lhs: Some((v, v)),
@@ -242,9 +252,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
@@ -279,12 +292,7 @@ pub trait LookupAnswer: Sized {
 }
 
 impl Answers {
-    pub fn new(
-        bindings: &Bindings,
-        solver: Solver,
-        history: IdCacheHistory,
-        enable_trace: bool,
-    ) -> Self {
+    pub fn new(bindings: &Bindings, solver: Solver, enable_trace: bool) -> Self {
         fn presize<K: SolveRecursive>(items: &mut AnswerEntry<K>, bindings: &Bindings)
         where
             BindingTable: TableKeyed<K, Value = BindingEntry<K>>,
@@ -304,7 +312,6 @@ impl Answers {
         };
 
         Self {
-            id_cache: IdCache::new(history),
             solver,
             table,
             trace,
@@ -376,7 +383,7 @@ impl Answers {
         fn post_solve<K: Keyed>(items: &mut SolutionsEntry<K>, solver: &Solver) {
             for v in items.values_mut() {
                 let mut vv = (**v).clone();
-                vv.visit0_mut(&mut |x| solver.deep_force_mut(x));
+                vv.visit_mut(&mut |x| solver.deep_force_mut(x));
                 *v = Arc::new(vv);
             }
         }
@@ -410,7 +417,7 @@ impl Answers {
         };
         let v = solver.get(key);
         let mut vv = (*v).clone();
-        vv.visit0_mut(&mut |x| self.solver.deep_force_mut(x));
+        vv.visit_mut(&mut |x| self.solver.deep_force_mut(x));
         Arc::new(vv)
     }
 
@@ -421,10 +428,6 @@ impl Answers {
         self.table.get::<K>().get(k)?.get()
     }
 
-    pub fn id_cache_history(&self) -> IdCacheHistory {
-        self.id_cache.history()
-    }
-
     pub fn for_display(&self, t: Type) -> Type {
         self.solver.for_display(t)
     }
@@ -458,10 +461,6 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         }
     }
 
-    pub fn id_cache(&self) -> &IdCache {
-        &self.current.id_cache
-    }
-
     pub fn bindings(&self) -> &Bindings {
         self.bindings
     }
@@ -579,7 +578,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
@@ -621,7 +620,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);