Merge branch 'main' into 317

Author: asukaminato0721

Cargo.lock

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

crates/pyrefly_build/Cargo.toml

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

crates/pyrefly_bundled/Cargo.toml

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

crates/pyrefly_config/Cargo.toml

@@ -175,27 +175,23 @@ impl RuleOverrides {
     /// Consume the RuleOverrides to turn it into an ErrorDisplayConfig map.
     pub fn to_config(self) -> Option<ErrorDisplayConfig> {
         let mut map = HashMap::new();
+        let mut add = |value, kind| {
+            if let Some(value) = value {
+                map.insert(
+                    kind,
+                    if value {
+                        Severity::Error
+                    } else {
+                        Severity::Ignore
+                    },
+                );
+            }
+        };
         // For each ErrorKind, there are one or more RuleOverrides fields.
         // The ErrorDisplayConfig map has an entry for an ErrorKind if at least one of the RuleOverrides for that ErrorKind is present.
         // The value of that ErrorKind's entry is found by or'ing together the present RuleOverrides.
-        if let Some(import_error) = [
-            self.report_missing_imports,
-            self.report_missing_module_source,
-        ]
-        .into_iter()
-        .flatten()
-        .reduce(|acc, x| acc | x)
-        {
-            map.insert(
-                ErrorKind::MissingImport,
-                if import_error {
-                    Severity::Error
-                } else {
-                    Severity::Ignore
-                },
-            );
-        }
-
+        add(self.report_missing_imports, ErrorKind::MissingImport);
+        add(self.report_missing_module_source, ErrorKind::MissingSource);
         if map.is_empty() {
             None
         } else {

crates/pyrefly_config/src/migration/pyright.rs

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

crates/pyrefly_derive/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_python"
-version = "0.41.3"
+version = "0.42.1"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"
@@ -13,7 +13,7 @@ anyhow = "1.0.98"
 dupe = "0.9.1"
 equivalent = "1.0"
 itertools = "0.14.0"
-lsp-types = "0.94.1"
+lsp-types = { git = "https://github.com/astral-sh/lsp-types", rev = "3512a9f33eadc5402cfab1b8f7340824c8ca1439" }
 parse-display = "0.8.2"
 pathdiff = "0.2"
 pyrefly_util = { path = "../pyrefly_util" }

crates/pyrefly_python/Cargo.toml

@@ -125,6 +125,8 @@ pub const MAGIC_METHOD_NAMES: &[&str] = &[
 
 pub const AENTER: Name = Name::new_static("__aenter__");
 pub const AEXIT: Name = Name::new_static("__aexit__");
+pub const AITER: Name = Name::new_static("__aiter__");
+pub const ANEXT: Name = Name::new_static("__anext__");
 pub const ALL: Name = Name::new_static("__all__");
 pub const BOOL: Name = Name::new_static("__bool__");
 pub const CALL: Name = Name::new_static("__call__");

crates/pyrefly_python/src/dunder.rs

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

crates/pyrefly_types/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_util"
-version = "0.41.3"
+version = "0.42.1"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"
@@ -23,7 +23,7 @@ human_bytes = "0.4.3"
 ignore = "0.4"
 itertools = "0.14.0"
 lock_free_hashtable = "0.1.1"
-lsp-types = "0.94.1"
+lsp-types = { git = "https://github.com/astral-sh/lsp-types", rev = "3512a9f33eadc5402cfab1b8f7340824c8ca1439" }
 memory-stats = "1.2.0"
 notify = "5"
 parse-display = "0.8.2"