[gnome-builder] meson: remove 3.32 workaround

[Christian Hergert <chergert src gnome org>]

commit 2a99832ca9d811a4b33a48af7232ff7770eb96bc
Author: Christian Hergert <chergert redhat com>
Date:   Fri Mar 29 17:36:38 2019 -0700

    meson: remove 3.32 workaround

 src/plugins/meson/gbp-meson-pipeline-addin.c | 37 +++-------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)
---
diff --git a/src/plugins/meson/gbp-meson-pipeline-addin.c b/src/plugins/meson/gbp-meson-pipeline-addin.c
index 7f257f533..acc8f093d 100644
--- a/src/plugins/meson/gbp-meson-pipeline-addin.c
+++ b/src/plugins/meson/gbp-meson-pipeline-addin.c
@@ -99,35 +99,6 @@ on_install_stage_query (IdePipelineStage    *stage,
   ide_pipeline_stage_set_completed (stage, FALSE);
 }
 
-static IdeSubprocessLauncher *
-create_launcher (IdePipeline  *pipeline,
-                 GError      **error)
-{
-  IdeSubprocessLauncher *ret;
-
-  if ((ret = ide_pipeline_create_launcher (pipeline, error)))
-    {
-      /* 3.32 specific workaround for --error-format=short  so that
-       * meson+rust projects can have working diagnostics.
-       */
-      if (ide_subprocess_launcher_getenv (ret, "RUSTFLAGS") == NULL)
-        {
-          g_autofree gchar *eq_srcdir = NULL;
-          g_autofree gchar *escaped = NULL;
-          g_autofree gchar *formatted = NULL;
-
-          eq_srcdir = g_strdup_printf ("=%s", ide_pipeline_get_srcdir (pipeline));
-          escaped = g_shell_quote (eq_srcdir);
-          formatted = g_strdup_printf ("--error-format=short --remap-path-prefix %s",
-                                       escaped);
-
-          ide_subprocess_launcher_setenv (ret, "RUSTFLAGS", formatted, TRUE);
-        }
-    }
-
-  return g_steal_pointer (&ret);
-}
-
 static void
 gbp_meson_pipeline_addin_load (IdePipelineAddin *addin,
                                IdePipeline      *pipeline)
@@ -196,10 +167,10 @@ gbp_meson_pipeline_addin_load (IdePipelineAddin *addin,
     }
 
   /* Create all our launchers up front */
-  if (NULL == (config_launcher = create_launcher (pipeline, &error)) ||
-      NULL == (build_launcher = create_launcher (pipeline, &error)) ||
-      NULL == (clean_launcher = create_launcher (pipeline, &error)) ||
-      NULL == (install_launcher = create_launcher (pipeline, &error)))
+  if (NULL == (config_launcher = ide_pipeline_create_launcher (pipeline, &error)) ||
+      NULL == (build_launcher = ide_pipeline_create_launcher (pipeline, &error)) ||
+      NULL == (clean_launcher = ide_pipeline_create_launcher (pipeline, &error)) ||
+      NULL == (install_launcher = ide_pipeline_create_launcher (pipeline, &error)))
     IDE_GOTO (failure);
 
   prefix = ide_config_get_prefix (config);