fix tests

cgrindel · Nov 5, 2024 · f5afbc4 · f5afbc4
1 parent 304adcb
commit f5afbc4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/swiftpkg/internal/modulemap_parser/collect_module.bzl b/swiftpkg/internal/modulemap_parser/collect_module.bzl
@@ -105,10 +105,7 @@ def _process_module_tokens(parsed_tokens, prefix_tokens, is_submodule):
        not tokens.is_a(module_declaration_identifier_token, tts.operator, operators.asterisk) and \
        not tokens.is_a(module_declaration_identifier_token, tts.string_literal):
         return None, errors.new(
-            "Expected module identifier, asterisk or string_literal, but was {} with value {}.".format(
-                module_declaration_identifier_token.type,
-                module_declaration_identifier_token.value,
-            ),
+            "Expected module identifier, asterisk or string_literal, but was {}.".format(module_declaration_identifier_token.type)
         )
 
     # Collect the attributes and module members

diff --git a/swiftpkg/tests/modulemap_parser/collect_module_tests.bzl b/swiftpkg/tests/modulemap_parser/collect_module_tests.bzl
@@ -109,9 +109,7 @@ def _collect_module_test(ctx):
         env,
         "module with string literal module id",
         text = """
-        module "MyModule" {
-            umbrella header "MyModule/MyModule.h"
-        }
+        module "MyModule" {}
         """,
         expected = [
             declarations.module(
@@ -178,7 +176,7 @@ def _collect_module_test(ctx):
         text = """
         module {}
         """,
-        expected_err = "Expected module identifier or asterisk, but was curly_bracket_open.",
+        expected_err = "Expected module identifier, asterisk or string_literal, but was curly_bracket_open.",
     )
 
     do_failing_parse_test(