cargo.git
7 years agoPatch to fix build failure due to failure deprecated warnings
Vasudev Kamath [Sun, 12 Aug 2018 16:55:05 +0000 (22:25 +0530)]
Patch to fix build failure due to failure deprecated warnings

7 years agoUpdate copyright information for new release.
Vasudev Kamath [Sun, 12 Aug 2018 16:54:50 +0000 (22:24 +0530)]
Update copyright information for new release.

7 years agoupdated changelog for 0.29.0 (not yet ready for upload)
Vasudev Kamath [Wed, 8 Aug 2018 16:32:44 +0000 (22:02 +0530)]
updated changelog for 0.29.0 (not yet ready for upload)

7 years agoUpdate patch 2003 for new libssh2-sys
Vasudev Kamath [Wed, 8 Aug 2018 15:31:55 +0000 (21:01 +0530)]
Update patch 2003 for new libssh2-sys

7 years agoRefresh patch 2002
Vasudev Kamath [Wed, 8 Aug 2018 15:31:48 +0000 (21:01 +0530)]
Refresh patch 2002

7 years agoUpdate 2001 to new libgit2-sys
Vasudev Kamath [Wed, 8 Aug 2018 15:29:05 +0000 (20:59 +0530)]
Update 2001 to new libgit2-sys

7 years agoRemove fuzz from 2004
Vasudev Kamath [Wed, 8 Aug 2018 15:28:57 +0000 (20:58 +0530)]
Remove fuzz from 2004

7 years agoUpdate upstream source from tag 'upstream/0.29.0'
Vasudev Kamath [Wed, 8 Aug 2018 15:14:32 +0000 (20:44 +0530)]
Update upstream source from tag 'upstream/0.29.0'

Update to upstream version '0.29.0'
with Debian dir 22d4e657f4c6e4a475be00484a842da4b5b3f772

7 years agoNew upstream version 0.29.0
Vasudev Kamath [Wed, 8 Aug 2018 15:13:41 +0000 (20:43 +0530)]
New upstream version 0.29.0

7 years agoChange pattern for embedded zlib
Vasudev Kamath [Wed, 8 Aug 2018 15:12:38 +0000 (20:42 +0530)]
Change pattern for embedded zlib

7 years agoUpdate unsuspicious text for new release 0.29.0
Vasudev Kamath [Wed, 8 Aug 2018 15:12:26 +0000 (20:42 +0530)]
Update unsuspicious text for new release 0.29.0

7 years agoUpload 0.28.0 to unstable.
Vasudev Kamath [Tue, 7 Aug 2018 16:44:56 +0000 (22:14 +0530)]
Upload 0.28.0 to unstable.

7 years agoPrepare upload to experimental
Vasudev Kamath [Tue, 7 Aug 2018 16:31:35 +0000 (22:01 +0530)]
Prepare upload to experimental

7 years agoDisable incremental test on sparc64 thanks to John Paul
Vasudev Kamath [Tue, 7 Aug 2018 16:29:32 +0000 (21:59 +0530)]
Disable incremental test on sparc64 thanks to John Paul

7 years agoPrepare release for experimental.
Vasudev Kamath [Sun, 5 Aug 2018 16:11:15 +0000 (21:41 +0530)]
Prepare release for experimental.

7 years agoIntroduce patch to disable fetch platform specific tests
Vasudev Kamath [Sun, 5 Aug 2018 16:10:53 +0000 (21:40 +0530)]
Introduce patch to disable fetch platform specific tests

7 years agoPrepare upload to experimental.
Vasudev Kamath [Sun, 29 Jul 2018 16:37:55 +0000 (22:07 +0530)]
Prepare upload to experimental.

7 years agoBump standards version to 4.1.5
Vasudev Kamath [Sun, 29 Jul 2018 16:36:10 +0000 (22:06 +0530)]
Bump standards version to 4.1.5

7 years agoUpdate copyright information.
Vasudev Kamath [Sun, 29 Jul 2018 16:36:02 +0000 (22:06 +0530)]
Update copyright information.

7 years agoDrop unwanted formatting changes from patch
Vasudev Kamath [Sun, 29 Jul 2018 12:50:13 +0000 (18:20 +0530)]
Drop unwanted formatting changes from patch

