cargo.git
8 years agoUpdate changelog for release to experimental.
Vasudev Kamath [Tue, 5 Dec 2017 16:34:26 +0000 (22:04 +0530)]
Update changelog for release to experimental.

8 years agoTypo fix.
Vasudev Kamath [Tue, 5 Dec 2017 16:33:06 +0000 (22:03 +0530)]
Typo fix.

8 years agoDrop magnet-sys from copyright.
Vasudev Kamath [Tue, 5 Dec 2017 16:32:47 +0000 (22:02 +0530)]
Drop magnet-sys from copyright.

8 years agoAdd CONTRIBUTING.md to copyright.
Vasudev Kamath [Tue, 5 Dec 2017 16:32:30 +0000 (22:02 +0530)]
Add CONTRIBUTING.md to copyright.

8 years agoAdd partial 1001 typo fix to 1002.
Vasudev Kamath [Tue, 5 Dec 2017 15:22:54 +0000 (20:52 +0530)]
Add partial 1001 typo fix to 1002.

8 years agoAdd patch 2006 to disable wasm32 tests.
Vasudev Kamath [Tue, 5 Dec 2017 15:10:00 +0000 (20:40 +0530)]
Add patch 2006 to disable wasm32 tests.

8 years agoUpdate copyright information.
Vasudev Kamath [Tue, 5 Dec 2017 15:09:45 +0000 (20:39 +0530)]
Update copyright information.

8 years agoUpdate changelog.
Vasudev Kamath [Sun, 3 Dec 2017 15:11:49 +0000 (20:41 +0530)]
Update changelog.

8 years agoAdd 2005 to prevent executing non existent mdBook command.
Vasudev Kamath [Sun, 3 Dec 2017 14:23:13 +0000 (19:53 +0530)]
Add 2005 to prevent executing non existent mdBook command.

8 years agoDrop patch 1001 as its merged upstream.
Vasudev Kamath [Sun, 3 Dec 2017 13:46:24 +0000 (19:16 +0530)]
Drop patch 1001 as its merged upstream.

8 years agoRefresh patch 2002 with new release.
Vasudev Kamath [Sun, 3 Dec 2017 13:46:14 +0000 (19:16 +0530)]
Refresh patch 2002 with new release.

8 years agoRefresh patch 2001 to new libgit2-sys release.
Vasudev Kamath [Sun, 3 Dec 2017 13:46:00 +0000 (19:16 +0530)]
Refresh patch 2001 to new libgit2-sys release.

8 years agoUpdate upstream source from tag 'upstream/0.23.0'
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

8 years agoNew upstream version 0.23.0
Vasudev Kamath [Sun, 3 Dec 2017 06:28:47 +0000 (11:58 +0530)]
New upstream version 0.23.0

8 years agoAudit logo.svg file from termion crate.
Vasudev Kamath [Sun, 3 Dec 2017 06:24:41 +0000 (11:54 +0530)]
Audit logo.svg file from termion crate.

8 years agoRefresh patch 2004 for new release.
Vasudev Kamath [Sun, 3 Dec 2017 06:24:30 +0000 (11:54 +0530)]
Refresh patch 2004 for new release.

8 years agoAuto merge of #4739 - kennytm:backport-4672, r=matklad
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.

8 years agoWhen uplifting directories, symlink them instead of hard-link them.
kennytm [Sat, 28 Oct 2017 19:47:29 +0000 (03:47 +0800)]
When uplifting directories, symlink them instead of hard-link them.

Fixes #4671.

8 years agoAuto merge of #4716 - Mark-Simulacrum:frozen-freezes-beta, r=alexcrichton
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.

8 years agoAuto merge of #4715 - alexcrichton:beta-next, r=matklad
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

8 years agoDo not update semantically equivalent lockfiles with --frozen/--locked.
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.

8 years agoFix dep info showing up with a build script
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!

8 years agoAuto merge of #4687 - matklad:rust-1.22.0-backport, r=alexcrichton
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

