From: bors <bors@rust-lang.org>
Date: Mon, 19 Dec 2016 17:04:04 +0000 (+0000)
Subject: Auto merge of #3410 - fmdkdd:fix-3390-message-format-parse-stderr, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~75
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=109d9c5ec64bcc61343d713fc00bb72bfc18d804;p=cargo.git

Auto merge of #3410 - fmdkdd:fix-3390-message-format-parse-stderr, r=alexcrichton

Fix `--message-format JSON` when rustc emits non-JSON warnings

The `--message-format JSON` flag parses all the stderr output of rustc to JSON,
but rustc can emit non-JSON lines to stderr (e.g., for warning about the
unstable `-Z` flag on the stable channel), causing cargo to fail reporting
compilation errors when using `--message-format JSON`.

This commit adds a check to look for lines beginning with `{` to only parse
these lines as JSON.  Other lines from rustc are forwarded to the stderr of
cargo.

Fixes #3390.
---

109d9c5ec64bcc61343d713fc00bb72bfc18d804