Vasudev Kamath [Sat, 24 Feb 2018 07:19:20 +0000 (12:49 +0530)]
Audit unsuspicious files for 0.25.0 release.
Vasudev Kamath [Sat, 24 Feb 2018 07:19:01 +0000 (12:49 +0530)]
Filter out git test data from libgit2-sys.
Ximin Luo [Sat, 27 Jan 2018 09:41:08 +0000 (10:41 +0100)]
Release 0.24.0-1 to Debian unstable.
Vasudev Kamath [Thu, 25 Jan 2018 09:27:52 +0000 (14:57 +0530)]
Prepare 0.24.0 for experimental.
Vasudev Kamath [Thu, 25 Jan 2018 09:25:58 +0000 (14:55 +0530)]
Add lintian-override to ignore false positive from lintian.
Vasudev Kamath [Thu, 25 Jan 2018 09:11:18 +0000 (14:41 +0530)]
Track rustfmt.toml on top level copyright section.
Vasudev Kamath [Thu, 25 Jan 2018 08:16:17 +0000 (13:46 +0530)]
Update copyright file for 0.24.0 release.
Vasudev Kamath [Thu, 25 Jan 2018 06:32:36 +0000 (12:02 +0530)]
Fix the bad_git_dependency test failure.
Vasudev Kamath [Sat, 13 Jan 2018 16:08:44 +0000 (21:38 +0530)]
Update changelog
Vasudev Kamath [Sat, 13 Jan 2018 16:08:20 +0000 (21:38 +0530)]
Comment out copying out Cargo.lock its no longer shipped by upstream.
Vasudev Kamath [Tue, 9 Jan 2018 16:52:44 +0000 (22:22 +0530)]
Mark package as compliant with Debian Policy 4.1.3
Vasudev Kamath [Tue, 9 Jan 2018 15:28:31 +0000 (20:58 +0530)]
Drop url specific hunk from 1002 its merged upstream.
Vasudev Kamath [Tue, 9 Jan 2018 15:28:18 +0000 (20:58 +0530)]
Refresh 2001 for new version of libgit2-sys.
Vasudev Kamath [Tue, 9 Jan 2018 15:03:13 +0000 (20:33 +0530)]
Update upstream source from tag 'upstream/0.24.0'
Update to upstream version '0.24.0'
with Debian dir
902794871ac6926951d065a9f060aedd4bdb04cd
Vasudev Kamath [Tue, 9 Jan 2018 15:02:20 +0000 (20:32 +0530)]
New upstream version 0.24.0
Vasudev Kamath [Tue, 9 Jan 2018 14:59:52 +0000 (20:29 +0530)]
Add files from new vendor to unsuspicious list.
Vasudev Kamath [Tue, 9 Jan 2018 14:59:38 +0000 (20:29 +0530)]
filter out windows related .a files.
Vasudev Kamath [Sun, 10 Dec 2017 10:04:28 +0000 (15:34 +0530)]
Prepare upload to unstable.
Vasudev Kamath [Sun, 10 Dec 2017 10:03:22 +0000 (15:33 +0530)]
Mark package as compliant with Debian Policy 4.1.2.
bors [Tue, 5 Dec 2017 17:05:29 +0000 (17:05 +0000)]
Auto merge of #4781 - alexcrichton:beta-next, r=alexcrichton
[beta] Reconfigure curl handles after reset
This is a backport of https://github.com/rust-lang/cargo/pull/4780
Alex Crichton [Wed, 29 Nov 2017 01:44:25 +0000 (17:44 -0800)]
Fix the lockfile-compat test
The newest version of `tar` tweaks the checksum here slightly as the tarball is
slightly different, so this just updates the test to pull the checksum from the
publication rather than hardcoding it.
Vasudev Kamath [Tue, 5 Dec 2017 16:34:26 +0000 (22:04 +0530)]
Update changelog for release to experimental.
Vasudev Kamath [Tue, 5 Dec 2017 16:33:06 +0000 (22:03 +0530)]
Typo fix.
Vasudev Kamath [Tue, 5 Dec 2017 16:32:47 +0000 (22:02 +0530)]
Drop magnet-sys from copyright.
Vasudev Kamath [Tue, 5 Dec 2017 16:32:30 +0000 (22:02 +0530)]
Add CONTRIBUTING.md to copyright.
Alex Crichton [Tue, 5 Dec 2017 15:27:04 +0000 (07:27 -0800)]
Reconfigure curl handles after reset
This'll ensure that all our proxy/speed data/etc will be preserved in the
libcurl configuration
Closes #4779
Vasudev Kamath [Tue, 5 Dec 2017 15:22:54 +0000 (20:52 +0530)]
Add partial 1001 typo fix to 1002.
Vasudev Kamath [Tue, 5 Dec 2017 15:10:00 +0000 (20:40 +0530)]
Add patch 2006 to disable wasm32 tests.
Vasudev Kamath [Tue, 5 Dec 2017 15:09:45 +0000 (20:39 +0530)]
Update copyright information.
Vasudev Kamath [Sun, 3 Dec 2017 15:11:49 +0000 (20:41 +0530)]
Update changelog.
Vasudev Kamath [Sun, 3 Dec 2017 14:23:13 +0000 (19:53 +0530)]
Add 2005 to prevent executing non existent mdBook command.
Vasudev Kamath [Sun, 3 Dec 2017 13:46:24 +0000 (19:16 +0530)]
Drop patch 1001 as its merged upstream.
Vasudev Kamath [Sun, 3 Dec 2017 13:46:14 +0000 (19:16 +0530)]
Refresh patch 2002 with new release.
Vasudev Kamath [Sun, 3 Dec 2017 13:46:00 +0000 (19:16 +0530)]
Refresh patch 2001 to new libgit2-sys release.
Vasudev Kamath [Sun, 3 Dec 2017 06:30:55 +0000 (12:00 +0530)]
Update upstream source from tag 'upstream/0.23.0'
Update to upstream version '0.23.0'
with Debian dir
778f6c9267d72948d223458475d68b5a7d4580a3
Vasudev Kamath [Sun, 3 Dec 2017 06:28:47 +0000 (11:58 +0530)]
New upstream version 0.23.0
Vasudev Kamath [Sun, 3 Dec 2017 06:24:41 +0000 (11:54 +0530)]
Audit logo.svg file from termion crate.
Vasudev Kamath [Sun, 3 Dec 2017 06:24:30 +0000 (11:54 +0530)]
Refresh patch 2004 for new release.
bors [Wed, 22 Nov 2017 14:26:57 +0000 (14:26 +0000)]
Auto merge of #4739 - kennytm:backport-4672, r=matklad
[beta] When uplifting directories, symlink them instead of hard-link them.
Backport of #4672 to 1.22 (cargo 0.23)
The current stable RC (
cee38cd30) contains #4616 *but not* #4672. Without the latter it is known to cause #4671 on APFS (enabled by default on macOS 10.13 "High Sierra").
The issue was found by kpy3 on https://internals.rust-lang.org/t/rust-1-22-0-prerelease-testing/6282/2.
kennytm [Sat, 28 Oct 2017 19:47:29 +0000 (03:47 +0800)]
When uplifting directories, symlink them instead of hard-link them.
Fixes #4671.
bors [Sat, 18 Nov 2017 00:03:28 +0000 (00:03 +0000)]
Auto merge of #4568 - Metaswitch:alt-registry-publish, r=withoutboats
Add support for publish to optionally take the index that can be used
This form part of alternative-registries RFC-2141, it allows crates to optionally specify which registries the crate can be be published to.
@carols10cents, one thing that I am unsure about is if there is a plan for publish to still provide index, or for registry to be provided instead. I thought that your general view was that we should move away from the index file. If we do need to map allowed registries to the index then there will be a small amount of extra work required once #4506 is merged.
@withoutboats, happy for this to be merged into your branch if you want, the main reason I did not base it on your branch was due to tests not working on there yet.
bors [Sun, 12 Nov 2017 22:34:46 +0000 (22:34 +0000)]
Auto merge of #4716 - Mark-Simulacrum:frozen-freezes-beta, r=alexcrichton
[beta] Do not update semantically equivalent lockfiles with --frozen/--locked.
A previous patch in #4684 attempted to fix this, but didn't work for the
case where the [root] crate wasn't the first crate in the sorted package
array.
Backport of https://github.com/rust-lang/cargo/pull/4714.
bors [Sun, 12 Nov 2017 20:47:09 +0000 (20:47 +0000)]
Auto merge of #4715 - alexcrichton:beta-next, r=matklad
[beta] Fix dep info showing up with a build script
This is a backport of https://github.com/rust-lang/cargo/pull/4711
bors [Sun, 12 Nov 2017 19:13:19 +0000 (19:13 +0000)]
Auto merge of #4714 - Mark-Simulacrum:frozen-freezes, r=alexcrichton
Do not update semantically equivalent lockfiles with --frozen/--locked.
A previous patch in #4684 attempted to fix this, but didn't work for the
case where the [root] crate wasn't the first crate in the sorted package
array.
cc @matklad -- fixes a problem noted in https://github.com/rust-lang/cargo/pull/4684#discussion_r147824900 which appears to have gone unfixed
r? @alexcrichton
Beta backport will be posted as soon as this is reviewed. Merges cleanly.
Mark Simulacrum [Sun, 12 Nov 2017 17:57:05 +0000 (10:57 -0700)]
Do not update semantically equivalent lockfiles with --frozen/--locked.
A previous patch in #4684 attempted to fix this, but didn't work for the
case where the [root] crate wasn't the first crate in the sorted package
array.
Mark Simulacrum [Sun, 12 Nov 2017 17:57:05 +0000 (10:57 -0700)]
Do not update semantically equivalent lockfiles with --frozen/--locked.
A previous patch in #4684 attempted to fix this, but didn't work for the
case where the [root] crate wasn't the first crate in the sorted package
array.
Alex Crichton [Sat, 11 Nov 2017 15:10:42 +0000 (07:10 -0800)]
Fix dep info showing up with a build script
Cargo would erroneously bail out early and accidentally forget to emit a
dep info file if any dependency used a build script, so this fixes that!
bors [Sun, 12 Nov 2017 18:23:21 +0000 (18:23 +0000)]
Auto merge of #4713 - alexcrichton:fix-bsd, r=matklad
Fix compilation on more platforms
bors [Sun, 12 Nov 2017 17:56:05 +0000 (17:56 +0000)]
Auto merge of #4711 - alexcrichton:fix-dep-info, r=matklad
Fix dep info showing up with a build script
Cargo would erroneously bail out early and accidentally forget to emit a
dep info file if any dependency used a build script, so this fixes that!
bors [Sun, 12 Nov 2017 10:43:15 +0000 (10:43 +0000)]
Auto merge of #4673 - pornel:bins, r=alexcrichton
List available binary names
When a project has multiple executables `cargo run` fails, but offers an incomplete solution (suggests `--bin`, but not its arguments.)
This PR adds a list of available binary names to the error message.
Alex Crichton [Sat, 11 Nov 2017 15:10:42 +0000 (07:10 -0800)]
Fix dep info showing up with a build script
Cargo would erroneously bail out early and accidentally forget to emit a
dep info file if any dependency used a build script, so this fixes that!
Alex Crichton [Sun, 12 Nov 2017 10:25:06 +0000 (02:25 -0800)]
Fix compilation on more platforms
bors [Sat, 11 Nov 2017 03:02:03 +0000 (03:02 +0000)]
Auto merge of #4710 - steveklabnik:fix-broken-links, r=Mark-Simulacrum
Fix broken links in cargo book
Needed to address failures in https://github.com/rust-lang/rust/pull/45692
steveklabnik [Fri, 10 Nov 2017 16:14:05 +0000 (11:14 -0500)]
Fix broken links in cargo book
bors [Thu, 9 Nov 2017 07:39:03 +0000 (07:39 +0000)]
Auto merge of #4705 - Metaswitch:fix-yank-help, r=matklad
Stop yank -h from panicking on nightly
Increase the gap between the registry option and the description so that the help is parsed correctly. I have also checked the code for the other binaries to ensure that they don't suffer from the same issue.
This fixes #4703.
Chris Swindle [Thu, 9 Nov 2017 06:00:28 +0000 (06:00 +0000)]
Fix yank help.
Chris Swindle [Wed, 8 Nov 2017 05:42:48 +0000 (05:42 +0000)]
Code review markups.
bors [Tue, 7 Nov 2017 20:46:45 +0000 (20:46 +0000)]
Auto merge of #4702 - mathstuf:update-lockfile-switch-colors, r=alexcrichton
cargo_generate_lockfile: flip Updating and Adding colors
Updating is green elsewhere and is more common as well.
---
Cc: @alexcrichton
Ben Boeckel [Tue, 7 Nov 2017 20:41:05 +0000 (15:41 -0500)]
cargo_generate_lockfile: flip Updating and Adding colors
Updating is green elsewhere and is more common as well.
bors [Tue, 7 Nov 2017 18:12:25 +0000 (18:12 +0000)]
Auto merge of #4701 - mathstuf:update-lockfile-color-reflects-change, r=alexcrichton
cargo_generate_lockfile: use color to also indicate the change
In English, `Updating` and `Removing` are the same length and scanning
the list for changes is hard. Use color to help indicate the kind of
change that is occurring.
Ben Boeckel [Tue, 7 Nov 2017 16:56:38 +0000 (11:56 -0500)]
cargo_generate_lockfile: use color to also indicate the change
In English, `Updating` and `Removing` are the same length and scanning
the list for changes is hard. Use color to help indicate the kind of
change that is occurring.
Chris Swindle [Mon, 6 Nov 2017 21:08:22 +0000 (21:08 +0000)]
Sort out bug with updating registry on a clean build.
Chris Swindle [Mon, 6 Nov 2017 20:37:40 +0000 (20:37 +0000)]
Code review markups.
bors [Mon, 6 Nov 2017 18:35:46 +0000 (18:35 +0000)]
Auto merge of #4646 - alexcrichton:progress, r=matklad
Add a number of progress indicators to Cargo
This commit is an attempt to stem the tide of "cargo is stuck updating the
registry" issues by giving a better indication as to what's happening in
long-running steps. The primary addition here is a `Progress` helper module
which prints and manages a progress bar for long-running operations like git
fetches, git checkouts, HTTP downloads, etc.
The second addition here is to print out when we've been stuck in resolve for
some time. We never really have a progress indicator for crate graph resolution
nor do we know when we're done updating sources. Instead we make a naive
assumption that when you've spent 0.5s in the resolution loop itself (not
updating deps) you're probably done updating dependencies and on to acutal
resolution. This will print out `Resolving crate graph...` and help inform that
Cargo is indeed not stuck looking at the registry, but rather it's churning away
in resolution.
**Downloading all Servo's dependencies**
[](https://asciinema.org/a/JX9yQZtyFo5ED0Pwg45barBco)
**Long running resolution**
[](https://asciinema.org/a/p7xAkSVeMlkyvgcI6Gx7DZjAV)
Alex Crichton [Mon, 16 Oct 2017 14:57:38 +0000 (07:57 -0700)]
Add a number of progress indicators to Cargo
This commit is an attempt to stem the tide of "cargo is stuck updating the
registry" issues by giving a better indication as to what's happening in
long-running steps. The primary addition here is a `Progress` helper module
which prints and manages a progress bar for long-running operations like git
fetches, git checkouts, HTTP downloads, etc.
The second addition here is to print out when we've been stuck in resolve for
some time. We never really have a progress indicator for crate graph resolution
nor do we know when we're done updating sources. Instead we make a naive
assumption that when you've spent 0.5s in the resolution loop itself (not
updating deps) you're probably done updating dependencies and on to acutal
resolution. This will print out `Resolving crate graph...` and help inform that
Cargo is indeed not stuck looking at the registry, but rather it's churning away
in resolution.
bors [Sat, 4 Nov 2017 14:47:48 +0000 (14:47 +0000)]
Auto merge of #4695 - behnam:doc-book, r=alexcrichton
[doc/book] Change title to The Cargo Book
Also add "community’s" to description of crates.io, as Cargo now
supports multiple registries.
bors [Fri, 3 Nov 2017 05:27:45 +0000 (05:27 +0000)]
Auto merge of #4696 - paulkernfeld:master, r=matklad
Note that token can be read from stdin
Paul Kernfeld [Thu, 2 Nov 2017 21:52:00 +0000 (17:52 -0400)]
Note that token can be read from stdin
Behnam Esfahbod [Thu, 2 Nov 2017 17:54:36 +0000 (10:54 -0700)]
[doc/book] Change title to The Cargo Book
Also add "community’s" to description of crates.io, as Cargo now
supports multiple registries.
Chris Swindle [Wed, 1 Nov 2017 22:28:28 +0000 (22:28 +0000)]
Use the correct interface for creating an alternative registry source id.
Chris Swindle [Wed, 1 Nov 2017 22:14:33 +0000 (22:14 +0000)]
Include registry in dependencies in the index.
Chris Swindle [Wed, 1 Nov 2017 19:55:47 +0000 (19:55 +0000)]
Merge remote-tracking branch 'upstream/master' into alt-registry-publish-wip
bors [Wed, 1 Nov 2017 15:24:12 +0000 (15:24 +0000)]
Auto merge of #4680 - Metaswitch:registry-login, r=alexcrichton
Support login tokens for multiple registries
This pull request builds on #4206 to support login using the the registry from alternate registries (RFC 2141). This includes the following changes:
- allow credentials to be stored based on the registry
- allow passing the registry to run cargo commands against using --registry
Note that this does not include a feature gate on the use of --registry as the publish code blocks publish if we use any features. @alexcrichton, are you happy with this approach, or is there a way that you would recommend this should be relaxed for testing purposes?
bors [Tue, 31 Oct 2017 22:13:57 +0000 (22:13 +0000)]
Auto merge of #4692 - nossralf:add-rustfmt-config, r=matklad
Add rustfmt.toml with formatting disabled
Currently, Cargo does not use rustfmt for its source code. By adding a rustfmt.toml that simply disables all formatting rules, editors which use rustfmt by default for all Rust code will do the right thing and leave the source code unchanged,.
This makes life a little bit easier for developers who no longer need to explicitly disable automatic rustfmt formatting when working on Cargo to avoid code unrelated to a change being reformatted.
Chris Swindle [Tue, 31 Oct 2017 22:11:02 +0000 (22:11 +0000)]
Add verification that an crate has been published to the correct location.
bors [Tue, 31 Oct 2017 21:45:57 +0000 (21:45 +0000)]
Auto merge of #4691 - nbianca:patch-1, r=alexcrichton
Improved README.
Made some miscellaneous improvements.
Fredrik Larsson [Tue, 31 Oct 2017 21:31:02 +0000 (22:31 +0100)]
Add rustfmt.toml with formatting disabled
Currently, Cargo does not use rustfmt for its source code. By adding a
rustfmt.toml that simply disables all formatting rules, editors which
use rustfmt by default for all Rust code will do the right thing and
leave the source code unchanged.
Bianca Nenciu [Tue, 31 Oct 2017 20:37:45 +0000 (22:37 +0200)]
Improved README.
Kornel [Tue, 31 Oct 2017 17:45:57 +0000 (17:45 +0000)]
Alternative list display
Kornel [Sat, 28 Oct 2017 22:03:15 +0000 (23:03 +0100)]
List available binary names
bors [Tue, 31 Oct 2017 16:49:55 +0000 (16:49 +0000)]
Auto merge of #4683 - djc:requirements, r=alexcrichton
Introduce Requirements struct to clarify code
`cargo::core::resolver::build_requirements()` previously, in this order:
* Defined local variables to track state
* Called a function to mutate the local variables
* Defined the aforementioned function
* Returned two out of three local variables as a tuple
This PR changes the code so that this is a recast as a struct (appropriately called `Requirements`), which is mutated in a more fine-grained way by its methods and acts as the return type for `build_requirements()`. To me, this seems a lot easier to understand.
This work was done in the context of #1286, but I figured it was easier to start landing some of the refactoring to avoid bitrot and get early (well, earlier) feedback.
Chris Swindle [Tue, 31 Oct 2017 16:39:56 +0000 (16:39 +0000)]
Sort out remaining file permissions.
Chris Swindle [Tue, 31 Oct 2017 16:00:21 +0000 (16:00 +0000)]
Updated tests based on review comments.
bors [Tue, 31 Oct 2017 15:22:31 +0000 (15:22 +0000)]
Auto merge of #4687 - matklad:rust-1.22.0-backport, r=alexcrichton
[beta] Don't update lockfiles from previous Cargo versions if `--locked` is passed
Aleksey Kladov [Mon, 30 Oct 2017 19:56:46 +0000 (22:56 +0300)]
[beta] Don't update lockfiles from previous Cargo versions if `--locked` is passed
bors [Tue, 31 Oct 2017 14:14:46 +0000 (14:14 +0000)]
Auto merge of #4684 - matklad:lazy-update, r=alexcrichton
Don't update lockfiles from previous Cargo versions if `--locked` is passed
Recently, we've stopped outputting `[root]` section to Cargo.lock files. The problem with this is that somebody might want to have a Cargo.lock file with a `[root]` section for compatibility with older Cargos, but at the same time use newer Cargo to build the crate. In this case, newer Cargo would remove `[root]` from the lockfile. Such updating of the lockfiles to the latest versions is a reasonable behavior, but it might be useful to be able to override it with `--locked` flag.
Context: https://github.com/rust-lang/cargo/issues/4563#issuecomment-
340238773
r? @alexcrichton
Chris Swindle [Tue, 31 Oct 2017 09:51:37 +0000 (09:51 +0000)]
Add feature gate on publish field changes.
Aleksey Kladov [Mon, 30 Oct 2017 19:56:46 +0000 (22:56 +0300)]
Don't update lockfiles from previous Cargo versions if `--locked` is passed
Chris Swindle [Tue, 31 Oct 2017 06:28:09 +0000 (06:28 +0000)]
Switch over to use --registry for publish list.
Chris Swindle [Tue, 31 Oct 2017 05:26:42 +0000 (05:26 +0000)]
Merge branch 'registry-login' into alt-registry-publish-wip
Chris Swindle [Tue, 31 Oct 2017 05:20:41 +0000 (05:20 +0000)]
Switching over to get-string for registry credentials.
bors [Tue, 31 Oct 2017 00:48:46 +0000 (00:48 +0000)]
Auto merge of #4676 - mgeisler:ci-caching, r=alexcrichton
Explain why caching is only done on $HOME/.cargo/bin/ in Travis
After having experimented with the Travis and AppVeyor caches, I concluded that they don't really help here: they're large and take a very long time to both download when the build starts and upload after it is finished.
Martin Geisler [Mon, 30 Oct 2017 22:29:28 +0000 (23:29 +0100)]
Explain why we are not using 'cache: cargo' with Travis
bors [Mon, 30 Oct 2017 21:48:18 +0000 (21:48 +0000)]
Auto merge of #4685 - ehuss:all-targets-no-lib, r=alexcrichton
Fix --all-targets in a crate without a lib.
Fixes #4615.
Eric Huss [Mon, 30 Oct 2017 21:42:47 +0000 (14:42 -0700)]
Fix --all-targets in a crate without a lib.
Fixes #4615.
Chris Swindle [Mon, 30 Oct 2017 21:25:24 +0000 (21:25 +0000)]
Updating based on review comments.
Chris Swindle [Mon, 30 Oct 2017 20:56:23 +0000 (20:56 +0000)]
Adding unstable-options flag to feature gate the use of --registry option.
bors [Mon, 30 Oct 2017 19:58:01 +0000 (19:58 +0000)]
Auto merge of #4561 - nossralf:uninstall-many, r=matklad
Support uninstallation of multiple packages
This is a WIP pull request with support for uninstalling multiple packages. It mirrors the logic used for `cargo install`.
Fixes #4560
Dirkjan Ochtman [Wed, 4 Oct 2017 18:26:30 +0000 (20:26 +0200)]
Use specific methods to add requirements
Dirkjan Ochtman [Wed, 4 Oct 2017 18:24:51 +0000 (20:24 +0200)]
Move logic for walking over dependent features around