7 years agoUpdate changelog
Vasudev Kamath [Sat, 28 Jul 2018 17:37:20 +0000 (23:07 +0530)]
Update changelog

7 years agoUpdate copyright for new release.
Vasudev Kamath [Sat, 28 Jul 2018 17:36:50 +0000 (23:06 +0530)]
Update copyright for new release.

7 years agoRefresh patch 2007 for new release.
Vasudev Kamath [Sat, 28 Jul 2018 16:57:08 +0000 (22:27 +0530)]
Refresh patch 2007 for new release.

7 years agoAdd patch to use libssh2 from system
Vasudev Kamath [Sat, 28 Jul 2018 16:56:41 +0000 (22:26 +0530)]
Add patch to use libssh2 from system

7 years agoUpdate patch 2001 for new libgit2-sys version.
Vasudev Kamath [Sat, 28 Jul 2018 14:58:53 +0000 (20:28 +0530)]
Update patch 2001 for new libgit2-sys version.

7 years agoDrop patch 2008, merged upstream.
Vasudev Kamath [Sat, 28 Jul 2018 14:45:20 +0000 (20:15 +0530)]
Drop patch 2008, merged upstream.

7 years agoMore standard changelog formatting
Ximin Luo [Fri, 27 Jul 2018 12:45:10 +0000 (05:45 -0700)]
More standard changelog formatting

7 years agoFix python3 build-dep for cross-compile, multi-arch:allowed needs :native annotation...
Ximin Luo [Fri, 27 Jul 2018 12:44:41 +0000 (05:44 -0700)]
Fix python3 build-dep for cross-compile, multi-arch:allowed needs :native annotation here

7 years agoMerge branch 'debian/sid' into debian/experimental
Ximin Luo [Fri, 27 Jul 2018 12:44:34 +0000 (05:44 -0700)]
Merge branch 'debian/sid' into debian/experimental

7 years agoUpdate of the alioth ML address.
Sylvestre Ledru [Mon, 23 Jul 2018 11:20:04 +0000 (13:20 +0200)]
Update of the alioth ML address.

7 years agoUpdate changelog (not ready for release).
Vasudev Kamath [Sun, 22 Jul 2018 16:44:58 +0000 (22:14 +0530)]
Update changelog (not ready for release).

7 years agoUpdate upstream source from tag 'upstream/0.28.0'
Vasudev Kamath [Sun, 22 Jul 2018 16:38:12 +0000 (22:08 +0530)]
Update upstream source from tag 'upstream/0.28.0'

Update to upstream version '0.28.0'
with Debian dir 1abcf632df0eae855f6df6f9e110cb16fc624d00

7 years agoNew upstream version 0.28.0
Vasudev Kamath [Sun, 22 Jul 2018 16:37:14 +0000 (22:07 +0530)]
New upstream version 0.28.0

7 years agoUpdate for new release.
Vasudev Kamath [Sun, 22 Jul 2018 15:30:50 +0000 (21:00 +0530)]
Update for new release.

7 years agoAuto merge of #5722 - alexcrichton:beta-next, r=alexcrichton
bors [Fri, 13 Jul 2018 20:44:11 +0000 (20:44 +0000)]
Auto merge of #5722 - alexcrichton:beta-next, r=alexcrichton

[beta] Partially revert dep changes in #5651

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

7 years agoPartially revert dep changes in #5651
Alex Crichton [Wed, 11 Jul 2018 16:27:08 +0000 (09:27 -0700)]
Partially revert dep changes in #5651

Some logic which was tweaked around the dependencies of build script targets was
tweaked slightly in a way that causes cargo to stack overflow by accientally
adding a dependency loop. This commit implements one of the strategies discussed
in #5711 to fix this situation.

The problem here is that when calculating the deps of a build script we need the
build scripts of *other* packages, but the exact profile is somewhat difficult
to guess at the moment we're generating our build script unit. To solve this the
dependencies towards other build scripts' executions is added in a different
pass after all other units have been assembled. At this point we should know for
sure that all build script executions are in the dependency graph, and we just
need to add a few more edges.

Closes #5708

7 years agoAuto merge of #5687 - ehuss:beta-panic-rustdoc, r=alexcrichton
bors [Thu, 5 Jul 2018 21:59:33 +0000 (21:59 +0000)]
Auto merge of #5687 - ehuss:beta-panic-rustdoc, r=alexcrichton

