diff --git a/scripts/cargo2rulesmk.py b/scripts/cargo2rulesmk.py index b0f4cb890..3a68131d2 100755 --- a/scripts/cargo2rulesmk.py +++ b/scripts/cargo2rulesmk.py @@ -513,19 +513,18 @@ class Crate(object): def dump_trusty_module(self): """Dump one or more module definitions, depending on crate_types.""" - match self.crate_types: - case [_single]: - pass - case multiple if "test" in multiple: + if len(self.crate_types) > 1: + if "test" in self.crate_types: self.write("\nERROR: multiple crate types cannot include test type") return - case multiple if "lib" in multiple: + + if "lib" in self.crate_types: print(f"### WARNING: crate {self.crate_name} has multiple " - f"crate types ({str(multiple)}). Treating as 'lib'") + f"crate types ({str(self.crate_types)}). Treating as 'lib'") self.crate_types = ["lib"] - case unsupported: + else: self.write("\nERROR: don't know how to handle crate types of " - f"crate {self.crate_name}: {str(unsupported)}") + f"crate {self.crate_name}: {str(self.crate_types)}") return self.dump_single_type_trusty_module() @@ -672,16 +671,15 @@ class Crate(object): if hasattr(self.runner.args, "module_add_implicit_deps_reason"): self.write(self.runner.args.module_add_implicit_deps_reason) - match self.runner.args.module_add_implicit_deps: - case True | "yes": - self.write("MODULE_ADD_IMPLICIT_DEPS := true") - case False | "no": - self.write("MODULE_ADD_IMPLICIT_DEPS := false") - case other: - sys.exit( - "ERROR: invalid value for module_add_implicit_deps: " + - str(other) - ) + if self.runner.args.module_add_implicit_deps in [True, "yes"]: + self.write("MODULE_ADD_IMPLICIT_DEPS := true") + elif self.runner.args.module_add_implicit_deps in [False, "no"]: + self.write("MODULE_ADD_IMPLICIT_DEPS := false") + else: + sys.exit( + "ERROR: invalid value for module_add_implicit_deps: " + + str(self.runner.args.module_add_implicit_deps) + ) class Runner(object):