pyrefly 0.31.0__tar.gz → 0.31.1__tar.gz

{pyrefly-0.31.0 → pyrefly-0.31.1}/Cargo.lock

@@ -10,18 +10,18 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
 
 [[package]]
 name = "addr2line"
-version = "0.19.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "ahash"
@@ -236,17 +236,17 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.67"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1031,9 +1031,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.27.2"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
@@ -1662,11 +1662,11 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
@@ -1773,9 +1773,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "object"
-version = "0.30.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -2064,7 +2064,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.31.0"
+version = "0.31.1"
 dependencies = [
  "anstream",
  "anyhow",
@@ -2113,7 +2113,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_build"
-version = "0.31.0"
+version = "0.31.1"
 dependencies = [
  "anyhow",
  "dupe",
@@ -2129,7 +2129,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_bundled"
-version = "0.31.0"
+version = "0.31.1"
 dependencies = [
  "anyhow",
  "starlark_map",
@@ -2139,7 +2139,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_config"
-version = "0.31.0"
+version = "0.31.1"
 dependencies = [
  "anyhow",
  "clap",
@@ -2151,6 +2151,7 @@ dependencies = [
  "parse-display",
  "pretty_assertions",
  "pulldown-cmark",
+ "pyrefly_build",
  "pyrefly_python",
  "pyrefly_util",
  "regex",
@@ -2172,7 +2173,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_derive"
-version = "0.31.0"
+version = "0.31.1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2181,7 +2182,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_python"
-version = "0.31.0"
+version = "0.31.1"
 dependencies = [
  "anyhow",
  "dupe",
@@ -2204,7 +2205,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_types"
-version = "0.31.0"
+version = "0.31.1"
 dependencies = [
  "compact_str 0.8.0",
  "dupe",
@@ -2224,7 +2225,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_util"
-version = "0.31.0"
+version = "0.31.1"
 dependencies = [
  "anstream",
  "anyhow",

{pyrefly-0.31.0 → pyrefly-0.31.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrefly
-Version: 0.31.0
+Version: 0.31.1
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_build/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_build"
-version = "0.31.0"
+version = "0.31.1"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_build/src/buck/buck_check.rs

@@ -11,14 +11,17 @@ use std::path::Path;
 use std::path::PathBuf;
 
 use anyhow::Context as _;
+use dupe::Dupe as _;
 use pyrefly_python::module_name::ModuleName;
 use pyrefly_python::module_path::ModulePath;
+use pyrefly_python::sys_info::SysInfo;
 use pyrefly_util::absolutize::Absolutize as _;
 use pyrefly_util::fs_anyhow;
 use starlark_map::small_map::SmallMap;
 use tracing::debug;
 use vec1::Vec1;
 
+use crate::handle::Handle;
 use crate::source_db::SourceDatabase;
 
 #[derive(Debug, PartialEq, Eq, Clone)]
@@ -97,26 +100,34 @@ fn create_manifest_item_index(
         .collect()
 }
 
+#[derive(Debug)]
 pub struct BuckCheckSourceDatabase {
     sources: SmallMap<ModuleName, Vec1<PathBuf>>,
     dependencies: SmallMap<ModuleName, Vec1<PathBuf>>,
+    sys_info: SysInfo,
 }
 
 impl SourceDatabase for BuckCheckSourceDatabase {
-    fn modules_to_check(&self) -> Vec<(ModuleName, PathBuf)> {
+    fn modules_to_check(&self) -> Vec<Handle> {
         self.sources
             .iter()
-            .flat_map(|(name, paths)| paths.iter().map(|path| (*name, path.clone())))
+            .flat_map(|(name, paths)| {
+                paths.iter().map(|path| {
+                    Handle::new(
+                        name.dupe(),
+                        ModulePath::filesystem(path.to_path_buf()),
+                        self.sys_info.dupe(),
+                    )
+                })
+            })
             .collect()
     }
 
-    fn list(&self) -> SmallMap<ModuleName, pyrefly_python::module_path::ModulePath> {
-        // Iterate the sources second so if there are any conflicts the source wins.
-        self.dependencies
-            .iter()
-            .chain(self.sources.iter())
-            .map(|(name, paths)| (*name, ModulePath::filesystem(paths.first().clone())))
-            .collect()
+    fn lookup(&self, module: &ModuleName, _: Option<&Handle>) -> Option<ModulePath> {
+        self.sources
+            .get(module)
+            .or_else(|| self.dependencies.get(module))
+            .map(|p| ModulePath::filesystem(p.first().clone()))
     }
 }
 
@@ -125,23 +136,31 @@ impl BuckCheckSourceDatabase {
         source_manifests: &[PathBuf],
         dependency_manifests: &[PathBuf],
         typeshed_manifests: &[PathBuf],
+        sys_info: SysInfo,
     ) -> anyhow::Result<Self> {
         let sources = read_manifest_files(source_manifests)?;
         let dependencies = read_manifest_files(dependency_manifests)?;
         let typeshed = read_manifest_files(typeshed_manifests)?;
-        Ok(Self::from_manifest_items(sources, dependencies, typeshed))
+        Ok(Self::from_manifest_items(
+            sources,
+            dependencies,
+            typeshed,
+            sys_info,
+        ))
     }
 
     fn from_manifest_items(
         source_items: Vec<ManifestItem>,
         dependency_items: Vec<ManifestItem>,
         typeshed_items: Vec<ManifestItem>,
+        sys_info: SysInfo,
     ) -> Self {
         Self {
             sources: create_manifest_item_index(source_items.into_iter()),
             dependencies: create_manifest_item_index(
                 dependency_items.into_iter().chain(typeshed_items),
             ),
+            sys_info,
         }
     }
 }
@@ -166,7 +185,7 @@ mod tests {
     }
 
     impl BuckCheckSourceDatabase {
-        fn lookup(&self, module: ModuleName) -> LookupResult {
+        fn lookup_for_test(&self, module: ModuleName) -> LookupResult {
             match self.sources.get(&module) {
                 Some(paths) => LookupResult::OwningSource(paths.first().clone()),
                 None => match self.dependencies.get(&module) {
@@ -214,21 +233,22 @@ mod tests {
                 module_name: ModuleName::from_str("baz"),
                 absolute_path: baz_path.clone(),
             }],
+            SysInfo::default(),
         );
         assert_eq!(
-            source_db.lookup(ModuleName::from_str("foo")),
+            source_db.lookup_for_test(ModuleName::from_str("foo")),
             LookupResult::OwningSource(foo_path)
         );
         assert_eq!(
-            source_db.lookup(ModuleName::from_str("bar")),
+            source_db.lookup_for_test(ModuleName::from_str("bar")),
             LookupResult::ExternalSource(bar_path)
         );
         assert_eq!(
-            source_db.lookup(ModuleName::from_str("baz")),
+            source_db.lookup_for_test(ModuleName::from_str("baz")),
             LookupResult::ExternalSource(baz_path)
         );
         assert_eq!(
-            source_db.lookup(ModuleName::from_str("qux")),
+            source_db.lookup_for_test(ModuleName::from_str("qux")),
             LookupResult::NoSource
         );
     }
@@ -263,13 +283,14 @@ mod tests {
                 },
             ],
             vec![],
+            SysInfo::default(),
         );
         assert_eq!(
-            source_db.lookup(ModuleName::from_str("foo")),
+            source_db.lookup_for_test(ModuleName::from_str("foo")),
             LookupResult::OwningSource(src_foo_path)
         );
         assert_eq!(
-            source_db.lookup(ModuleName::from_str("bar")),
+            source_db.lookup_for_test(ModuleName::from_str("bar")),
             LookupResult::OwningSource(src_bar_path)
         );
     }
@@ -303,13 +324,14 @@ mod tests {
                 },
             ],
             vec![],
+            SysInfo::default(),
         );
         assert_eq!(
-            source_db.lookup(ModuleName::from_str("foo")),
+            source_db.lookup_for_test(ModuleName::from_str("foo")),
             LookupResult::OwningSource(foo_pyi_path)
         );
         assert_eq!(
-            source_db.lookup(ModuleName::from_str("bar")),
+            source_db.lookup_for_test(ModuleName::from_str("bar")),
             LookupResult::ExternalSource(bar_pyi_path)
         );
     }
@@ -364,21 +386,22 @@ mod tests {
                     absolute_path: typeshed_d_path.clone(),
                 },
             ],
+            SysInfo::default(),
         );
         assert_eq!(
-            source_db.lookup(ModuleName::from_str("a")),
+            source_db.lookup_for_test(ModuleName::from_str("a")),
             LookupResult::ExternalSource(dep_a_path)
         );
         assert_eq!(
-            source_db.lookup(ModuleName::from_str("b")),
+            source_db.lookup_for_test(ModuleName::from_str("b")),
             LookupResult::ExternalSource(dep_b_path)
         );
         assert_eq!(
-            source_db.lookup(ModuleName::from_str("c")),
+            source_db.lookup_for_test(ModuleName::from_str("c")),
             LookupResult::ExternalSource(typeshed_c_path)
         );
         assert_eq!(
-            source_db.lookup(ModuleName::from_str("d")),
+            source_db.lookup_for_test(ModuleName::from_str("d")),
             LookupResult::ExternalSource(dep_d_path)
         );
     }

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_build/src/handle.rs

@@ -17,6 +17,9 @@ pub struct Handle {
     module: ModuleName,
     path: ModulePath,
     sys_info: SysInfo,
+    /// If this `Handle` came from a build system, which target is the module being
+    /// referenced a part of?
+    /// Note: a [`ModuleName`] and [`ModulePath`] pair can be part of multiple targets.
     target: Option<Target>,
 }
 

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_build/src/lib.rs

@@ -29,4 +29,5 @@
 
 pub mod buck;
 pub mod handle;
+pub mod map_db;
 pub mod source_db;

pyrefly-0.31.1/crates/pyrefly_build/src/map_db.rs

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+use std::ops::Deref;
+use std::ops::DerefMut;
+
+use dupe::Dupe as _;
+use pyrefly_python::module_name::ModuleName;
+use pyrefly_python::module_path::ModulePath;
+use pyrefly_python::sys_info::SysInfo;
+use starlark_map::small_map::SmallMap;
+use vec1::Vec1;
+
+use crate::handle::Handle;
+use crate::source_db::SourceDatabase;
+
+/// A simple [`SourceDatabase`] that can be used for easy setup and testing.
+#[derive(Debug, PartialEq, Eq)]
+pub struct MapDatabase(SmallMap<ModuleName, Vec1<ModulePath>>, SysInfo);
+
+impl MapDatabase {
+    pub fn new(sys_info: SysInfo) -> Self {
+        Self(SmallMap::new(), sys_info)
+    }
+
+    pub fn insert(&mut self, name: ModuleName, path: ModulePath) {
+        match self.0.get_mut(&name) {
+            Some(list) => list.push(path),
+            None => {
+                self.0.insert(name, Vec1::new(path));
+            }
+        }
+    }
+}
+
+impl Deref for MapDatabase {
+    type Target = SmallMap<ModuleName, Vec1<ModulePath>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl DerefMut for MapDatabase {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl SourceDatabase for MapDatabase {
+    fn modules_to_check(&self) -> Vec<Handle> {
+        self.0
+            .iter()
+            .flat_map(|(name, paths)| paths.iter().map(move |p| (name, p)))
+            .map(|(name, path)| Handle::new(name.dupe(), path.dupe(), self.1.dupe()))
+            .collect()
+    }
+
+    fn lookup(&self, module: &ModuleName, _: Option<&Handle>) -> Option<ModulePath> {
+        self.0.get(module).map(|paths| paths.last().dupe())
+    }
+}

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_build/src/source_db.rs

@@ -6,7 +6,6 @@
  */
 
 use std::fmt;
-use std::path::PathBuf;
 
 use dupe::Dupe;
 use pyrefly_python::module_name::ModuleName;
@@ -15,10 +14,11 @@ use serde::Deserialize;
 use serde::Deserializer;
 use serde::Serialize;
 use serde::Serializer;
-use starlark_map::small_map::SmallMap;
 use static_interner::Intern;
 use static_interner::Interner;
 
+use crate::handle::Handle;
+
 // We're interning `Target`s, since they'll be duplicated all over the place,
 // and it would be nice to have something that implements `Copy`.
 // We choose Interning over `Arc`, since we want to make sure all `Target`s
@@ -56,7 +56,7 @@ impl Target {
 /// Represents a virtual filesystem provided by a build system. A build system
 /// should understand the relationship between targets and importable qualified
 /// paths to the files contained in the build system.
-pub trait SourceDatabase {
-    fn modules_to_check(&self) -> Vec<(ModuleName, PathBuf)>;
-    fn list(&self) -> SmallMap<ModuleName, ModulePath>;
+pub trait SourceDatabase: Send + Sync + fmt::Debug {
+    fn modules_to_check(&self) -> Vec<Handle>;
+    fn lookup(&self, module: &ModuleName, origin: Option<&Handle>) -> Option<ModulePath>;
 }

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_bundled/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_bundled"
-version = "0.31.0"
+version = "0.31.1"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_config/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_config"
-version = "0.31.0"
+version = "0.31.1"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"
@@ -17,6 +17,7 @@ dupe = "0.9.1"
 enum-iterator = "2.1"
 itertools = "0.14.0"
 parse-display = "0.8.2"
+pyrefly_build = { path = "../pyrefly_build" }
 pyrefly_python = { path = "../pyrefly_python" }
 pyrefly_util = { path = "../pyrefly_util" }
 regex = "1.11.1"

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_config/src/base.rs

@@ -99,6 +99,13 @@ impl PartialEq for ExtraConfigs {
 }
 
 impl ConfigBase {
+    pub fn default_for_ide_without_config() -> Self {
+        Self {
+            disable_type_errors_in_ide: Some(true),
+            ..Default::default()
+        }
+    }
+
     pub fn get_errors(base: &Self) -> Option<&ErrorDisplayConfig> {
         base.errors.as_ref()
     }

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_config/src/config.rs

@@ -15,12 +15,13 @@ use anyhow::Context;
 use anyhow::Result;
 use anyhow::anyhow;
 use itertools::Itertools;
+use pyrefly_build::source_db::SourceDatabase;
 use pyrefly_python::module_name::ModuleName;
-use pyrefly_python::module_path::ModulePath;
 use pyrefly_python::sys_info::PythonPlatform;
 use pyrefly_python::sys_info::PythonVersion;
 use pyrefly_python::sys_info::SysInfo;
 use pyrefly_util::absolutize::Absolutize as _;
+use pyrefly_util::arc_id::ArcId;
 use pyrefly_util::fs_anyhow;
 use pyrefly_util::globs::FilteredGlobs;
 use pyrefly_util::globs::Glob;
@@ -28,7 +29,6 @@ use pyrefly_util::globs::Globs;
 use pyrefly_util::prelude::VecExt;
 use serde::Deserialize;
 use serde::Serialize;
-use starlark_map::small_map::SmallMap;
 use tracing::debug;
 
 use crate::base::ConfigBase;
@@ -288,9 +288,11 @@ pub struct ConfigFile {
     )]
     pub use_ignore_files: bool,
 
-    /// Completely custom module to path mappings. Currently not exposed to the user.
-    #[serde(skip)]
-    pub custom_module_paths: SmallMap<ModuleName, ModulePath>,
+    /// Database understanding the mapping between source files and import paths,
+    /// especially within the context of a build system. This is used for getting handles
+    /// for a path and doing module finding.
+    #[serde(skip, default)]
+    pub source_db: Option<ArcId<Box<dyn SourceDatabase>>>,
 
     /// Skips the check to ensure any `-stubs` `site_package_path` entries have an
     /// installed non-stubs package.
@@ -324,7 +326,7 @@ impl Default for ConfigFile {
             python_environment: Default::default(),
             root: Default::default(),
             sub_configs: Default::default(),
-            custom_module_paths: Default::default(),
+            source_db: Default::default(),
             use_untyped_imports: None,
             use_ignore_files: true,
             ignore_missing_source: true,
@@ -340,6 +342,7 @@ impl ConfigFile {
             project_includes: Self::default_project_includes(),
             project_excludes: Self::default_project_excludes(),
             import_root: Some(layout.get_import_root(root)),
+            root: ConfigBase::default_for_ide_without_config(),
             ..Default::default()
         };
         // ignore failures rewriting path to config, since we're trying to construct
@@ -904,7 +907,7 @@ mod tests {
                     untyped_def_behavior: Some(UntypedDefBehavior::CheckAndInferReturnType),
                     permissive_ignores: None,
                 },
-                custom_module_paths: Default::default(),
+                source_db: Default::default(),
                 sub_configs: vec![SubConfig {
                     matches: Glob::new("sub/project/**".to_owned()).unwrap(),
                     settings: ConfigBase {
@@ -1140,7 +1143,7 @@ mod tests {
                 skip_interpreter_query: false,
             },
             root: Default::default(),
-            custom_module_paths: Default::default(),
+            source_db: Default::default(),
             sub_configs: vec![SubConfig {
                 matches: Glob::new("sub/project/**".to_owned()).unwrap(),
                 settings: Default::default(),
@@ -1195,7 +1198,7 @@ mod tests {
             fallback_search_path: Vec::new(),
             python_environment,
             root: Default::default(),
-            custom_module_paths: Default::default(),
+            source_db: Default::default(),
             sub_configs: vec![SubConfig {
                 matches: sub_config_matches,
                 settings: Default::default(),

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_derive/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_derive"
-version = "0.31.0"
+version = "0.31.1"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_python/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_python"
-version = "0.31.0"
+version = "0.31.1"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_types/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_types"
-version = "0.31.0"
+version = "0.31.1"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.31.0 → pyrefly-0.31.1}/crates/pyrefly_types/src/callable.rs

@@ -456,12 +456,8 @@ impl Callable {
         )
     }
 
-    pub fn subst_self_type_mut(
-        &mut self,
-        replacement: &Type,
-        is_subset: &dyn Fn(&Type, &Type) -> bool,
-    ) {
-        self.visit_mut(&mut |t: &mut Type| t.subst_self_type_mut(replacement, is_subset));
+    pub fn subst_self_type_mut(&mut self, replacement: &Type) {
+        self.visit_mut(&mut |t: &mut Type| t.subst_self_type_mut(replacement));
     }
 }