[BETA] Fix doctests linking too many libs.

Backport of #5651.

7 years ago[BETA] Fix doctests linking too many libs.
bors [Thu, 5 Jul 2018 20:06:19 +0000 (20:06 +0000)]
[BETA] Fix doctests linking too many libs.

Backport of #5651.

7 years agoAuto merge of #5686 - alexcrichton:beta-next, r=alexcrichton
bors [Thu, 5 Jul 2018 21:21:31 +0000 (21:21 +0000)]
Auto merge of #5686 - alexcrichton:beta-next, r=alexcrichton

[beta] Fix `cargo install` using a workspace target dir

Backport of https://github.com/rust-lang/cargo/pull/5685

7 years agoFix `cargo install` using a workspace target dir
Alex Crichton [Thu, 5 Jul 2018 19:05:50 +0000 (12:05 -0700)]
Fix `cargo install` using a workspace target dir

Closes #5662

7 years agoAuto merge of #5671 - Mark-Simulacrum:backport-4be5a4486, r=alexcrichton
bors [Fri, 29 Jun 2018 22:26:44 +0000 (22:26 +0000)]
Auto merge of #5671 - Mark-Simulacrum:backport-4be5a4486, r=alexcrichton

Fix avoiding a rebuild when moving around a workspace

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

There's a case where Cargo will recompile a project even if the fingerprint
looks like it's fresh, when some output files are missing. This was intended to
cover the case where an output file was deleted manually or otherwise messed
with. The check here was a bit too eager, however. It checked not only the
actual output destination of the compiler but *also* the location that we hard
link the output file up to.

Due to recent changes in #5460 we don't always create the hard links for path
dependencies in the top-level dir, and this meant that if the library were
compiled and then tested later on the test may recompile the original library by
accident.

The fix in this commit is to cease looking for the hardlink if it exists or not.
This way we only check for the presence of the output file itself and only
recompile if that file is missing. The reason for this is that we
unconditionally relink files into place whether it's fresh or not, so we'll
always recreate the hard link anyway if it's missing.

cc rust-lang/rust#51717

r? @alexcrichton

7 years agoFix avoiding a rebuild when moving around a workspace
Alex Crichton [Fri, 29 Jun 2018 19:17:41 +0000 (12:17 -0700)]
Fix avoiding a rebuild when moving around a workspace

There's a case where Cargo will recompile a project even if the fingerprint
looks like it's fresh, when some output files are missing. This was intended to
cover the case where an output file was deleted manually or otherwise messed
with. The check here was a bit too eager, however. It checked not only the
actual output destination of the compiler but *also* the location that we hard
link the output file up to.

Due to recent changes in #5460 we don't always create the hard links for path
dependencies in the top-level dir, and this meant that if the library were
compiled and then tested later on the test may recompile the original library by
accident.

The fix in this commit is to cease looking for the hardlink if it exists or not.
This way we only check for the presence of the output file itself and only
recompile if that file is missing. The reason for this is that we
unconditionally relink files into place whether it's fresh or not, so we'll
always recreate the hard link anyway if it's missing.

cc rust-lang/rust#51717

7 years agoUpdate README.source to mention preferred way of upload.
Vasudev Kamath [Sat, 9 Jun 2018 09:11:23 +0000 (14:41 +0530)]
Update README.source to mention preferred way of upload.

7 years agoAuto merge of #5603 - matklad:publish-nightly-features, r=matklad
bors [Thu, 7 Jun 2018 07:02:02 +0000 (07:02 +0000)]
Auto merge of #5603 - matklad:publish-nightly-features, r=matklad

Allow publishing crates with nightly features

closes #5427.

cc @rust-lang/cargo: I remember a vigorous debate over publishing crates with nightly Cargo features, but I can't recollect our exact plan of action. The discussion is logged here: https://paper.dropbox.com/doc/Unstable-Cargo-features-JBYMdsUYcO3FyW8Ubkjoz.

I think we just need to allow to publish crates with unstable cargo features, for the same reason we allow unstable rust features: you need explicit opt-in, even for deps. This is covered by Cargo tests: https://github.com/rust-lang/cargo/blob/9f097787b04b06cdde4fc42b26a531b22c1b37a6/tests/testsuite/cargo_features.rs#L115-L215.

