---

yaml
---
r: 274716
b: refs/heads/stable
c: c32c7c2
h: refs/heads/master

Author: kamalmarhubi

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 6d2c866e22ad1999d4a16b6b7345e031ef74655c
+refs/heads/stable: c32c7c24860eb6ed65bdec2491ba99b6eb5550b8
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/librustc_driver/lib.rs

@@ -350,15 +350,30 @@ fn handle_explain(code: &str,
 
 fn check_cfg(sopts: &config::Options,
              output: ErrorOutputType) {
-    fn is_meta_list(item: &ast::MetaItem) -> bool {
+    let mut emitter: Box<Emitter> = match output {
+        config::ErrorOutputType::HumanReadable(color_config) => {
+            Box::new(errors::emitter::BasicEmitter::stderr(color_config))
+        }
+        config::ErrorOutputType::Json => Box::new(errors::json::JsonEmitter::basic()),
+    };
+
+    let mut saw_invalid_predicate = false;
+    for item in sopts.cfg.iter() {
         match item.node {
-            ast::MetaItem_::MetaList(..) => true,
-            _ => false,
+            ast::MetaList(ref pred, _) => {
+                saw_invalid_predicate = true;
+                emitter.emit(None,
+                             &format!("invalid predicate in --cfg command line argument: `{}`",
+                                      pred),
+                             None,
+                             errors::Level::Fatal);
+            }
+            _ => {},
         }
     }
 
-    if sopts.cfg.iter().any(|item| is_meta_list(&*item)) {
-        early_error(output, "predicates are not allowed in --cfg");
+    if saw_invalid_predicate {
+        panic!(errors::FatalError);
     }
 }
 

branches/stable/src/test/compile-fail/issue-31495.rs

@@ -9,5 +9,5 @@
 // except according to those terms.
 
 // compile-flags: --cfg foo(bar)
-// error-pattern: predicates are not allowed in --cfg
+// error-pattern: invalid predicate in --cfg command line argument: `foo`
 fn main() {}