Typing branch rebasing fixes.

mesonbuild · Feb 9, 2025 · e829473 · e829473
1 parent 12415b8
commit e829473
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
@@ -282,7 +282,8 @@ def get_options(self) -> 'MutableKeyedOptionDictType':
             fortran_stds += ['f2008']
         if version_compare(self.version, '>=8.0.0'):
             fortran_stds += ['f2018']
-        self._update_language_stds(opts, fortran_stds)
+        key = self.form_compileropt_key('std')
+        opts[key].choices = ['none'] + fortran_stds
         return opts
 
     def get_option_compile_args(self, target: 'BuildTarget', env: 'Environment', subproject: T.Optional[str] = None) -> T.List[str]:
@@ -338,7 +339,9 @@ def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoic
 
     def get_options(self) -> 'MutableKeyedOptionDictType':
         opts = super().get_options()
-        self._update_language_stds(opts, ['f95', 'f2003', 'f2008', 'gnu', 'legacy', 'f2008ts'])
+        fortran_stds = ['f95', 'f2003', 'f2008', 'gnu', 'legacy', 'f2008ts']
+        key = self.form_compileropt_key('std')
+        opts[key].choices = ['none'] + fortran_stds
         return opts
 
     def get_module_outdir_args(self, path: str) -> T.List[str]:

diff --git a/mesonbuild/options.py b/mesonbuild/options.py
@@ -1124,21 +1124,21 @@ def __contains__(self, key: T.Union[str, OptionKey]) -> bool:
     def __repr__(self) -> str:
         return repr(self.options)
 
-    def keys(self) -> T.KeysView[OptionKey]:
-        return self.d.keys()
+    def keys(self) -> T.KeysView[AnyOptionType]:
+        return self.options.keys()
 
-    def values(self) -> T.ValuesView[UserOption[T.Any]]:
-        return self.d.values()
+    def values(self) -> T.ValuesView[AnyOptionType]:
+        return self.options.values()
 
-    def items(self) -> T.ItemsView['OptionKey', 'UserOption[T.Any]']:
-        return self.d.items()
+    def items(self) -> T.ItemsView['OptionKey', 'AnyOptionType']:
+        return self.options.items()
 
     # FIXME: this method must be deleted and users moved to use "add_xxx_option"s instead.
     def update(self, **kwargs: AnyOptionType) -> None:
-        self.d.update(**kwargs)
+        self.options.update(**kwargs)
 
     def setdefault(self, k: OptionKey, o: UserOption[T.Any]) -> UserOption[T.Any]:
-        return self.d.setdefault(k, o)
+        return self.options.setdefault(k, o)
 
     def get(self, o: OptionKey, default: T.Optional[AnyOptionType] = None, **kwargs) -> T.Optional[AnyOptionType]:
         return self.options.get(o, default, **kwargs)