I am not sure if we have ever implemented crates.io side of validation?

7 years agoRelease 0.27.0-2 to Debian unstable.
Ximin Luo [Thu, 7 Jun 2018 05:35:33 +0000 (22:35 -0700)]
Release 0.27.0-2 to Debian unstable.

7 years agoSupport cross-compile install
Ximin Luo [Thu, 7 Jun 2018 05:34:56 +0000 (22:34 -0700)]
Support cross-compile install

7 years agoAdd link to bug on cross-linker auto-detection
Ximin Luo [Thu, 7 Jun 2018 04:42:39 +0000 (21:42 -0700)]
Add link to bug on cross-linker auto-detection

7 years agoAuto merge of #5613 - oli-obk:master, r=matklad
bors [Wed, 6 Jun 2018 17:32:01 +0000 (17:32 +0000)]
Auto merge of #5613 - oli-obk:master, r=matklad

Allow rustc bootstrap to use unstable features even though it's using a beta-cargo

This is the sane alternative to https://github.com/rust-lang/rust/pull/51322#issuecomment-394828839

cc @kennytm

7 years agoOrder can be important if cargo tests are run inside the rustc build system
Oliver Schneider [Wed, 6 Jun 2018 17:22:58 +0000 (19:22 +0200)]
Order can be important if cargo tests are run inside the rustc build system

7 years agoAllow rustc bootstrap to use unstable features even though it's using a beta-cargo
Oliver Schneider [Wed, 6 Jun 2018 12:33:50 +0000 (14:33 +0200)]
Allow rustc bootstrap to use unstable features even though it's using a beta-cargo

7 years agoAuto merge of #5607 - ehuss:config-rustc, r=matklad
bors [Mon, 4 Jun 2018 15:10:04 +0000 (15:10 +0000)]
Auto merge of #5607 - ehuss:config-rustc, r=matklad

Remove some minor, unused code.

I think this was left behind as part of #5359.

7 years agoRemove some minor, unused code.
Eric Huss [Mon, 4 Jun 2018 15:08:37 +0000 (08:08 -0700)]
Remove some minor, unused code.

I think this was left behind as part of #5359.

7 years agoAuto merge of #5604 - debris:issue_5602, r=matklad
bors [Mon, 4 Jun 2018 08:04:20 +0000 (08:04 +0000)]
Auto merge of #5604 - debris:issue_5602, r=matklad

fixed 5602, expose cached build script output in json output

fixes #5602

7 years agoextracted duplicated chunk of code into `fn emit_build_output`, removed redundant...
debris [Mon, 4 Jun 2018 08:03:13 +0000 (10:03 +0200)]
extracted duplicated chunk of code into `fn emit_build_output`, removed redundant line from `compiler_json_error_format` test

7 years agoAuto merge of #5589 - boxdot:issue-5267, r=matklad
bors [Sun, 3 Jun 2018 21:48:44 +0000 (21:48 +0000)]
Auto merge of #5589 - boxdot:issue-5267, r=matklad

Clean error msg when lockfile contains duplicate packages.

Resolves #5267.

(Implemented at RustFest Paris `impl days`.)

7 years agoImprove error message on duplicate packages in lockfile.
boxdot [Sun, 3 Jun 2018 21:40:27 +0000 (23:40 +0200)]
Improve error message on duplicate packages in lockfile.

7 years agoMove duplicate pkgs check to resolve builder.
boxdot [Sun, 3 Jun 2018 20:55:50 +0000 (22:55 +0200)]
Move duplicate pkgs check to resolve builder.

7 years agoUpload to unstable.
Vasudev Kamath [Sun, 3 Jun 2018 15:16:22 +0000 (20:46 +0530)]
Upload to unstable.

7 years agofixed #5602, expose cached build script output in json output
debris [Sun, 3 Jun 2018 15:09:44 +0000 (17:09 +0200)]
fixed #5602, expose cached build script output in json output

7 years agoAllow publishing crates with nightly features
Aleksey Kladov [Sun, 3 Jun 2018 07:10:13 +0000 (10:10 +0300)]
Allow publishing crates with nightly features

7 years agoAuto merge of #5506 - ehuss:config-profile, r=alexcrichton
bors [Sat, 2 Jun 2018 18:24:26 +0000 (18:24 +0000)]
Auto merge of #5506 - ehuss:config-profile, r=alexcrichton

