pyrefly 0.6.0__tar.gz → 0.8.0__tar.gz

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

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

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

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

{pyrefly-0.6.0 → pyrefly-0.8.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.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058"
 dependencies = [
  "powerfmt",
 ]
@@ -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"
@@ -1387,6 +1394,24 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "path-absolutize"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5"
+dependencies = [
+ "path-dedot",
+]
+
+[[package]]
+name = "path-dedot"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397"
+dependencies = [
+ "once_cell",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -1467,7 +1492,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 +1548,13 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.6.0"
+version = "0.8.0"
 dependencies = [
  "anyhow",
  "argfile",
  "async-trait",
  "clap",
+ "const-str",
  "convert_case",
  "crossbeam-channel",
  "dupe",
@@ -1545,6 +1571,7 @@ dependencies = [
  "notify",
  "parse-display",
  "paste",
+ "path-absolutize",
  "pretty_assertions",
  "pyrefly_derive",
  "rayon",
@@ -2105,9 +2132,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.40"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
  "itoa",
@@ -2128,9 +2155,9 @@ checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.21"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 dependencies = [
  "num-conv",
  "time-core",
@@ -2851,11 +2878,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]]
@@ -2871,9 +2898,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",
@@ -2934,18 +2961,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.6.0 → pyrefly-0.8.0}/pyre2/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly"
-version = "0.6.0"
+version = "0.8.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"
@@ -37,6 +38,7 @@ memory-stats = "1.2.0"
 notify = "5"
 parse-display = "0.8.2"
 paste = "1.0.14"
+path-absolutize = { version = "3.0", features = ["use_unix_paths_on_wasm"] }
 pyrefly_derive = { path = "../pyrefly_derive" }
 rayon = "1.9.0"
 regex = "1.11.1"
@@ -72,5 +74,11 @@ zstd = { version = "0.13", features = ["experimental", "zstdmt"] }
 [target.'cfg(not(target_arch = "wasm32"))'.build-dependencies]
 zstd = { version = "0.13", features = ["experimental", "zstdmt"] }
 
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+zstd = "0.13"
+
+[target.'cfg(target_arch = "wasm32")'.build-dependencies]
+zstd = "0.13"
+
 [lints]
 rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }

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

@@ -12,10 +12,15 @@ use std::path::PathBuf;
 use std::process::ExitCode;
 
 use anyhow::anyhow;
+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;
@@ -23,7 +28,6 @@ use pyre2::run::CheckArgs;
 use pyre2::run::CommandExitStatus;
 use pyre2::run::LspArgs;
 use pyre2::ConfigFile;
-use pyre2::Globs;
 use pyre2::NotifyWatcher;
 
 #[derive(Debug, Parser)]
@@ -54,7 +58,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,
@@ -87,13 +96,23 @@ 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}")
     })
 }
 
+fn get_implicit_config_path_from(path: &Path) -> anyhow::Result<PathBuf> {
+    if let Some(search_result) = first_match(path, &["pyrefly.toml", "pyproject.toml"]) {
+        Ok(search_result.to_path_buf())
+    } else {
+        Err(anyhow!(
+            "Cannot locate a config file using upward-searching heuristics from `{}`",
+            path.display()
+        ))
+    }
+}
+
 fn to_exit_code(status: CommandExitStatus) -> ExitCode {
     match status {
         CommandExitStatus::Success => ExitCode::SUCCESS,
@@ -106,7 +125,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> {
@@ -123,38 +142,76 @@ async fn run_check(
     }
 }
 
+fn get_implicit_config_for_project() -> ConfigFile {
+    fn get_config_path() -> anyhow::Result<ConfigFile> {
+        let current_dir = std::env::current_dir().context("cannot identify current dir")?;
+        let config_path = get_implicit_config_path_from(&current_dir)?;
+        get_open_source_config(&config_path)
+    }
+    get_config_path().unwrap_or_else(|err| {
+        tracing::debug!("{err}. Default configuration will be used as fallback.");
+        ConfigFile::default()
+    })
+}
+
 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> {
-    let config = config
-        .map(|c| get_open_source_config(c.as_path()))
-        .transpose()?
-        .unwrap_or_default();
+    let config = if let Some(explicit_config_path) = config {
+        tracing::info!(
+            "Using config file explicitly provided at `{}`",
+            explicit_config_path.display()
+        );
+        get_open_source_config(&explicit_config_path)?
+    } else {
+        get_implicit_config_for_project()
+    };
+    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,
     )
     .await
 }
 
+fn get_implicit_config_for_file(path: &Path) -> ConfigFile {
+    fn get_implicit_config_path(path: &Path) -> anyhow::Result<ConfigFile> {
+        let parent_dir = path
+            .parent()
+            .with_context(|| format!("Path `{}` has no parent directory", path.display()))?
+            .absolutize()
+            .with_context(|| format!("Path `{}` cannot be absolutized", path.display()))?;
+        let config_path = get_implicit_config_path_from(parent_dir.as_ref())?;
+        get_open_source_config(&config_path)
+    }
+    get_implicit_config_path(path).unwrap_or_else(|err| {
+        tracing::debug!("{err}. Default configuration will be used as fallback.");
+        ConfigFile::default()
+    })
+}
+
 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,
-        // TODO(connernilsen): replace this when we have search paths working
-        &|_| ConfigFile::default(),
+        FilteredGlobs::new(files_to_check, project_excludes),
+        &|path| get_implicit_config_for_file(path),
         allow_forget,
     )
     .await
