]> git.proxmox.com Git - cargo.git/commit
Merge branch 'master' of https://github.com/rust-lang/cargo into feature-rustc-cfg...
authorChris Field <chris@fieldrndservices.com>
Tue, 9 Feb 2021 18:20:32 +0000 (13:20 -0500)
committerChris Field <chris@fieldrndservices.com>
Tue, 9 Feb 2021 18:20:32 +0000 (13:20 -0500)
commita74060835267b25fd8b226c0161cf03a7447fa0c
treed3385da72abf0271d0153b5cc5240e4c072e77d4
parentd7034c6021007a4c6a342956ecee0525570f3584
parent9140c546fe05d67e63726849c547209ee670e1f9
Merge branch 'master' of https://github.com/rust-lang/cargo into feature-rustc-cfg-argument

# Conflicts:
# src/cargo/ops/cargo_compile.rs
src/bin/cargo/commands/rustc.rs
src/cargo/core/compiler/build_context/mod.rs
src/cargo/core/compiler/build_context/target_info.rs
src/cargo/core/compiler/mod.rs
src/cargo/ops/cargo_compile.rs
src/cargo/util/command_prelude.rs