Config Profiles (RFC 2282 Part 2)

Notes:
- `-Z config-profile` CLI option is required to use.
- Config values no longer reject mixed base types (integer, string, boolean) in order to support the mixed types in profiles.

7 years agoPrepare upload for experimental.
Vasudev Kamath [Sat, 2 Jun 2018 09:46:35 +0000 (15:16 +0530)]
Prepare upload for experimental.

7 years agoUpdate copyright with new vendor crate info
Vasudev Kamath [Sat, 2 Jun 2018 09:39:46 +0000 (15:09 +0530)]
Update copyright with new vendor crate info

7 years agoAuto merge of #5599 - gibix:fix/4746, r=alexcrichton
bors [Fri, 1 Jun 2018 15:44:37 +0000 (15:44 +0000)]
Auto merge of #5599 - gibix:fix/4746, r=alexcrichton

fix #4746 and add test

7 years agofix #4746 and add test
gibix [Fri, 1 Jun 2018 10:38:16 +0000 (12:38 +0200)]
fix #4746 and add test

Signed-off-by: gibix <gibix@riseup.net>
7 years agoUse new config API.
Eric Huss [Thu, 31 May 2018 16:54:37 +0000 (09:54 -0700)]
Use new config API.

Also, require "override" feature if used in a config.

7 years agoConfig Profiles (RFC 2282 Part 2)
Eric Huss [Sun, 6 May 2018 22:14:46 +0000 (15:14 -0700)]
Config Profiles (RFC 2282 Part 2)

Notes:
- `-Z config-profile` CLI option is required to use.
- Config values no longer reject mixed base types (integer, string, boolean) in order to support the mixed types in profiles.

7 years agoAuto merge of #5552 - ehuss:config-serde, r=alexcrichton
bors [Wed, 30 May 2018 20:12:02 +0000 (20:12 +0000)]
Auto merge of #5552 - ehuss:config-serde, r=alexcrichton

Typed Config Access

This introduces a new API for accessing config values using serde to
automatically convert to a destination type.  By itself this shouldn't
introduce any behavioral changes (except for some slight wording changes to
error messages).  However, it unlocks the ability to use richer data types in
the future (such as `profile`, or `source`).  Example:

```rust
let p: Option<TomlProfile> = config.get("profile.dev")?;
```

Supports environment variables when fetching structs or maps.  Note that it can
support underscores in env var for struct field names, but not maps.  So for
example, "opt_level" works, but not "serde_json" (example:
`CARGO_PROFILE_DEV_OVERRIDES_serde_OPT_LEVEL`).  I don't have any ideas for a
workaround (though I feel this is an overuse of env vars).

It supports environment variables for lists.  The value in the env var will get
appended to anything in the config.  It uses TOML syntax, and currently only
supports strings.  Example:  `CARGO_FOO=['a', 'b']`.  I did *not* modify
`get_list` to avoid changing behavior, but that can easily be changed.

7 years agoAuto merge of #5590 - esteve:libname-doc, r=matklad
bors [Tue, 29 May 2018 11:19:13 +0000 (11:19 +0000)]
Auto merge of #5590 - esteve:libname-doc, r=matklad

Handle the case where the name of a library is different from the package's

Resolves #5568

7 years agoDisable cargo doc --open tests on Windows and macOS.
Esteve Fernandez [Tue, 29 May 2018 10:34:27 +0000 (12:34 +0200)]
Disable cargo doc --open tests on Windows and macOS.

7 years agoAdded two more tests: one where a package contains a library and a binary and another...
Esteve Fernandez [Tue, 29 May 2018 10:23:50 +0000 (12:23 +0200)]
Added two more tests: one where a package contains a library and a binary and another where it only contains a binary.

7 years agoAuto merge of #5591 - simonasker:correct-command-paths, r=matklad
bors [Tue, 29 May 2018 10:20:08 +0000 (10:20 +0000)]
Auto merge of #5591 - simonasker:correct-command-paths, r=matklad

Correct command directory paths

r? @matklad

7 years agoUse [/] instead of hardcoded / so that it's portable on Windows.
Esteve Fernandez [Tue, 29 May 2018 10:05:12 +0000 (12:05 +0200)]
Use [/] instead of hardcoded / so that it's portable on Windows.

