pyrefly 0.23.0__tar.gz → 0.24.0__tar.gz

{pyrefly-0.23.0 → pyrefly-0.24.0}/Cargo.lock

@@ -198,6 +198,36 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "attribute-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0053e96dd3bec5b4879c23a138d6ef26f2cb936c9cdc96274ac2b9ed44b5bb54"
+dependencies = [
+ "attribute-derive-macro",
+ "derive-where",
+ "manyhow",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "attribute-derive-macro"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "463b53ad0fd5b460af4b1915fe045ff4d946d025fb6c4dc3337752eaa980f71b"
+dependencies = [
+ "collection_literals",
+ "interpolator",
+ "manyhow",
+ "proc-macro-utils",
+ "proc-macro2",
+ "quote",
+ "quote-use",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -219,12 +249,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -386,6 +410,12 @@ dependencies = [
  "unicode-width 0.2.0",
 ]
 
+[[package]]
+name = "collection_literals"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b3f65b8fb8e88ba339f7d23a390fe1b0896217da05e2a66c584c9b29a91df8"
+
 [[package]]
 name = "colorchoice"
 version = "1.0.0"
@@ -637,6 +667,17 @@ dependencies = [
  "powerfmt",
 ]
 
+[[package]]
+name = "derive-where"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "diff"
 version = "0.1.12"
@@ -698,18 +739,18 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "enum-iterator"
-version = "1.4.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689"
+checksum = "c280b9e6b3ae19e152d8e31cf47f18389781e119d4013a2a2bb0180e5facc635"
 dependencies = [
  "enum-iterator-derive",
 ]
 
 [[package]]
 name = "enum-iterator-derive"
-version = "1.2.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb"
+checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -923,6 +964,29 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "get-size-derive2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aac2af9f9a6a50e31b1e541d05b7925add83d3982c2793193fe9d4ee584323c"
+dependencies = [
+ "attribute-derive",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "get-size2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a0312efd19e1c45922dfcc2d6806d3ffc4bca261f89f31fcc4f63f438d885"
+dependencies = [
+ "compact_str 0.9.0",
+ "get-size-derive2",
+ "hashbrown 0.15.2",
+ "smallvec",
+]
+
 [[package]]
 name = "getopts"
 version = "0.2.21"
@@ -1003,6 +1067,15 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[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"
@@ -1234,6 +1307,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "interpolator"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71dd52191aae121e8611f1e8dc3e324dd0dd1dee1e6dd91d10ee07a3cfb4d9d8"
+
 [[package]]
 name = "is-macro"
 version = "0.3.6"
@@ -1372,6 +1451,12 @@ dependencies = [
  "cc",
 ]
 
+[[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.4"
@@ -1436,6 +1521,29 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "manyhow"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b33efb3ca6d3b07393750d4030418d594ab1139cee518f0dc88db70fec873587"
+dependencies = [
+ "manyhow-macros",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "manyhow-macros"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46fce34d199b78b6e6073abf984c9cf5fd3e9330145a93ee0738a7443e371495"
+dependencies = [
+ "proc-macro-utils",
+ "proc-macro2",
+ "quote",
+]
+
 [[package]]
 name = "maplit"
 version = "1.0.2"
@@ -1817,6 +1925,17 @@ dependencies = [
  "yansi 0.5.1",
 ]
 
+[[package]]
+name = "proc-macro-utils"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eeaf08a13de400bc215877b5bdc088f241b12eb42f0a548d3390dc1c56bb7071"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "smallvec",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.95"
@@ -1872,11 +1991,10 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.23.0"
+version = "0.24.0"
 dependencies = [
  "anstream",
  "anyhow",
- "base64",
  "blake3",
  "clap",
  "configparser",
@@ -1919,7 +2037,7 @@ dependencies = [
  "tikv-jemallocator",
  "tokio",
  "toml",
- "toml_edit",
+ "toml_edit 0.23.1",
  "tracing",
  "vec1",
  "walkdir",
@@ -1930,7 +2048,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_derive"
-version = "0.23.0"
+version = "0.24.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1939,7 +2057,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_python"
-version = "0.23.0"
+version = "0.24.0"
 dependencies = [
  "anyhow",
  "dupe",
@@ -1961,7 +2079,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_util"
-version = "0.23.0"
+version = "0.24.0"
 dependencies = [
  "anstream",
  "anyhow",
@@ -2030,6 +2148,28 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "quote-use"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9619db1197b497a36178cfc736dc96b271fe918875fbf1344c436a7e93d0321e"
+dependencies = [
+ "quote",
+ "quote-use-macros",
+]
+
+[[package]]
+name = "quote-use-macros"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82ebfb7faafadc06a7ab141a6f67bcfb24cb8beb158c6fe933f2f035afa99f35"
+dependencies = [
+ "proc-macro-utils",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "r-efi"
 version = "5.2.0"
@@ -2173,7 +2313,7 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 [[package]]
 name = "ruff_annotate_snippets"
 version = "0.1.0"
-source = "git+https://github.com/astral-sh/ruff/?rev=6e785867c3a97691972e8a49c372b3effba90032#6e785867c3a97691972e8a49c372b3effba90032"
+source = "git+https://github.com/astral-sh/ruff/?rev=9bee8376a17401f9736b45fdefffb62edc2f1668#9bee8376a17401f9736b45fdefffb62edc2f1668"
 dependencies = [
  "anstyle",
  "memchr",
@@ -2183,11 +2323,12 @@ dependencies = [
 [[package]]
 name = "ruff_python_ast"
 version = "0.0.0"
-source = "git+https://github.com/astral-sh/ruff/?rev=6e785867c3a97691972e8a49c372b3effba90032#6e785867c3a97691972e8a49c372b3effba90032"
+source = "git+https://github.com/astral-sh/ruff/?rev=9bee8376a17401f9736b45fdefffb62edc2f1668#9bee8376a17401f9736b45fdefffb62edc2f1668"
 dependencies = [
  "aho-corasick",
  "bitflags 2.9.0",
  "compact_str 0.9.0",
+ "get-size2",
  "is-macro",
  "itertools 0.14.0",
  "memchr",
@@ -2195,16 +2336,18 @@ dependencies = [
  "ruff_source_file",
  "ruff_text_size",
  "rustc-hash",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "ruff_python_parser"
 version = "0.0.0"
-source = "git+https://github.com/astral-sh/ruff/?rev=6e785867c3a97691972e8a49c372b3effba90032#6e785867c3a97691972e8a49c372b3effba90032"
+source = "git+https://github.com/astral-sh/ruff/?rev=9bee8376a17401f9736b45fdefffb62edc2f1668#9bee8376a17401f9736b45fdefffb62edc2f1668"
 dependencies = [
  "bitflags 2.9.0",
  "bstr",
  "compact_str 0.9.0",
+ "get-size2",
  "memchr",
  "ruff_python_ast",
  "ruff_python_trivia",
@@ -2219,7 +2362,7 @@ dependencies = [
 [[package]]
 name = "ruff_python_trivia"
 version = "0.0.0"
-source = "git+https://github.com/astral-sh/ruff/?rev=6e785867c3a97691972e8a49c372b3effba90032#6e785867c3a97691972e8a49c372b3effba90032"
+source = "git+https://github.com/astral-sh/ruff/?rev=9bee8376a17401f9736b45fdefffb62edc2f1668#9bee8376a17401f9736b45fdefffb62edc2f1668"
 dependencies = [
  "itertools 0.14.0",
  "ruff_source_file",
@@ -2230,7 +2373,7 @@ dependencies = [
 [[package]]
 name = "ruff_source_file"
 version = "0.0.0"
-source = "git+https://github.com/astral-sh/ruff/?rev=6e785867c3a97691972e8a49c372b3effba90032#6e785867c3a97691972e8a49c372b3effba90032"
+source = "git+https://github.com/astral-sh/ruff/?rev=9bee8376a17401f9736b45fdefffb62edc2f1668#9bee8376a17401f9736b45fdefffb62edc2f1668"
 dependencies = [
  "memchr",
  "ruff_text_size",
@@ -2239,7 +2382,10 @@ dependencies = [
 [[package]]
 name = "ruff_text_size"
 version = "0.0.0"
-source = "git+https://github.com/astral-sh/ruff/?rev=6e785867c3a97691972e8a49c372b3effba90032#6e785867c3a97691972e8a49c372b3effba90032"
+source = "git+https://github.com/astral-sh/ruff/?rev=9bee8376a17401f9736b45fdefffb62edc2f1668#9bee8376a17401f9736b45fdefffb62edc2f1668"
+dependencies = [
+ "get-size2",
+]
 
 [[package]]
 name = "rustc-demangle"
@@ -2253,6 +2399,19 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
+[[package]]
+name = "rustix"
+version = "0.38.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+dependencies = [
+ "bitflags 2.9.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "rustix"
 version = "1.0.7"
@@ -2262,7 +2421,7 @@ dependencies = [
  "bitflags 2.9.0",
  "errno",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.9.4",
  "windows-sys 0.59.0",
 ]
 
@@ -2402,6 +2561,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_with"
 version = "1.14.0"
@@ -2623,7 +2791,7 @@ dependencies = [
  "fastrand",
  "getrandom 0.3.3",
  "once_cell",
- "rustix",
+ "rustix 1.0.7",
  "windows-sys 0.59.0",
 ]
 
@@ -2642,7 +2810,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
 dependencies = [
- "rustix",
+ "rustix 1.0.7",
  "windows-sys 0.59.0",
 ]
 
@@ -2825,9 +2993,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
 dependencies = [
  "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
+ "serde_spanned 0.6.8",
+ "toml_datetime 0.6.9",
+ "toml_edit 0.22.26",
 ]
 
 [[package]]
@@ -2839,6 +3007,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.22.26"
@@ -2847,18 +3024,48 @@ checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
 dependencies = [
  "indexmap",
  "serde",
- "serde_spanned",
- "toml_datetime",
+ "serde_spanned 0.6.8",
+ "toml_datetime 0.6.9",
  "toml_write",
  "winnow",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f23a5f4511b296579b6c83e437fe85fa7ece22e3ec44e45ddb975bcf57c3dd"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned 1.0.0",
+ "toml_datetime 0.7.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30"
+dependencies = [
+ "winnow",
+]
+
 [[package]]
 name = "toml_write"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
 
+[[package]]
+name = "toml_writer"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+
 [[package]]
 name = "tracing"
 version = "0.1.41"
@@ -3177,13 +3384,14 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "4.2.4"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
 dependencies = [
  "either",
- "lazy_static",
- "libc",
+ "home",
+ "once_cell",
+ "rustix 0.38.44",
 ]
 
 [[package]]
@@ -3474,7 +3682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
 dependencies = [
  "libc",
- "rustix",
+ "rustix 1.0.7",
 ]
 
 [[package]]

{pyrefly-0.23.0 → pyrefly-0.24.0}/PKG-INFO

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

{pyrefly-0.23.0 → pyrefly-0.24.0}/crates/pyrefly_python/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_python"
-version = "0.23.0"
+version = "0.24.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"
@@ -17,9 +17,9 @@ lsp-types = "0.94.1"
 parse-display = "0.8.2"
 pyrefly_util = { path = "../../pyrefly_util" }
 regex = "1.11.1"
-ruff_python_ast = { git = "https://github.com/astral-sh/ruff/", rev = "6e785867c3a97691972e8a49c372b3effba90032" }
-ruff_python_parser = { git = "https://github.com/astral-sh/ruff/", rev = "6e785867c3a97691972e8a49c372b3effba90032" }
-ruff_text_size = { git = "https://github.com/astral-sh/ruff/", rev = "6e785867c3a97691972e8a49c372b3effba90032" }
+ruff_python_ast = { git = "https://github.com/astral-sh/ruff/", rev = "9bee8376a17401f9736b45fdefffb62edc2f1668" }
+ruff_python_parser = { git = "https://github.com/astral-sh/ruff/", rev = "9bee8376a17401f9736b45fdefffb62edc2f1668" }
+ruff_text_size = { git = "https://github.com/astral-sh/ruff/", rev = "9bee8376a17401f9736b45fdefffb62edc2f1668" }
 serde = { version = "1.0.185", features = ["derive", "rc"] }
 starlark_map = "0.13.0"
 static_interner = "0.1.1"

{pyrefly-0.23.0 → pyrefly-0.24.0}/crates/pyrefly_python/src/ast.rs

@@ -10,6 +10,7 @@ use std::slice;
 
 use pyrefly_util::visit::Visit;
 use ruff_python_ast::AnyNodeRef;
+use ruff_python_ast::AtomicNodeIndex;
 use ruff_python_ast::DictItem;
 use ruff_python_ast::Expr;
 use ruff_python_ast::ExprBooleanLiteral;
@@ -258,8 +259,12 @@ impl Ast {
 
     pub fn pattern_match_singleton_to_expr(x: &PatternMatchSingleton) -> Expr {
         match x.value {
-            Singleton::None => Expr::NoneLiteral(ExprNoneLiteral { range: x.range }),
+            Singleton::None => Expr::NoneLiteral(ExprNoneLiteral {
+                node_index: AtomicNodeIndex::dummy(),
+                range: x.range,
+            }),
             Singleton::True | Singleton::False => Expr::BooleanLiteral(ExprBooleanLiteral {
+                node_index: AtomicNodeIndex::dummy(),
                 range: x.range,
                 value: x.value == Singleton::True,
             }),

{pyrefly-0.23.0 → pyrefly-0.24.0}/crates/pyrefly_python/src/dunder.rs

@@ -39,6 +39,7 @@ pub const NEG: Name = Name::new_static("__neg__");
 pub const NEW: Name = Name::new_static("__new__");
 pub const NEXT: Name = Name::new_static("__next__");
 pub const POS: Name = Name::new_static("__pos__");
+pub const POST_INIT: Name = Name::new_static("__post_init__");
 pub const SET: Name = Name::new_static("__set__");
 pub const SETATTR: Name = Name::new_static("__setattr__");
 pub const SETITEM: Name = Name::new_static("__setitem__");

{pyrefly-0.23.0 → pyrefly-0.24.0}/crates/pyrefly_python/src/module_path.rs

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+use std::ffi::OsStr;
 use std::fmt;
 use std::fmt::Display;
 use std::path::Path;
@@ -124,7 +125,20 @@ impl ModulePath {
         self.style() == ModuleStyle::Interface
     }
 
-    /// Given a module, find the path that must have been on the search path to find it.
+    /// Attempt to match the given [`ModuleName`]'s components to this `ModulePath`,
+    /// returning the directory that is the import root for the `ModuleName`, if
+    /// *all* module components could be matched to directories. `ModulePath`s
+    /// with `-stubs` components are matched iff the *first* `ModuleName` component
+    /// prefix matches the directory it's being compared to.
+    ///
+    /// Example:
+    /// - `/some/path/to/root/a/b/c/d.py`, `a.b.c.d` -> `Some(/some/path/to/root)`
+    /// - `/some/path/to/root/a-stubs/b/c/d.py`, `a.b.c.d` -> `Some(/some/path/to/root)`
+    /// - `/some/path/to/root/a/b/c/d.py`, `z.b.c.d` -> `None`
+    /// - `/some/path/to/root/a-stubs/b/c/d.py`, `a.b.z.d` -> `None`
+    /// - `/some/path/to/root/a-stubs/b/c/d.py`, `root.a.b.c.d` -> `None`
+    ///   - because `a` can't match `a-stubs` if we're not looking at the first
+    ///     component of the `ModuleName`
     pub fn root_of(&self, name: ModuleName) -> Option<PathBuf> {
         if matches!(self.details(), ModulePathDetails::BundledTypeshed(_)) {
             return None;
@@ -136,8 +150,19 @@ impl ModulePath {
             path.pop();
         }
 
-        for part in name.components().iter().rev() {
-            if path.file_name() != Some(part.as_str().as_ref()) {
+        let components = name.components();
+        let mut components = components.iter().rev().peekable();
+        while let Some(part) = components.next() {
+            let file_name = path.file_name();
+
+            // does this `part` match the next part of the `path`?
+            let direct_match = file_name == Some(part.as_str().as_ref());
+            // if we're looking at the first component (import root) of the
+            // `ModuleName`, does it match the `part` if we postfix `-stubs`?
+            let stubs_match = components.peek().is_none()
+                && file_name == Some(OsStr::new(&(part.to_string() + "-stubs")));
+
+            if !(direct_match || stubs_match) {
                 return None;
             }
             path.pop();
@@ -169,18 +194,35 @@ mod tests {
         let path = ModulePath::filesystem(PathBuf::from("hello/foo/bar/baz.py"));
         assert_eq!(
             path.root_of(ModuleName::from_str("foo.bar.baz")),
-            Some(PathBuf::from("hello"))
+            Some(PathBuf::from("hello")),
         );
         assert_eq!(
             path.root_of(ModuleName::from_str("baz")),
-            Some(PathBuf::from("hello/foo/bar"))
+            Some(PathBuf::from("hello/foo/bar")),
         );
         assert_eq!(path.root_of(ModuleName::from_str("baaz")), None);
 
         let path = ModulePath::filesystem(PathBuf::from("hello/foo/bar/__init__.pyi"));
         assert_eq!(
             path.root_of(ModuleName::from_str("foo.bar")),
-            Some(PathBuf::from("hello"))
+            Some(PathBuf::from("hello")),
+        );
+    }
+
+    #[test]
+    fn test_root_of_stubs() {
+        let path = ModulePath::filesystem(PathBuf::from("hello/foo-stubs/bar/baz.py"));
+        assert_eq!(
+            path.root_of(ModuleName::from_str("foo.bar.baz")),
+            Some(PathBuf::from("hello")),
+        );
+        assert_eq!(
+            path.root_of(ModuleName::from_str("baz")),
+            Some(PathBuf::from("hello/foo-stubs/bar")),
+        );
+        assert_eq!(
+            path.root_of(ModuleName::from_str("hello.foo.bar.baz")),
+            None,
         );
     }
 }