From 6e20450247c23a0343f7c537a2fefea5c3379d5d Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Sun, 2 Dec 2018 11:21:52 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20logic=20error=20from=20=E2=80=9CDon?=
 =?UTF-8?q?=E2=80=99t=20run=20warnings=20into=20errors=20when=20trying=20N?=
 =?UTF-8?q?ightly=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/servo/servo/pull/22323
---
 etc/taskcluster/decision_task.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index ea62d282021..fa57c6f669e 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -43,7 +43,7 @@ log_artifacts_expire_in = "1 year"
 
 build_env = {
     "RUST_BACKTRACE": "1",
-    "RUSTFLAGS": "-Dwarnings",  # If changing this, also adjust with_rust_nightly()
+    "RUSTFLAGS": "-Dwarnings",
     "CARGO_INCREMENTAL": "0",
 }
 unix_build_env = {
@@ -101,7 +101,7 @@ def macos_unit():
 
 def with_rust_nightly():
     modified_build_env = dict(build_env)
-    flags = build_env.pop("RUSTFLAGS").split(" ")
+    flags = modified_build_env.pop("RUSTFLAGS").split(" ")
     flags.remove("-Dwarnings")
     if flags:  # pragma: no cover
         modified_build_env["RUSTFLAGS"] = " ".join(flags)
@@ -164,8 +164,8 @@ def android_x86():
 
 def windows_unit():
     return (
-        windows_build_task("Build + unit tests")
-        .with_treeherder("Windows x64", "debug")
+        windows_build_task("Dev build + unit tests")
+        .with_treeherder("Windows x64")
         .with_script(
             # Not necessary as this would be done at the start of `build`,
             # but this allows timing it separately.