sync with upstream

RalfJung · RalfJung · commit a2e8292f3bd1 · 2020-04-10T10:31:09.000+02:00
diff --git a/src/runtest.rs b/src/runtest.rs
@@ -1462,11 +1462,10 @@ actual:\n\
             }
         }
 
-        match allow_unused {
-            AllowUnused::Yes => {
-                rustc.args(&["-A", "unused"]);
-            }
-            AllowUnused::No => {}
+        // Add `-A unused` before `config` flags and in-test (`props`) flags, so that they can
+        // overwrite this.
+        if let AllowUnused::Yes = allow_unused {
+            rustc.args(&["-A", "unused"]);
         }
 
         if self.props.force_host {

Original file line number	Diff line number	Diff line change
`@@ -1462,11 +1462,10 @@ actual:\n\`
`1462`	`1462`	`}`
`1463`	`1463`	`}`
`1464`	`1464`
`1465`		`- match allow_unused {`
`1466`		`- AllowUnused::Yes => {`
`1467`		`- rustc.args(&["-A", "unused"]);`
`1468`		`- }`
`1469`		`- AllowUnused::No => {}`
	`1465`	+ // Add `-A unused` before `config` flags and in-test (`props`) flags, so that they can
	`1466`	`+ // overwrite this.`
	`1467`	`+ if let AllowUnused::Yes = allow_unused {`
	`1468`	`+ rustc.args(&["-A", "unused"]);`
`1470`	`1469`	`}`
`1471`	`1470`
`1472`	`1471`	`if self.props.force_host {`