mirror of
https://github.com/rust-lang/cargo.git
synced 2025-10-01 11:30:39 +00:00
45699e9f21
Cargo has of #7143 enabled pipelined compilation by default which affects how the compiler is invoked, especially with respect to JSON messages. This, in some testing, has proven to cause quite a few issues with rustbuild's current integration with Cargo. This commit is aimed at adding features to Cargo to solve this issue. This commit adds the ability to customize the stream of JSON messages coming from Cargo. The new feature for Cargo is that it now also mirrors rustc in how you can configure the JSON stream. Multiple `--message-format` arguments are now supported and the value specified is a comma-separated list of directives. In addition to the existing `human`, `short`, and `json` directives these new directives have been added: * `json-render-diagnostics` - instructs Cargo to render rustc diagnostics and only print out JSON messages for artifacts and Cargo things. * `json-diagnostic-short` - indicates that the `rendered` field of rustc diagnostics should use the "short" rendering. * `json-diagnostic-rendered-ansi` - indicates that the `rendered` field of rustc diagnostics should embed ansi color codes. The first option here, `json-render-diagnostics`, will be used by rustbuild unconditionally. Additionally `json-diagnostic-short` will be conditionally used based on the input to rustbuild itself. This should be enough for external tools to customize how Cargo is invoked and how all kinds of JSON diagnostics get printed, and it's thought that we can relatively easily tweak this as necessary to extend it and such.
108 lines
1.9 KiB
Rust
108 lines
1.9 KiB
Rust
#![warn(rust_2018_idioms)] // while we're getting used to 2018
|
|
#![cfg_attr(feature = "deny-warnings", deny(warnings))]
|
|
#![allow(clippy::blacklisted_name)]
|
|
#![allow(clippy::explicit_iter_loop)]
|
|
#![allow(clippy::redundant_closure)]
|
|
#![warn(clippy::needless_borrow)]
|
|
#![warn(clippy::redundant_clone)]
|
|
|
|
#[macro_use]
|
|
extern crate cargo_test_macro;
|
|
|
|
#[macro_use]
|
|
mod support;
|
|
|
|
mod alt_registry;
|
|
mod bad_config;
|
|
mod bad_manifest_path;
|
|
mod bench;
|
|
mod build;
|
|
mod build_auth;
|
|
mod build_lib;
|
|
mod build_plan;
|
|
mod build_script;
|
|
mod build_script_env;
|
|
mod cache_messages;
|
|
mod cargo_alias_config;
|
|
mod cargo_command;
|
|
mod cargo_features;
|
|
mod cfg;
|
|
mod check;
|
|
mod clean;
|
|
mod clippy;
|
|
mod collisions;
|
|
mod concurrent;
|
|
mod config;
|
|
mod corrupt_git;
|
|
mod cross_compile;
|
|
mod cross_publish;
|
|
mod custom_target;
|
|
mod death;
|
|
mod dep_info;
|
|
mod directory;
|
|
mod doc;
|
|
mod edition;
|
|
mod features;
|
|
mod fetch;
|
|
mod fix;
|
|
mod freshness;
|
|
mod generate_lockfile;
|
|
mod git;
|
|
mod init;
|
|
mod install;
|
|
mod install_upgrade;
|
|
mod jobserver;
|
|
mod list_targets;
|
|
mod local_registry;
|
|
mod lockfile_compat;
|
|
mod login;
|
|
mod member_errors;
|
|
mod message_format;
|
|
mod metabuild;
|
|
mod metadata;
|
|
mod net_config;
|
|
mod new;
|
|
mod offline;
|
|
mod out_dir;
|
|
mod overrides;
|
|
mod package;
|
|
mod patch;
|
|
mod path;
|
|
mod plugins;
|
|
mod proc_macro;
|
|
mod profile_config;
|
|
mod profile_overrides;
|
|
mod profile_targets;
|
|
mod profiles;
|
|
mod pub_priv;
|
|
mod publish;
|
|
mod publish_lockfile;
|
|
mod read_manifest;
|
|
mod registry;
|
|
mod rename_deps;
|
|
mod required_features;
|
|
mod resolve;
|
|
mod run;
|
|
mod rustc;
|
|
mod rustc_info_cache;
|
|
mod rustdoc;
|
|
mod rustdocflags;
|
|
mod rustflags;
|
|
mod search;
|
|
mod shell_quoting;
|
|
mod small_fd_limits;
|
|
mod test;
|
|
mod tool_paths;
|
|
mod update;
|
|
mod vendor;
|
|
mod verify_project;
|
|
mod version;
|
|
mod warn_on_failure;
|
|
mod workspaces;
|
|
|
|
#[cargo_test]
|
|
fn aaa_trigger_cross_compile_disabled_check() {
|
|
// This triggers the cross compile disabled check to run ASAP, see #5141
|
|
support::cross_compile::disabled();
|
|
}
|