@@ -164,6 +221,7 @@ async fn run_command(command: Command, allow_forget: bool) -> anyhow::Result<Com
     match command {
         Command::Check {
             files,
+            project_excludes,
             watch,
             config,
             args,
@@ -172,9 +230,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.6.0 → pyrefly-0.8.0}/pyre2/lib/alt/answers.rs

@@ -17,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;
@@ -73,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>>,
@@ -295,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>>,
@@ -320,7 +312,6 @@ impl Answers {
         };
 
         Self {
-            id_cache: IdCache::new(history),
             solver,
             table,
             trace,
@@ -392,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);
             }
         }
@@ -426,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)
     }
 
@@ -437,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)
     }
@@ -474,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
     }
@@ -603,8 +586,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         } else if self.solver().is_subset_eq(got, want, self.type_order()) {
             got.clone()
         } else {
-            self.solver()
-                .error(want, got, errors, ErrorKind::TypeMismatch, loc, tcc);
+            self.solver().error(want, got, errors, loc, tcc);
             want.clone()
         }
     }

{pyrefly-0.6.0 → pyrefly-0.8.0}/pyre2/lib/alt/attr.rs

@@ -39,6 +39,7 @@ use crate::types::quantified::Quantified;
 use crate::types::stdlib::Stdlib;
 use crate::types::tuple::Tuple;
 use crate::types::types::AnyStyle;
+use crate::types::types::SuperObj;
 use crate::types::types::Type;
 
 #[derive(Debug)]
@@ -290,8 +291,8 @@ enum AttributeBase {
     /// Properties are handled via a special case so that we can understand
     /// setter decorators.
     Property(Type),
-    /// Result of a super() call. See Type::SuperInstance for details on what these ClassTypes are.
-    SuperInstance(ClassType, ClassType),
+    /// Result of a super() call. See Type::SuperInstance for details on what these fields are.
+    SuperInstance(ClassType, SuperObj),
 }
 
 impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
@@ -830,7 +831,10 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
             AttributeBase::SuperInstance(cls, obj) => {
                 match self.get_super_attribute(&cls, &obj, attr_name) {
                     Some(attr) => LookupResult::Found(attr),
-                    None if self.extends_any(&obj) => {
+                    // TODO(rechen): handle SuperObj::Class here.
+                    None if let SuperObj::Instance(cls) = obj
+                        && self.extends_any(&cls) =>
+                    {
                         LookupResult::found_type(Type::Any(AnyStyle::Implicit))
                     }
                     None => LookupResult::NotFound(NotFound::Attribute(cls)),
@@ -961,7 +965,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
     }
 
     fn get_exported_type(&self, exports: &Exports, from: ModuleName, name: &Name) -> Option<Type> {
-        if exports.contains(name, self.exports) {
+        if exports.exports(self.exports).contains(name) {
             Some(
                 self.get_from_module(from, &KeyExport(name.clone()))
                     .arc_clone(),
@@ -1073,7 +1077,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                     None
                 }
             }
-            Type::SuperInstance(cls, obj) => Some(AttributeBase::SuperInstance(*cls, *obj)),
+            Type::SuperInstance(box (cls, obj)) => Some(AttributeBase::SuperInstance(cls, obj)),
             // TODO: check to see which ones should have class representations
             Type::Union(_)
             | Type::SpecialForm(_)

{pyrefly-0.6.0 → pyrefly-0.8.0}/pyre2/lib/alt/call.rs

@@ -581,7 +581,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 .unwrap_or(closest_overload),
             None => closest_overload,
         };
-        signature.visit_mut(&mut |x| *x = self.solver().for_display((*x).clone()));
+        signature.recurse_mut(&mut |x| *x = self.solver().for_display((*x).clone()));
         self.error(
             errors,
             range,

{pyrefly-0.6.0 → pyrefly-0.8.0}/pyre2/lib/alt/callable.rs

@@ -142,7 +142,11 @@ impl CallArgPreEval<'_> {
         context: Option<&dyn Fn() -> ErrorContext>,
     ) {
         let tcc = &|| TypeCheckContext {
-            kind: TypeCheckKind::CallArgument(param_name.cloned(), callable_name.cloned()),
+            kind: if vararg {
+                TypeCheckKind::CallVarArgs(param_name.cloned(), callable_name.cloned())
+            } else {
+                TypeCheckKind::CallArgument(param_name.cloned(), callable_name.cloned())
+            },
             context: context.map(|ctx| ctx()),
         };
         match self {
@@ -260,15 +264,15 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                             iparams.next();
                             Some((ty, Some(name), false))
                         }
-                        Param::VarArg(Type::Unpack(box ty)) => {
+                        Param::VarArg(name, Type::Unpack(box ty)) => {
                             // Store args that get matched to an unpacked *args param
                             // Matched args are typechecked separately later
-                            unpacked_vararg = Some(ty);
+                            unpacked_vararg = Some((name, ty));
                             unpacked_vararg_matched_args.push(arg_pre.clone());
                             matched_unpacked_vararg = true;
                             None
                         }
-                        Param::VarArg(ty) => Some((ty, None, true)),
+                        Param::VarArg(name, ty) => Some((ty, name.as_ref(), true)),
                         Param::KwOnly(..) | Param::Kwargs(..) => None,
                     }
                 } else {
@@ -300,7 +304,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 }
             }
         }
-        if let Some(unpacked_param_ty) = unpacked_vararg {
+        if let Some((unpacked_name, unpacked_param_ty)) = unpacked_vararg {
             let mut prefix = Vec::new();
             let mut middle = Vec::new();
             let mut suffix = Vec::new();
@@ -355,7 +359,10 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 range,
                 arg_errors,
                 &|| TypeCheckContext {
-                    kind: TypeCheckKind::CallVarArgs(callable_name.clone()),
+                    kind: TypeCheckKind::CallUnpackVarArgs(
+                        unpacked_name.clone(),
+                        callable_name.clone(),
+                    ),
                     context: context.map(|ctx| ctx()),
                 },
             );