7 years agoDon't pass --open as an argument.
Esteve Fernandez [Tue, 29 May 2018 10:04:38 +0000 (12:04 +0200)]
Don't pass --open as an argument.

7 years agoCorrect command directory paths
Simon Andersson [Tue, 29 May 2018 10:04:59 +0000 (12:04 +0200)]
Correct command directory paths

7 years agoAdded test where the name of the library is different from the package's.
Esteve Fernandez [Tue, 29 May 2018 09:55:29 +0000 (11:55 +0200)]
Added test where the name of the library is different from the package's.

7 years agoAuto merge of #5584 - boxdot:master, r=matklad
bors [Tue, 29 May 2018 09:41:12 +0000 (09:41 +0000)]
Auto merge of #5584 - boxdot:master, r=matklad

Verify that src dir wasn't modified by build.rs when publishing

Fixes issue #5073.

Implemented during RustFest Paris `impl days`.

7 years agoFix test to work on Windows
Gabriel Féron [Tue, 29 May 2018 09:38:27 +0000 (11:38 +0200)]
Fix test to work on Windows

7 years agoAdd more instructions to error message
Gabriel Féron [Tue, 29 May 2018 09:05:34 +0000 (11:05 +0200)]
Add more instructions to error message

7 years agoA package will always contain at least one library or a binary.
Esteve Fernandez [Tue, 29 May 2018 09:03:16 +0000 (11:03 +0200)]
A package will always contain at least one library or a binary.

7 years agoCompare pkg ids based on their encoding.
Dimitri Wegner [Tue, 29 May 2018 08:46:10 +0000 (10:46 +0200)]
Compare pkg ids based on their encoding.

This comparison is needed, since we want to figure out which packages
are duplicate in the lockfile. Package coming from different
registries will be different in the lockfile, but not local packages
with the same name and version but different path.

7 years agoClean error msg when lockfile contains duplicate packages.
boxdot [Mon, 28 May 2018 17:02:42 +0000 (19:02 +0200)]
Clean error msg when lockfile contains duplicate packages.

7 years agoAuto merge of #5587 - matklad:rustdoc-target, r=alexcrichton
bors [Mon, 28 May 2018 16:49:15 +0000 (16:49 +0000)]
Auto merge of #5587 - matklad:rustdoc-target, r=alexcrichton

Support `--target` argument in `cargo rustdoc`

We don't support `--target` in `cargo rustdoc`. Seems like an omission to me? We support it in `cargo rustc`. Discovered in https://github.com/rust-lang/cargo/pull/5543#issuecomment-392525154.

7 years agoSupport `--target` argument in `cargo rustdoc`
Aleksey Kladov [Mon, 28 May 2018 14:27:52 +0000 (17:27 +0300)]
Support `--target` argument in `cargo rustdoc`

7 years agoUse auto split argument in test
Gabriel Féron [Mon, 28 May 2018 12:43:17 +0000 (14:43 +0200)]
Use auto split argument in test

7 years agoProvide more context when src files changed while packaging
Gabriel Féron [Mon, 28 May 2018 12:34:47 +0000 (14:34 +0200)]
Provide more context when src files changed while packaging

Co-authored-by: boxdot <d@zerovolt.org>
7 years agoDocument that build scripts should not modify files outside OUT_DIR.
boxdot [Mon, 28 May 2018 12:11:52 +0000 (14:11 +0200)]
Document that build scripts should not modify files outside OUT_DIR.

Co-authored-by: Gabriel Feron <feron.gabriel@gmail.com>
7 years agoAdd cargo --no-verify test when checking that src dir was not modified while publishing
Gabriel Féron [Mon, 28 May 2018 11:59:35 +0000 (13:59 +0200)]
Add cargo --no-verify test when checking that src dir was not modified while publishing

7 years agoAdd test to check that publish fails when src directory was changed.
Gabriel Féron [Mon, 28 May 2018 10:05:46 +0000 (12:05 +0200)]
Add test to check that publish fails when src directory was changed.

Co-authored-by: boxdot <d@zerovolt.org>
7 years agoVerify that src dir was not modified by build.rs during publish.
boxdot [Mon, 28 May 2018 10:06:03 +0000 (12:06 +0200)]
Verify that src dir was not modified by build.rs during publish.