8 years ago[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

8 years agoPrepare upload for experimental.
Vasudev Kamath [Sun, 29 Oct 2017 15:58:32 +0000 (21:28 +0530)]
Prepare upload for experimental.

8 years agoAdd BSD-3-clause license to copyright file.
Vasudev Kamath [Sun, 29 Oct 2017 14:56:56 +0000 (20:26 +0530)]
Add BSD-3-clause license to copyright file.

8 years agoTypo fix in copyright s/magneta/magenta/
Vasudev Kamath [Sun, 29 Oct 2017 14:55:28 +0000 (20:25 +0530)]
Typo fix in copyright s/magneta/magenta/

8 years agoFix typo in search subcommand and related tests.
Vasudev Kamath [Sun, 29 Oct 2017 14:20:13 +0000 (19:50 +0530)]
Fix typo in search subcommand and related tests.

8 years agoRevert "Fix one more typo in cargo search command."
Vasudev Kamath [Sun, 29 Oct 2017 13:49:44 +0000 (19:19 +0530)]
Revert "Fix one more typo in cargo search command."

This reverts commit a7347f1f539654d9f89910f26a51b9f7f8e08ef1.

8 years agoFix one more typo in cargo search command.
Vasudev Kamath [Sat, 28 Oct 2017 05:16:37 +0000 (10:46 +0530)]
Fix one more typo in cargo search command.

8 years agoAdd new vendor crate copyright information.
Vasudev Kamath [Sat, 28 Oct 2017 04:58:11 +0000 (10:28 +0530)]
Add new vendor crate copyright information.

8 years agoMake cargo priority optional from extra
Vasudev Kamath [Fri, 27 Oct 2017 17:12:12 +0000 (22:42 +0530)]
Make cargo priority optional from extra

Priority extra is deprecated from Debian policy 4.0.1.

8 years agoUpdate changelog.
Vasudev Kamath [Thu, 26 Oct 2017 17:02:20 +0000 (22:32 +0530)]
Update changelog.

8 years agoMark package compliance with Debian policy 4.1.1
Vasudev Kamath [Thu, 26 Oct 2017 16:44:22 +0000 (22:14 +0530)]
Mark package compliance with Debian policy 4.1.1

8 years agoRefresh patch 1001, 2002 and 2004 with new upstream.
Vasudev Kamath [Thu, 26 Oct 2017 16:43:18 +0000 (22:13 +0530)]
Refresh patch 1001, 2002 and 2004 with new upstream.

8 years agoUpdated version 0.22.0 from 'upstream/0.22.0'
Vasudev Kamath [Thu, 26 Oct 2017 16:30:38 +0000 (22:00 +0530)]
Updated version 0.22.0 from 'upstream/0.22.0'

with Debian dir df35b36f6b40533c109b20cab36a943be981109f

8 years agoNew upstream version 0.22.0
Vasudev Kamath [Thu, 26 Oct 2017 16:29:03 +0000 (21:59 +0530)]
New upstream version 0.22.0

8 years agoAdd conv crate file to unsuspicious files.
Vasudev Kamath [Thu, 26 Oct 2017 16:17:25 +0000 (21:47 +0530)]
Add conv crate file to unsuspicious files.

8 years agoMerge branch 'debian/sid' into debian/experimental
Vasudev Kamath [Thu, 26 Oct 2017 16:02:14 +0000 (21:32 +0530)]
Merge branch 'debian/sid' into debian/experimental

8 years agoRelease 0.21.1-2 to Debian unstable.
Ximin Luo [Wed, 25 Oct 2017 21:30:57 +0000 (23:30 +0200)]
Release 0.21.1-2 to Debian unstable.

8 years agoAuto merge of #4616 - kennytm:fix-4490, r=alexcrichton
bors [Sat, 14 Oct 2017 14:54:15 +0000 (14:54 +0000)]
Auto merge of #4616 - kennytm:fix-4490, r=alexcrichton

Uplift *.dSYM

Fixed #4490.

The solution is based on #4570. Simply adding `.dSYM` into `add_target_specific_suffixes` will cause cargo trying to actually run that `.dSYM` folder, so I've upgraded the `linkable` boolean into a 3-value enum `TargetFileType`, to tell `cargo run` and `cargo test` to avoid these debug symbol files.

(I haven't checked if it can solve #4056, don't wanna mess with Spotlight 😝)

8 years agoAuto merge of #4618 - integer32llc:config-in-home, r=alexcrichton
bors [Sat, 14 Oct 2017 14:19:16 +0000 (14:19 +0000)]
Auto merge of #4618 - integer32llc:config-in-home, r=alexcrichton

Clarify that $HOME/.cargo is always checked

8 years agoClarify that $HOME/.cargo is always checked
Jake Goulding [Fri, 13 Oct 2017 23:50:04 +0000 (19:50 -0400)]
Clarify that $HOME/.cargo is always checked

8 years agoUplift *.dSYM. Fix #4490.
kennytm [Fri, 13 Oct 2017 19:13:32 +0000 (03:13 +0800)]
Uplift *.dSYM. Fix #4490.

8 years agoAuto merge of #4610 - hdhoang:patch-1, r=alexcrichton
bors [Thu, 12 Oct 2017 14:23:24 +0000 (14:23 +0000)]
Auto merge of #4610 - hdhoang:patch-1, r=alexcrichton

layout: fix typo, and improve pronoun

"it" is ambiguous between `new` and `at` (the most recent noun).

8 years agoAuto merge of #4314 - nodakai:phantom-type-in-projectbuilder, r=matklad
bors [Thu, 12 Oct 2017 08:52:44 +0000 (08:52 +0000)]
Auto merge of #4314 - nodakai:phantom-type-in-projectbuilder, r=matklad

cargotest/support: remove internal mutability in favor of switching types

`Cell<bool>` was removed from `ProjectBuilder`. Instead `PhantomData<T>` was added to it (and `RepoBuilder`) to manage state transition in the type level (`T` is either `Configuring` or `Done`.)
`ProjectBuilder::cargo_process()` was removed as its design heavily depended on the internal mutability.

Also added `#[must_use]` to `ProjectBuilder` and `RepoBuilder` to check for call sites of their `build()` method.

8 years agolayout: fix typo, and improve pronoun
Hoàng Đức Hiếu [Thu, 12 Oct 2017 04:04:58 +0000 (13:04 +0900)]
layout: fix typo, and improve pronoun

"it" is ambiguous between `new` and `at` (the most recent noun).

8 years agoAuto merge of #4608 - vmx:patch-1, r=alexcrichton
bors [Thu, 12 Oct 2017 00:20:13 +0000 (00:20 +0000)]
Auto merge of #4608 - vmx:patch-1, r=alexcrichton

Remove wrong information about git repository

Dependencies cannot be a git repository when published to crates.io.

8 years agoRemove wrong information about git repository
Volker Mische [Wed, 11 Oct 2017 19:18:41 +0000 (21:18 +0200)]
Remove wrong information about git repository

Dependencies cannot be a git repository when published to crates.io.

8 years agoAuto merge of #4594 - behnam:workspace, r=alexcrichton
bors [Tue, 10 Oct 2017 19:20:43 +0000 (19:20 +0000)]
Auto merge of #4594 - behnam:workspace, r=alexcrichton

[core/workspace] Create WorkspaceRootConfig

Create `WorkspaceRootConfig`, which knows its `root_dir` and lists of
`members` and `excludes`, to answer queries on which paths are a member
and which are not.

----

This is the first step of the fix, that's only a codemod to put together the relevant parts : `workspace.members`, `workspace.excludes`, and the `root_dir` (where `members` and `excludes` are relative to). There's no logic change in this PR to keep review easier.

The added tests are commented out, because they fail with the current logic. The next step to get these steps to pass.

Tracker: <https://github.com/rust-lang/cargo/issues/4089>
Old PR: <https://github.com/rust-lang/cargo/pull/4297>

8 years agoAuto merge of #4581 - tamird:master, r=alexcrichton
bors [Tue, 10 Oct 2017 18:36:48 +0000 (18:36 +0000)]
Auto merge of #4581 - tamird:master, r=alexcrichton

cargo_rustc: remove workaround for fixed upstream issue

Fixed in https://github.com/rust-lang/rust/pull/25411. Also, the
removed code is implicated in test failures observed in
https://github.com/rust-lang/rust/pull/44515.

r? @alexcrichton

8 years agoAuto merge of #4602 - ehuss:fix-new-test-windows, r=alexcrichton
bors [Tue, 10 Oct 2017 17:58:30 +0000 (17:58 +0000)]
Auto merge of #4602 - ehuss:fix-new-test-windows, r=alexcrichton

Allow test to pass if user has ~/.gitconfig on Windows.

The `new` test will fail on Windows if you have `~/.gitconfig` configured with a username/email.  This is because libgit2 searches quite a few environment variables hunting for a config file.  Rather than adjusting other environment variables (I think at a minimum it would be `%HOMEDRIVE%%HOMEPATH%` and `%USERPROFILE%`), this just adds an empty config file since libgit2 will stop at the first one it finds.

8 years agocargo_rustc: remove workaround for fixed upstream issue
Tamir Duberstein [Thu, 5 Oct 2017 06:54:43 +0000 (02:54 -0400)]
cargo_rustc: remove workaround for fixed upstream issue

Fixed in https://github.com/rust-lang/rust/pull/25411. Also, the
removed code is implicated in test failures observed in
https://github.com/rust-lang/rust/pull/44515.

8 years agocargotest/support: remove internal mutability in favor of switching types
NODA, Kai [Sat, 22 Jul 2017 03:12:21 +0000 (11:12 +0800)]
cargotest/support: remove internal mutability in favor of switching types

Remove is_build: Cell<bool> from ProjectBuilder and introduce a new type Project.

is_build==false <-> ProjectBuilder
is_build==true <-> Project

Also add #[must_use] to ProjectBuilder to confirm its instances are surely consumed by its build() method to produce Project.

The same goes for RepoBuilder.

ProjectBuilder::cargo_process() was removed as its design heavily depended on the internal mutability.

Signed-off-by: NODA, Kai <nodakai@gmail.com>
8 years agoAllow test to pass if user has ~/.gitconfig on Windows.
Eric Huss [Tue, 10 Oct 2017 00:52:51 +0000 (17:52 -0700)]
Allow test to pass if user has ~/.gitconfig on Windows.

8 years agoAuto merge of #4570 - tatsuya6502:target-specific-artifacts, r=alexcrichton
bors [Mon, 9 Oct 2017 20:48:17 +0000 (20:48 +0000)]
Auto merge of #4570 - tatsuya6502:target-specific-artifacts, r=alexcrichton

Handle target specific outputs such as .wasm or .dll.lib

Fixes #4500, #4535

Until now, Cargo does not have any knowledge about target-specific output files. It relies solely on rustc for this sort of information (`rustc --print=file-names ...`).

As a result, Cargo does not place some build artifacts (files) to target/{debug,release} directory. These files include *.wasm for wasm32-unknown-emscripten target and *.dll.lib for *-pc-windows-msvc cdylib target.

This commit will add such knowledge to Cargo so that *.wasm and *.dll.lib will be placed in target/{debug,release} directory.

**EDIT**: I added [a summary of changes](https://github.com/rust-lang/cargo/pull/4570#issuecomment-334433635). Please read it for more details of changes.

**IMPORTANT**
Although I added test cases for both wasm32-unknown-emscripten and *-pc-windows-msvc cdylib targets, ~I did not do manual testing on wasm32-unknown-emscripten target as I do not have an environment with emscripten installed. It will be appreciated if anybody tests this change for wasm32-unknown-emscripten target.~  **EDIT**: Tested for both wasm32-unknown-emscripten and x86_64-pc-windows-msvc. Thanks @Herschel for the help.

8 years agoAuto merge of #4597 - andreevlex:fix-cargo-doc, r=alexcrichton
bors [Mon, 9 Oct 2017 17:53:25 +0000 (17:53 +0000)]
Auto merge of #4597 - andreevlex:fix-cargo-doc, r=alexcrichton

Fixed spelling error in manifest.md

8 years agoFixed spelling error in manifest.md
Andreev Alexander [Mon, 9 Oct 2017 13:38:06 +0000 (16:38 +0300)]
Fixed spelling error in manifest.md

8 years agoAuto merge of #4595 - treiff:update-appveyor-badge-documentation, r=alexcrichton
bors [Sun, 8 Oct 2017 02:32:33 +0000 (02:32 +0000)]
Auto merge of #4595 - treiff:update-appveyor-badge-documentation, r=alexcrichton

Update docs for appveyor badge.

Can now optionally specify the appveyor `project_name`.

Related PR: [rust-lang/crates.io#1111](https://github.com/rust-lang/crates.io/pull/1111)
Related Issue: [rust-lang/crates.io#587](https://github.com/rust-lang/crates.io/issues/587)

8 years agoUpdate docs for appveyor badge.
Trevor Reiff [Sun, 8 Oct 2017 00:59:39 +0000 (20:59 -0400)]
Update docs for appveyor badge.

8 years ago[workspace] Add some docs
Behnam Esfahbod [Sat, 7 Oct 2017 22:00:13 +0000 (15:00 -0700)]
[workspace] Add some docs

Plus some little codemod.

8 years ago[core/workspace] Create WorkspaceRootConfig
Behnam Esfahbod [Tue, 26 Sep 2017 05:55:02 +0000 (22:55 -0700)]
[core/workspace] Create WorkspaceRootConfig

Create `WorkspaceRootConfig`, which knows its `root_dir` and lists of
`members` and `excludes`, to answer queries on which paths are a member
and which are not.

8 years agoAuto merge of #4578 - derekdreery:refactor/cargo_util_config, r=alexcrichton
bors [Sat, 7 Oct 2017 15:09:06 +0000 (15:09 +0000)]
Auto merge of #4578 - derekdreery:refactor/cargo_util_config, r=alexcrichton

Remove some cells from Config

In most cases it makes sense to not use interior mutability in Config, so that mutability is more transparent. This PR removes Cells in these cases. It leaves those cases where parameters are only initialized on first access (LazyCell).

8 years agoUpdate docs (replace todos)
Richard Dodd [Sat, 7 Oct 2017 12:47:21 +0000 (13:47 +0100)]
Update docs (replace todos)

8 years agoAuto merge of #4586 - lukaslueg:issue4534, r=alexcrichton
bors [Fri, 6 Oct 2017 17:54:30 +0000 (17:54 +0000)]
Auto merge of #4586 - lukaslueg:issue4534, r=alexcrichton

Report hint if single failure with --no-fail-fast

There are two things going on in #4534:

* The doctest-kind masks the unittest-kind if doctests are executed during `--no-fail-fast`, no doctests fail and tests errors have already piled up. This is bug, fixed.
* Cargo would previously not report any unittest-hints if running with `--no-fail-fast`. This behavior has been changed to report a specific hint iif exactly one error has bubbled up during `--no-fail-fast`. The hint in #4534 is now `...pass '--test integ'`.

8 years agoReport hint if single failure with --no-fail-fast
Lukas Lueg [Fri, 6 Oct 2017 16:14:23 +0000 (18:14 +0200)]
Report hint if single failure with --no-fail-fast

If a single unit-test fails, report a rerun-hint for it,
even with --no-fail-fast.

Fixes reporting a doctest-hint if doctest succeeds while
unittest fail with --no-fail-fast.

Fixes #4534

8 years agoAuto merge of #4584 - alexcrichton:beta-next, r=matklad
bors [Fri, 6 Oct 2017 07:38:28 +0000 (07:38 +0000)]
Auto merge of #4584 - alexcrichton:beta-next, r=matklad

[beta] Fix [patch] causing updates with a virtual manifest

This is a backport of https://github.com/rust-lang/cargo/pull/4583

8 years agoFix [patch] causing updates with a virtual manifest
Alex Crichton [Thu, 5 Oct 2017 22:11:25 +0000 (15:11 -0700)]
Fix [patch] causing updates with a virtual manifest

This commit fixes the [patch] implementation to avoid causing spurious updates
of the registry when specified inside of a virtual manifest via a path
dependency that was otherwise outside of the workspace.

Cargo previously attempted to learn about path dependencies through the
configuration of the workspace by looking at members, their path dependencies,
and their replace sections. The replace/patch sections, however, only matter at
the root of the workspace and those weren't looked at! This commit fixes this
problem by explicitly looking at the workspace's replace/patch sections and
avoiding looking at other manifest replace/patch which shouldn't matter.

Closes #4552

8 years agoAuto merge of #4583 - alexcrichton:unstable, r=matklad
bors [Thu, 5 Oct 2017 22:54:59 +0000 (22:54 +0000)]
Auto merge of #4583 - alexcrichton:unstable, r=matklad

Fix [patch] causing updates with a virtual manifest

This commit fixes the [patch] implementation to avoid causing spurious updates
of the registry when specified inside of a virtual manifest via a path
dependency that was otherwise outside of the workspace.

Cargo previously attempted to learn about path dependencies through the
configuration of the workspace by looking at members, their path dependencies,
and their replace sections. The replace/patch sections, however, only matter at
the root of the workspace and those weren't looked at! This commit fixes this
problem by explicitly looking at the workspace's replace/patch sections and
avoiding looking at other manifest replace/patch which shouldn't matter.

Closes #4552

8 years agoFix [patch] causing updates with a virtual manifest
Alex Crichton [Thu, 5 Oct 2017 22:11:25 +0000 (15:11 -0700)]
Fix [patch] causing updates with a virtual manifest

This commit fixes the [patch] implementation to avoid causing spurious updates
of the registry when specified inside of a virtual manifest via a path
dependency that was otherwise outside of the workspace.

Cargo previously attempted to learn about path dependencies through the
configuration of the workspace by looking at members, their path dependencies,
and their replace sections. The replace/patch sections, however, only matter at
the root of the workspace and those weren't looked at! This commit fixes this
problem by explicitly looking at the workspace's replace/patch sections and
avoiding looking at other manifest replace/patch which shouldn't matter.

Closes #4552

8 years agoHandle target specific outputs such as .wasm
Tatsuya Kawano [Thu, 5 Oct 2017 01:37:04 +0000 (09:37 +0800)]
Handle target specific outputs such as .wasm

Fixes #4535

- Do not add metadata to wasm32 bin target because generated .js will
  refer corresponding .wasm.
- Handle different usages of "-" and "_" in .js and .wasm file names.
  (e.g "foo-bar.js" vs. "foo_bar.wasm")
- Change file mode of cargo_rustc/context.rs (100755 -> 100644)

8 years agoAuto merge of #4580 - djc:cargo-update, r=alexcrichton
bors [Wed, 4 Oct 2017 22:35:33 +0000 (22:35 +0000)]
Auto merge of #4580 - djc:cargo-update, r=alexcrichton

Update dependencies (unbreak macOS 10.13 with libgit2-sys-0.6.16)

It would be nice to pull in the fix for https://github.com/alexcrichton/git2-rs/issues/257.

8 years agoAuto merge of #4579 - mdevlamynck:issue-3388, r=alexcrichton
bors [Wed, 4 Oct 2017 22:04:49 +0000 (22:04 +0000)]
Auto merge of #4579 - mdevlamynck:issue-3388, r=alexcrichton

Fix error message when Cargo.toml misses a [package] section

Fixes #3388.

8 years agoUpdate dependencies (unbreak macOS 10.13 with libgit2-sys-0.6.16)
Dirkjan Ochtman [Wed, 4 Oct 2017 19:37:55 +0000 (21:37 +0200)]
Update dependencies (unbreak macOS 10.13 with libgit2-sys-0.6.16)

8 years agoFix error message when Cargo.toml misses a [package] section, remove an unused import
Matthias Devlamynck [Wed, 4 Oct 2017 19:24:26 +0000 (21:24 +0200)]
Fix error message when Cargo.toml misses a [package] section, remove an unused import

8 years agoAuto merge of #4571 - raytung:remove-root-from-cargo-lock, r=matklad
bors [Wed, 4 Oct 2017 18:30:20 +0000 (18:30 +0000)]
Auto merge of #4571 - raytung:remove-root-from-cargo-lock, r=matklad

Remove root from cargo lock

Removing [root] section from Cargo.lock for #4563

Tests of interest has been updated accordingly, especially [tests/lockfile-compat.rs#oldest_lockfile_still_works](https://github.com/rust-lang/cargo/compare/master...raytung:remove-root-from-cargo-lock?expand=1#diff-48866d1891f97cb799dd0ca7148d1eefR10)

8 years agoRemove cells where now unnecessary.
Richard Dodd [Wed, 4 Oct 2017 18:11:34 +0000 (19:11 +0100)]
Remove cells where now unnecessary.

8 years agoRefactor Config::configure to take &mut.
Richard Dodd [Wed, 4 Oct 2017 17:03:08 +0000 (18:03 +0100)]
Refactor Config::configure to take &mut.

8 years agoAuto merge of #4556 - lukaslueg:patch-1, r=carols10cents
bors [Wed, 4 Oct 2017 13:50:45 +0000 (13:50 +0000)]
Auto merge of #4556 - lukaslueg:patch-1, r=carols10cents

Update README.md

Table is outdated and of little use anyway

8 years agoAuto merge of #4558 - lukaslueg:issue4504, r=alexcrichton
bors [Wed, 4 Oct 2017 09:13:29 +0000 (09:13 +0000)]
Auto merge of #4558 - lukaslueg:issue4504, r=alexcrichton

Allow multiple arguments in `cargo bench`

It seems the docopt DSL was simply lacking.

8 years agoAuto merge of #4572 - integer32llc:rust-1.21.0, r=alexcrichton
bors [Tue, 3 Oct 2017 20:13:17 +0000 (20:13 +0000)]
Auto merge of #4572 - integer32llc:rust-1.21.0, r=alexcrichton

Backport of #4551 - owner-invite-messages

And *just* this change this time, I think :)

r? @alexcrichton

8 years agoFix tests on nightly
Alex Crichton [Mon, 28 Aug 2017 15:03:42 +0000 (08:03 -0700)]
Fix tests on nightly

8 years agoUpdated old lockfile tests
Ray Tung [Tue, 3 Oct 2017 14:57:49 +0000 (01:57 +1100)]
Updated old lockfile tests

8 years agoRemoved root related flags
Ray Tung [Tue, 3 Oct 2017 14:35:32 +0000 (01:35 +1100)]
Removed root related flags

8 years agoAuto merge of #4551 - natboehm:owner-invite-messages, r=alexcrichton
bors [Sat, 30 Sep 2017 07:37:59 +0000 (07:37 +0000)]
Auto merge of #4551 - natboehm:owner-invite-messages, r=alexcrichton

Owner invite messages

This PR addresses issue #4537, the plan for `cargo owner --add` requiring invitations in Cargo and the encompassing issue [#924](https://github.com/rust-lang/crates.io/issues/924), requiring an invite to add someone as an owner in Crates.io.

Regarding the Cargo issue, we went with Option 2, changing the `add_owners` function to decode a struct sent from Crates containing a `boolean` and `String`, the `boolean` being the response status and `String` being the success message. This may sound redundant however we concluded that using both of these fields were necessary to support older versions of Cargo - if we changed Crates.io to only return the `String` message on success this would likely break systems using the older version of `add_owner` expecting a response containing a `boolean`. Matching this schema, `add_owners` on the Crates.io side will soon return a struct containing a `boolean` and `String`, and instead of adding a new crate owner to the database will add a crate owner invite. If successful, `modify_owners` now prints the message sent from Crates.io instead of the old hardcoded message.

Resolves #4537

8 years agoRevert "Removed root related flags"
Ray Tung [Tue, 3 Oct 2017 14:28:13 +0000 (01:28 +1100)]
Revert "Removed root related flags"

This reverts commit 6f03cce1c3e6083f882fc56100487e616f60fa6b.

8 years agoUpdated test to ensure cargo update transforms Cargo.lock
Ray Tung [Tue, 3 Oct 2017 14:05:57 +0000 (01:05 +1100)]
Updated test to ensure cargo update transforms Cargo.lock

8 years agoRemoved root related flags
Ray Tung [Tue, 3 Oct 2017 13:50:33 +0000 (00:50 +1100)]
Removed root related flags

8 years agoRevert the file mode on context.rs (100644 -> 100755)
Tatsuya Kawano [Tue, 3 Oct 2017 12:46:45 +0000 (20:46 +0800)]
Revert the file mode on context.rs (100644 -> 100755)

8 years agoUpdated appropriate docs referencing [root]
Ray Tung [Tue, 3 Oct 2017 12:33:32 +0000 (23:33 +1100)]
Updated appropriate docs referencing [root]

8 years agoRemoved extraneous logic that generates [root] in cargo.lock
Ray Tung [Tue, 3 Oct 2017 12:18:08 +0000 (23:18 +1100)]
Removed extraneous logic that generates [root] in cargo.lock

8 years agoHandle target specific outputs such as .wasm or .dll.lib
Tatsuya Kawano [Tue, 3 Oct 2017 11:44:35 +0000 (19:44 +0800)]
Handle target specific outputs such as .wasm or .dll.lib

Fixes #4500, #4535

Until now, Cargo does not have any knowledge about target-specific
output files. It relies solely on rustc for this sort of information
(`rustc --print=file-names ...`).

As a result, Cargo does not place some build artifacts (files) to
target/{debug,release} directory. These files include *.wasm
for wasm32-unknown-emscripten target and *.dll.lib for
*-pc-windows-msvc cdylib target.

This commit will add such knowledge to Cargo so that *.wasm and
*.dll.lib will be placed in target/{debug,release} directory.

8 years agoAuto merge of #4564 - rust-lang:matklad-patch-2, r=alexcrichton
bors [Tue, 3 Oct 2017 10:17:41 +0000 (10:17 +0000)]
Auto merge of #4564 - rust-lang:matklad-patch-2, r=alexcrichton

Describe E-mentor label in contributing.md

8 years agoAuto merge of #4559 - derekdreery:add_docs, r=alexcrichton
bors [Tue, 3 Oct 2017 09:18:58 +0000 (09:18 +0000)]
Auto merge of #4559 - derekdreery:add_docs, r=alexcrichton

Add some more docs

Add some more docs for various parts of cargo, and add/improve a few debug implementations.

8 years agoDescribe E-mentor label in contributing.md
Aleksey Kladov [Mon, 2 Oct 2017 19:11:09 +0000 (22:11 +0300)]
Describe E-mentor label in contributing.md

8 years agoRevert Cargo.lock
Richard Dodd [Mon, 2 Oct 2017 12:38:52 +0000 (13:38 +0100)]
Revert Cargo.lock

8 years agoMerge remote-tracking branch 'upstream/master' into add_docs
Richard Dodd [Mon, 2 Oct 2017 12:37:40 +0000 (13:37 +0100)]
Merge remote-tracking branch 'upstream/master' into add_docs

8 years agoAuto merge of #4562 - SimonSapin:btree-manifest, r=matklad
bors [Mon, 2 Oct 2017 10:40:21 +0000 (10:40 +0000)]
Auto merge of #4562 - SimonSapin:btree-manifest, r=matklad

Make manifest serialization deterministic

Fixes #4326

`cargo package` (and so `cargo publish`) parses a crate’s `Cargo.toml`, makes some modifications, and re-serializes it. Because the `TomlManifest` struct uses `HashMap` with its default `RandomState` hasher, the maps’ iteration order changed on every run.

As a result, when using `cargo vendor`, updating a dependency would generate a diff larger than necessary, with non-significant order-changes obscuring significant changes.

This replaces some uses of `HashMap` with `BTreeMap`, whose iteration order is deterministic (based on `Ord`).

8 years agoMake manifest serialization deterministic
Simon Sapin [Mon, 2 Oct 2017 10:04:02 +0000 (12:04 +0200)]
Make manifest serialization deterministic

Fixes #4326

`cargo package` (and so `cargo publish`) parses a crate’s `Cargo.toml`,
makes some modifications, and re-serializes it.
Because the `TomlManifest` struct uses `HashMap`
with its default `RandomState` hasher,
the maps’ iteration order changed on every run.

As a result, when using `cargo vendor`,
updating a dependency would generate a diff larger than necessary,
with non-significant order-changes obscuring significant changes.

This replaces some uses of `HashMap` with `BTreeMap`,
whose iteration order is deterministic (based on `Ord`).

8 years agoSome moer docs
Richard Dodd [Sun, 1 Oct 2017 18:37:48 +0000 (19:37 +0100)]
Some moer docs