TyUserFields

Summary: `TyUserFields` has a `unknown` flag, which is used when all fields are not known, that is when the type is "abstract", like `Provider` which is implemented in the following diff D48893103.

Reviewed By: ianlevesque

Differential Revision: D48893102

fbshipit-source-id: c660e1a7f1a6166163d4c2fb69a0985509fec41f

Author: stepancheg

starlark/src/typing/user.rs

@@ -21,7 +21,6 @@ use std::hash::Hasher;
 
 use allocative::Allocative;
 use dupe::Dupe;
-use dupe::OptionDupedExt;
 use starlark_map::sorted_map::SortedMap;
 use starlark_syntax::codemap::Span;
 use starlark_syntax::codemap::Spanned;
@@ -64,6 +63,25 @@ pub(crate) struct TyUserIndex {
     pub(crate) result: Ty,
 }
 
+/// Fields of the struct.
+#[derive(Allocative, Debug, Ord, PartialOrd, Eq, PartialEq, Hash)]
+pub(crate) struct TyUserFields {
+    /// Known fields.
+    pub(crate) known: SortedMap<String, Ty>,
+    /// Are there unknown fields?
+    /// Unknown fields are possible if this type represents an abstract type like a provider.
+    pub(crate) unknown: bool,
+}
+
+impl TyUserFields {
+    pub(crate) fn no_fields() -> TyUserFields {
+        TyUserFields {
+            known: SortedMap::new(),
+            unknown: false,
+        }
+    }
+}
+
 /// Type description for arbitrary type.
 #[derive(Allocative, Debug, derive_more::Display)]
 #[display(fmt = "{}", name)]
@@ -73,7 +91,7 @@ pub(crate) struct TyUser {
     base: TyStarlarkValue,
     matcher: Option<TypeMatcherFactory>,
     id: TypeInstanceId,
-    fields: SortedMap<String, Ty>,
+    fields: TyUserFields,
     /// Set if more precise callable signature is known than `base` provides.
     callable: Option<TyFunction>,
     /// Set if more precise index signature is known than `base` provides.
@@ -88,7 +106,7 @@ impl TyUser {
         base: TyStarlarkValue,
         matcher: Option<TypeMatcherFactory>,
         id: TypeInstanceId,
-        fields: SortedMap<String, Ty>,
+        fields: TyUserFields,
         callable: Option<TyFunction>,
         index: Option<TyUserIndex>,
         iter_item: Option<Ty>,
@@ -157,7 +175,16 @@ impl TyCustomImpl for TyUser {
         if let Ok(ty) = self.base.attr_from_methods(attr) {
             Ok(ty)
         } else {
-            self.fields.get(attr).duped().ok_or(())
+            match self.fields.known.get(attr) {
+                Some(ty) => Ok(ty.dupe()),
+                None => {
+                    if self.fields.unknown {
+                        Ok(Ty::any())
+                    } else {
+                        Err(())
+                    }
+                }
+            }
         }
     }
 

starlark/src/values/types/enumeration/enum_type.rs

@@ -33,7 +33,6 @@ use starlark_derive::NoSerialize;
 use starlark_derive::StarlarkDocs;
 use starlark_derive::Trace;
 use starlark_map::small_map::SmallMap;
-use starlark_map::sorted_map::SortedMap;
 use starlark_map::Equivalent;
 
 use crate as starlark;
@@ -45,6 +44,7 @@ use crate::eval::Arguments;
 use crate::eval::Evaluator;
 use crate::typing::starlark_value::TyStarlarkValue;
 use crate::typing::user::TyUser;
+use crate::typing::user::TyUserFields;
 use crate::typing::user::TyUserIndex;
 use crate::typing::Ty;
 use crate::values::enumeration::matcher::EnumTypeMatcher;
@@ -303,7 +303,7 @@ where
                 TyStarlarkValue::new::<EnumValue>(),
                 Some(TypeMatcherFactory::new(EnumTypeMatcher { id: self.id })),
                 self.id,
-                SortedMap::new(),
+                TyUserFields::no_fields(),
                 None,
                 None,
                 None,
@@ -313,7 +313,7 @@ where
                 TyStarlarkValue::new::<EnumType>(),
                 None,
                 TypeInstanceId::gen(),
-                SortedMap::new(),
+                TyUserFields::no_fields(),
                 None,
                 Some(TyUserIndex {
                     index: Ty::int(),

starlark/src/values/types/record/record_type.rs

@@ -46,6 +46,7 @@ use crate::eval::ParametersSpec;
 use crate::starlark_complex_values;
 use crate::typing::starlark_value::TyStarlarkValue;
 use crate::typing::user::TyUser;
+use crate::typing::user::TyUserFields;
 use crate::typing::Param;
 use crate::typing::Ty;
 use crate::typing::TyFunction;
@@ -302,7 +303,10 @@ where
                 TyStarlarkValue::new::<Record>(),
                 Some(TypeMatcherFactory::new(RecordTypeMatcher { id: self.id })),
                 self.id,
-                fields,
+                TyUserFields {
+                    known: fields,
+                    unknown: false,
+                },
                 None,
                 None,
                 None,
@@ -313,7 +317,7 @@ where
                 TyStarlarkValue::new::<RecordType>(),
                 None,
                 TypeInstanceId::gen(),
-                SortedMap::new(),
+                TyUserFields::no_fields(),
                 Some(TyFunction::new(
                     // TODO(nga): more precise parameter types.
                     vec![Param::kwargs(Ty::any())],