
Optimize lock file format for git merge conflicts This commit is an attempt to refine Cargo's lock file format to generate less git merge conflicts for lock file updates as well as make it easier to manage lock file updates. The new lock file format has a few major changes: * The `[metadata]` table is no longer used to track checksums. The packages themselves now list `checksum` fields directly. * The entries in the `dependencies` key no longer unconditionally mention the version/source of the dependency. When unambiguous only the name or only the name/version are mentioned. As mentioned before the goal here is to reduce git merge conflict likelihood between two cargo updates to a lock file. By not using `[metadata]` the updates to package checksums should only happen on the package itself, not in a shared metadata table where it's easy to conflict with other updates. Additionally by making `dependencies` entries shorter it's hoped that updating a crate will only either add entries to a lock file or update lines related to just that package. It's theorized that the amount of updates necessary to a lock file are far less than today where the version has to be updated in many locations. As with all lock file format changes this new format is not turned on by default. Support is added so Cargo will preserve it if it sees it (and tests are added too), and then some time down the road we can flip the switch and turn this on by default.
Cargo
Cargo downloads your Rust project’s dependencies and compiles your project.
Learn more at https://doc.rust-lang.org/cargo/
Code Status
Code documentation: https://docs.rs/cargo/
Installing Cargo
Cargo is distributed by default with Rust, so if you've got rustc
installed
locally you probably also have cargo
installed locally.
Compiling from Source
Cargo requires the following tools and packages to build:
git
python
curl
(on Unix)- OpenSSL headers (only for Unix, this is the
libssl-dev
package on ubuntu) cargo
andrustc
First, you'll want to check out this repository
git clone https://github.com/rust-lang/cargo
cd cargo
With cargo
already installed, you can simply run:
cargo build --release
Adding new subcommands to Cargo
Cargo is designed to be extensible with new subcommands without having to modify Cargo itself. See the Wiki page for more details and a list of known community-developed subcommands.
Releases
Cargo releases coincide with Rust releases. High level release notes are available as part of Rust's release notes. Detailed release notes are available in this repo at CHANGELOG.md.
Reporting issues
Found a bug? We'd love to know about it!
Please report all issues on the GitHub issue tracker.
Contributing
See CONTRIBUTING.md. You may also find the architecture documentation useful (ARCHITECTURE.md).
License
Cargo is primarily distributed under the terms of both the MIT license and the Apache License (Version 2.0).
See LICENSE-APACHE and LICENSE-MIT for details.
Third party software
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (https://www.openssl.org/).
In binary form, this product includes software that is licensed under the terms of the GNU General Public License, version 2, with a linking exception, which can be obtained from the upstream repository.
See LICENSE-THIRD-PARTY for details.