more cleanup

Author: dzbarsky

go/private/context.bzl

@@ -309,7 +309,7 @@ def new_source(
     for k, v in getattr(attr, "x_defs", {}).items():
         v = _expand_location(go, attr, v)
         if "." not in k:
-            k = "{}.{}".format(source["importmap"], k)
+            k = "{}.{}".format(importmap, k)
         x_defs[k] = v
     source["x_defs"] = x_defs
     if not source["cgo"]:

go/private/rules/nogo.bzl

@@ -65,10 +65,10 @@ def _nogo_impl(ctx):
     nogo_source = new_source(
         go,
         struct(
-            srcs = [struct(files = [nogo_main])],
             embed = [ctx.attr._nogo_srcs],
             deps = analyzer_archives,
         ),
+        generated_srcs = [nogo_main],
         name = go.label.name + "~nogo",
         importpath = "nogomain",
         pathtype = EXPORT_PATH,

go/private/rules/test.bzl

@@ -147,13 +147,13 @@ def _go_test_impl(ctx):
     test_source = new_source(
         go,
         struct(
-            srcs = [struct(files = [main_go])],
             deps = test_deps,
         ),
         name = go.label.name + "~testmain",
         importpath = "testmain",
         pathtype = INFERRED_PATH,
         is_main = True,
+        generated_srcs = [main_go],
         coverage_instrumented = False,
     )
     test_archive, executable, runfiles = go.binary(