Co-authored-by: Gabriel Feron <feron.gabriel@gmail.com>
7 years agoAuto merge of #5574 - kornelski:names, r=matklad
bors [Mon, 28 May 2018 09:56:34 +0000 (09:56 +0000)]
Auto merge of #5574 - kornelski:names, r=matklad

A more complete example of authors

Documentation doesn't show how to specify author names or how to specify multiple authors.

7 years agoAuto merge of #5570 - alexcrichton:fix-deadlock, r=matklad
bors [Mon, 28 May 2018 09:34:35 +0000 (09:34 +0000)]
Auto merge of #5570 - alexcrichton:fix-deadlock, r=matklad

Fix an issue of deadlock in Cargo

Currently Cargo can deadlock itself via file locks in somewhat obscure
scenarios. One way to trigger this scenario is by causing the index to fail
being created, for example through an invalid `init.templatedir` configuration.

This commit takes the strategy of solving two bugs:

* First, the deadlock is fixed. This is done by manually ensuring that the
  current deadlock doesn't happen by scheduling cached work to happen outside
  the scope of a lock.
* Second, the initialization of the registry's index is fixed. We turn off the
  usage of external templates as we don't want to use them for this internally
  managed repository anyway.

Closes #5551

7 years agoAuto merge of #5581 - kngwyu:for-racer, r=alexcrichton
bors [Mon, 28 May 2018 02:45:30 +0000 (02:45 +0000)]
Auto merge of #5581 - kngwyu:for-racer, r=alexcrichton

Add missing reexport for #5572

Sorry I forgot to change `mod.rs` in #5572

7 years agoAuto merge of #5580 - ehuss:doc-build-plan, r=alexcrichton
bors [Mon, 28 May 2018 02:11:09 +0000 (02:11 +0000)]
Auto merge of #5580 - ehuss:doc-build-plan, r=alexcrichton

Document unstable --build-plan

7 years agoAdd missing reexport for #5572
Yuji Kanagawa [Mon, 28 May 2018 02:06:25 +0000 (11:06 +0900)]
Add missing reexport for #5572

7 years agoDocument unstable --build-plan
Eric Huss [Sun, 27 May 2018 22:59:29 +0000 (15:59 -0700)]
Document unstable --build-plan

7 years agoAuto merge of #5578 - cardoe:extend-ci, r=alexcrichton
bors [Sun, 27 May 2018 22:52:20 +0000 (22:52 +0000)]
Auto merge of #5578 - cardoe:extend-ci, r=alexcrichton

add GitLab CI to the CI docs

Cargo supports GitLab CI natively for CI badges so include a basic
example of how to use it in the CI section of the documentation.

7 years agoadd GitLab CI to the CI docs
Doug Goldstein [Sun, 27 May 2018 19:28:54 +0000 (14:28 -0500)]
add GitLab CI to the CI docs

Cargo supports GitLab CI natively for CI badges so include a basic
example of how to use it in the CI section of the documentation.

7 years agoAuto merge of #5572 - kngwyu:for-racer, r=alexcrichton
bors [Sun, 27 May 2018 19:55:37 +0000 (19:55 +0000)]
Auto merge of #5572 - kngwyu:for-racer, r=alexcrichton

Make add_overrides and get_resolved_packages pub

For https://github.com/racer-rust/racer/pull/855.
Now  we're planning to use cargo to resolve dependencies, but for RLS we can't write `Cargo.lock`.
So we have to call `resolve_with_previous` directly, and want to use these functions.

7 years agoAuto merge of #5577 - matklad:revert-deps-beta, r=alexcrichton
bors [Sun, 27 May 2018 16:26:02 +0000 (16:26 +0000)]
Auto merge of #5577 - matklad:revert-deps-beta, r=alexcrichton

Revert "Auto merge of #5461 - matklad:meta-rename, r=alexcrichton"

This reverts commit d0d3cb5ac963eb8c3f83d079b6a547992cac2cc4, reversing
changes made to 757112c39f8a5a4f6ffa0b7e29d23a56f03fb931.

It is not clear that the design is right, see
https://github.com/rust-lang/cargo/pull/5558#issuecomment-391791164

this is the backport sibling of https://github.com/rust-lang/cargo/pull/5576