interpreter: fix more default_options annotations

Author: dcbaker

mesonbuild/interpreter/dependencyfallbacks.py

@@ -19,6 +19,7 @@
     from .interpreter import Interpreter
     from ..interpreterbase import TYPE_nkwargs, TYPE_nvar
     from ..mesonlib import MachineChoice
+    from ..options import ElementaryOptionValues
     from .interpreterobjects import SubprojectHolder
 
 
@@ -27,7 +28,7 @@ def __init__(self,
                  interpreter: 'Interpreter',
                  names: T.List[str],
                  allow_fallback: T.Optional[bool] = None,
-                 default_options: T.Optional[T.Dict[str, str]] = None) -> None:
+                 default_options: T.Optional[T.Dict[OptionKey, ElementaryOptionValues]] = None) -> None:
         super().__init__(subproject=interpreter.subproject)
         self.interpreter = interpreter
         self.subproject = interpreter.subproject

mesonbuild/interpreter/kwargs.py

@@ -319,7 +319,7 @@ class Subproject(ExtractRequired):
 
 class DoSubproject(ExtractRequired):
 
-    default_options: T.Union[T.List[str], T.Dict[str, options.ElementaryOptionValues], str]
+    default_options: T.Dict[OptionKey, options.ElementaryOptionValues]
     version: T.List[str]
     cmake_options: T.List[str]
     options: T.Optional[CMakeSubprojectOptions]

mesonbuild/modules/cmake.py

@@ -435,7 +435,7 @@ def subproject(self, state: ModuleState, args: T.Tuple[str], kwargs_: Subproject
             'required': kwargs_['required'],
             'options': kwargs_['options'],
             'cmake_options': kwargs_['cmake_options'],
-            'default_options': [],
+            'default_options': {},
             'version': [],
         }
         subp = self.interpreter.do_subproject(dirname, kw, force_method='cmake')