]> git.proxmox.com Git - cargo.git/log
cargo.git
7 years agoRelease 0.17.0-1~exp1 to Debian experimental.
Ximin Luo [Thu, 20 Apr 2017 01:16:16 +0000 (03:16 +0200)]
Release 0.17.0-1~exp1 to Debian experimental.

7 years agoRename stage0 profile according to policy
Ximin Luo [Thu, 20 Apr 2017 00:59:43 +0000 (02:59 +0200)]
Rename stage0 profile according to policy

7 years agoRefactor build targets, and add more documentation for our lack of tests
Ximin Luo [Thu, 20 Apr 2017 00:57:41 +0000 (02:57 +0200)]
Refactor build targets, and add more documentation for our lack of tests

7 years agoClose some bug reports, prepare for experimental, add d/TODO
Ximin Luo [Thu, 20 Apr 2017 00:49:00 +0000 (02:49 +0200)]
Close some bug reports, prepare for experimental, add d/TODO

7 years agoUpdate some build-deps, add myself to uploaders
Ximin Luo [Thu, 20 Apr 2017 00:45:03 +0000 (02:45 +0200)]
Update some build-deps, add myself to uploaders

7 years agoFix the build
Ximin Luo [Thu, 20 Apr 2017 00:37:27 +0000 (02:37 +0200)]
Fix the build

7 years agoAdd a TODO on the current build failure
Ximin Luo [Wed, 19 Apr 2017 23:05:45 +0000 (01:05 +0200)]
Add a TODO on the current build failure

7 years agoUpdate deps-adjust.patch
Ximin Luo [Wed, 19 Apr 2017 22:35:54 +0000 (00:35 +0200)]
Update deps-adjust.patch

7 years agoUpdate d/changelog, add instructions on how to clean up a bad import
Ximin Luo [Wed, 19 Apr 2017 22:32:39 +0000 (00:32 +0200)]
Update d/changelog, add instructions on how to clean up a bad import

7 years agoMerge tag 'upstream/0.17.0' into debian/sid
Ximin Luo [Thu, 20 Apr 2017 00:39:17 +0000 (02:39 +0200)]
Merge tag 'upstream/0.17.0' into debian/sid

Upstream version 0.17.0

# gpg: Signature made Thu 20 Apr 2017 02:39:17 CEST
# gpg:                using RSA key 3667486A326DB2766D255546860DEF3B8F650B79
# gpg: Good signature from "Ximin Luo <infinity0@pwned.gg>" [ultimate]
# gpg:                 aka "Ximin Luo <infinity0@torproject.org>" [ultimate]
# gpg:                 aka "Ximin Luo <infinity0@freenetproject.org>" [ultimate]
# gpg:                 aka "Ximin Luo <infinity0@debian.org>" [ultimate]
# gpg:                 aka "Satoshi Nakamoto (www.bitcoin.org) <satoshin@gmx.com>" [ultimate]

7 years agoNew upstream version 0.17.0
Ximin Luo [Thu, 20 Apr 2017 00:39:09 +0000 (02:39 +0200)]
New upstream version 0.17.0

7 years agoUpdate filter lists and add a suspcious-source scanner
Ximin Luo [Wed, 19 Apr 2017 22:19:35 +0000 (00:19 +0200)]
Update filter lists and add a suspcious-source scanner

7 years agoUpdate clean-cargo-deps for 0.17
Ximin Luo [Wed, 19 Apr 2017 21:10:57 +0000 (23:10 +0200)]
Update clean-cargo-deps for 0.17

7 years agoAdd new flag for cargo-vendor's new behaviour
Ximin Luo [Tue, 11 Apr 2017 18:09:23 +0000 (20:09 +0200)]
Add new flag for cargo-vendor's new behaviour

7 years agoRemove the deps directory, we're now storing that in 'upstream' instead
Ximin Luo [Tue, 11 Apr 2017 18:06:04 +0000 (20:06 +0200)]
Remove the deps directory, we're now storing that in 'upstream' instead

`gbp import-orig` now supports component tarballs, and this workflow prefers
to store them in the upstream branch. Now, we need to get rid of deps/ in this
branch so that they aren't mistaken for debian-specific changes.

7 years agoSome more documentation
Ximin Luo [Tue, 11 Apr 2017 18:05:01 +0000 (20:05 +0200)]
Some more documentation

7 years agoUpdate Debian config and scripts for cargo 0.16
Ximin Luo [Tue, 11 Apr 2017 17:58:50 +0000 (19:58 +0200)]
Update Debian config and scripts for cargo 0.16

7 years agoAuto merge of #3781 - alexcrichton:beta-backport, r=alexcrichton
bors [Fri, 3 Mar 2017 19:21:26 +0000 (19:21 +0000)]
Auto merge of #3781 - alexcrichton:beta-backport, r=alexcrichton

[backport] Fix deps with `cargo test --all` and doctests

This commit fixes `cargo test --all` with the way we ship libraries to `rustdoc
--test`. I'm... not entirely sure what the previous incarnation was doing but
the current organization is to interpret `compilation.libraries` as a mapping
from a package to the list of crates it needs to link to test.

This updates the support in `cargo_rustc/mod.rs` to create the map appropriately
and tweaks the loop in `cargo_test.rs` as well.

Closes rust-lang/rust#39879

7 years agomake build tests not depend on minutiæ of rustc output
Zack M. Davis [Wed, 1 Feb 2017 04:51:24 +0000 (20:51 -0800)]
make build tests not depend on minutiæ of rustc output

This little patch arises from the maelstrom of my purity born of pain.

It's the pain of seeing rust-lang/rust#38103 in its perfect
crystalline beauty waste away on page four of
https://github.com/rust-lang/rust/pulls, waiting, ready, itching to
land, dying with anticipation to bring the light of clearer lint group
error messages to Rust users of all creeds and nations, only for its
promise to be cruelly blocked by the fateful, hateful hand of circular
dependency. For it is written in src/tools/cargotest/main.rs that the
Cargo tests must pass before the PR can receive Appveyor's blessing,
but the Cargo tests could not pass (because they depend on fine
details of the output that the PR is meant to change), and the Cargo
tests could not be changed (because updating the test expectation to
match the proposed new compiler output, would fail with the current
compiler).

The Gordian knot is cut in the bowels of cargotest's very notion of
comparison (of JSON objects) itself, by means of introducing a magic
string literal `"{...}"`, which can server as a wildcard for any JSON
sub-object.

And so it will be for the children, and the children's children, and
unto the 1.17.0 and 1.18.0 releases, that Cargo's build test
expectations will faithfully expect the exact JSON output by Cargo
itself, but the string literal `"{...}"` shall be a token upon the
JSON output by rustc, and when I see `"{...}"`, I will pass over you,
and the failure shall not be upon you.

And this day shall be unto you for a memorial.

7 years agoUpdate libz-sys to fix build errors on Windows
Alex Crichton [Fri, 3 Mar 2017 18:43:25 +0000 (10:43 -0800)]
Update libz-sys to fix build errors on Windows

7 years agoRemove travis/appveyor caches
Alex Crichton [Fri, 3 Mar 2017 17:50:10 +0000 (09:50 -0800)]
Remove travis/appveyor caches

7 years agoFix deps with `cargo test --all` and doctests
Alex Crichton [Thu, 16 Feb 2017 16:04:09 +0000 (08:04 -0800)]
Fix deps with `cargo test --all` and doctests

This commit fixes `cargo test --all` with the way we ship libraries to `rustdoc
--test`. I'm... not entirely sure what the previous incarnation was doing but
the current organization is to interpret `compilation.libraries` as a mapping
from a package to the list of crates it needs to link to test.

This updates the support in `cargo_rustc/mod.rs` to create the map appropriately
and tweaks the loop in `cargo_test.rs` as well.

Closes rust-lang/rust#39879

7 years agoAuto merge of #3657 - Keruspe:rust-1.16.0, r=alexcrichton
bors [Mon, 6 Feb 2017 20:31:45 +0000 (20:31 +0000)]
Auto merge of #3657 - Keruspe:rust-1.16.0, r=alexcrichton

ensure libressl compatibility

like #3644 but for the rust-1.16.0 branch

7 years agoensure libressl compatibility
Marc-Antoine Perennou [Mon, 6 Feb 2017 20:06:09 +0000 (21:06 +0100)]
ensure libressl compatibility

Update libgit2-sys, openssl-sys and openssl
as the versions currently in Cargo.lock are
not compatible with libressl.
Also update tests accordingly

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
7 years agoAuto merge of #3649 - cuviper:powerpc64-gcc4-1.16.0, r=alexcrichton
bors [Mon, 6 Feb 2017 04:05:20 +0000 (04:05 +0000)]
Auto merge of #3649 - cuviper:powerpc64-gcc4-1.16.0, r=alexcrichton

[rust-1.16.0] Update OPENSSL_CC_powerpc64-unknown-linux-gnu

With the new `rust-slave-linux-cross:2017-02-02`, powerpc64 no longer
uses gcc-5.  I updated the `Dockerfile` at the time to reflect this, but
missed `OPENSSL_CC_powerpc64-unknown-linux-gnu` in `Makefile.in`.

7 years agoAuto merge of #3652 - alexcrichton:beta-next, r=alexcrichton
bors [Mon, 6 Feb 2017 01:49:47 +0000 (01:49 +0000)]
Auto merge of #3652 - alexcrichton:beta-next, r=alexcrichton

Fix beta branch CI

Cherry pick a few commits from master

7 years agoReplace remaining _0 doc tests
Guillaume Gomez [Thu, 2 Feb 2017 23:08:22 +0000 (00:08 +0100)]
Replace remaining _0 doc tests

7 years agoIgnore more output
Guillaume Gomez [Mon, 30 Jan 2017 21:36:52 +0000 (22:36 +0100)]
Ignore more output

7 years agoUpdate to new rustdoc --test output
Guillaume Gomez [Mon, 30 Jan 2017 21:33:43 +0000 (22:33 +0100)]
Update to new rustdoc --test output

7 years agoUpdate OPENSSL_CC_powerpc64-unknown-linux-gnu
Josh Stone [Sat, 4 Feb 2017 01:59:30 +0000 (17:59 -0800)]
Update OPENSSL_CC_powerpc64-unknown-linux-gnu

With the new `rust-slave-linux-cross:2017-02-02`, powerpc64 no longer
uses gcc-5.  I updated the `Dockerfile` at the time to reflect this, but
missed `OPENSSL_CC_powerpc64-unknown-linux-gnu` in `Makefile.in`.

7 years agoAuto merge of #3638 - cuviper:custom-powerpc-s390x-1.16.0, r=alexcrichton
bors [Fri, 3 Feb 2017 09:24:50 +0000 (09:24 +0000)]
Auto merge of #3638 - cuviper:custom-powerpc-s390x-1.16.0, r=alexcrichton

[rust-1.16.0] Update docker/cross for new IBM toolchains

This will start using the toolchains with older glibc ABI for powerpc,
powerpc64, powerpc64le, and s390x, per rust-lang/rust-buildbot#149.

7 years agoUpdate docker/cross for new IBM toolchains
Josh Stone [Thu, 2 Feb 2017 21:23:44 +0000 (13:23 -0800)]
Update docker/cross for new IBM toolchains

This will start using the toolchains with older glibc ABI for powerpc,
powerpc64, powerpc64le, and s390x, per rust-lang/rust-buildbot#149.

7 years agoAuto merge of #3630 - alexcrichton:empty-version, r=alexcrichton
bors [Wed, 1 Feb 2017 21:03:21 +0000 (21:03 +0000)]
Auto merge of #3630 - alexcrichton:empty-version, r=alexcrichton

Fix empty 'version' file

This teaches the makefiles to construct the version string again so
it can be emitted to the 'version' file for packaging.

Fixes failing nightly builds.

7 years agoFix empty 'version' file
Brian Anderson [Tue, 31 Jan 2017 21:42:24 +0000 (21:42 +0000)]
Fix empty 'version' file

This teaches the makefiles to construct the version string again so
it can be emitted to the 'version' file for packaging.

Fixes failing nightly builds.

7 years agoAuto merge of #3614 - matklad:simpler-cli-2, r=alexcrichton
bors [Tue, 31 Jan 2017 04:48:02 +0000 (04:48 +0000)]
Auto merge of #3614 - matklad:simpler-cli-2, r=alexcrichton

Remove generic infrastrucure for printing json

Only a couple of command really use this features, so it's clearer just to print json right on the spot rather then return it though the call stack.

`CliResult` is now just a `Result<(), CliError>`.

7 years agoAuto merge of #3618 - sbeckeriv:3473-new-subcommand-doc-update, r=alexcrichton
bors [Tue, 31 Jan 2017 03:20:49 +0000 (03:20 +0000)]
Auto merge of #3618 - sbeckeriv:3473-new-subcommand-doc-update, r=alexcrichton

Update new command help doc

Resolves #3473

Dearest reviewer,

I hope that all is well in rustland. I was reviewing some open issues
and saw this update to the help text for the new command. I have added
the suggested help text from issue #3473. I formated to the message to
match the publish bin's job flag.

Thank you for your time,
Becker

7 years agoAuto merge of #3606 - Susurrus:no_git_deps2, r=alexcrichton
bors [Tue, 31 Jan 2017 01:54:05 +0000 (01:54 +0000)]
Auto merge of #3606 - Susurrus:no_git_deps2, r=alexcrichton

Clarify error for repo-based dependencies when publishing.

Elaborate on the exact error cause and directions on how to resolve it.

7 years agoUpdate new command help doc
Stephen Becker IV [Tue, 31 Jan 2017 00:49:23 +0000 (16:49 -0800)]
Update new command help doc

Resolves #3473

Dearest reviewer,

I hope that all is well in rustland. I was reviewing some open issues
and saw this update to the help text for the new command. I have added
the suggested help text from issue #3473. I formated to the message to
match the publish bin's job flag.

Thank you for your time,
Becker

7 years agoRemove generic infrastrucure for printing json
Aleksey Kladov [Mon, 30 Jan 2017 19:53:05 +0000 (22:53 +0300)]
Remove generic infrastrucure for printing json

 Only a couple of command really use this features, so it's clearer just to print json right on the spot rather then return it though the call stack.

7 years agoClarify error for repo-based dependencies when publishing.
Bryant Mairs [Fri, 27 Jan 2017 17:54:43 +0000 (09:54 -0800)]
Clarify error for repo-based dependencies when publishing.

Specifically add a description of how to resolve the error.

7 years agoAuto merge of #3608 - matklad:simple-cli, r=alexcrichton
bors [Mon, 30 Jan 2017 17:36:44 +0000 (17:36 +0000)]
Auto merge of #3608 - matklad:simple-cli, r=alexcrichton

Simplify cli-handling functions

This simplifies somewhat roundabout `main` in `bin/cargo.rs`.

7 years agoSimplify cli-handling functions
Aleksey Kladov [Sat, 28 Jan 2017 13:55:18 +0000 (16:55 +0300)]
Simplify cli-handling functions

7 years agoAuto merge of #3604 - froydnj:rich-version-info, r=alexcrichton
bors [Sun, 29 Jan 2017 02:06:47 +0000 (02:06 +0000)]
Auto merge of #3604 - froydnj:rich-version-info, r=alexcrichton

implement `cargo --version --verbose`

As suggested in #3584.  This is a bit underwhelming, and I'm unsure if some of the complexity in froydnj/cargo@775c900 is really warranted, but this series gets the job done.  Sample output when building with `configure` and `make`:

```
froydnj@hawkeye:~/src/cargo.git$ target/x86_64-unknown-linux-gnu/release/cargo --version
cargo-0.17.0-dev (ae4a4d8 2017-01-27)
froydnj@hawkeye:~/src/cargo.git$ target/x86_64-unknown-linux-gnu/release/cargo --version --verbose
cargo-0.17.0-dev (ae4a4d8 2017-01-27)
release: 0.17.0
commit-hash: ae4a4d8fc55bf7eca3d974f953dc61729e4a40db
commit-date: 2017-01-27
```

7 years agoAuto merge of #3593 - Susurrus:master, r=alexcrichton
bors [Sat, 28 Jan 2017 00:35:00 +0000 (00:35 +0000)]
Auto merge of #3593 - Susurrus:master, r=alexcrichton

Improve error for dependencies that don't have the same source paths

I've added an additional test case which is how my project compiled. Part of the issue was that I didn't know that each dependency needs to use the same path for all build targets. The previous error message was unclear both in what was going on and how to resolve it. The new error message should be more clear.

This is tied to #3592.

7 years agoAuto merge of #3557 - raphlinus:master, r=alexcrichton
bors [Fri, 27 Jan 2017 22:55:06 +0000 (22:55 +0000)]
Auto merge of #3557 - raphlinus:master, r=alexcrichton

Add dep-info generation

Work in progress: add a --dep-info flag to cargo build (and also
rustc) that outputs dependency information in a form compatible with
make and ninja, to a specified file. This will help in integrating
into other build systems.

7 years agoAuto merge of #3590 - dgellow:fix-3536, r=alexcrichton
bors [Fri, 27 Jan 2017 21:35:09 +0000 (21:35 +0000)]
Auto merge of #3590 - dgellow:fix-3536, r=alexcrichton

When an error occured in a JobQueue print it directly

Fix #3536

7 years agodirectly print error only if there is more than one job in the queue
dgellow [Fri, 27 Jan 2017 20:44:48 +0000 (21:44 +0100)]
directly print error only if there is more than one job in the queue

7 years agoAdd simple tests, cleanup
Raph Levien [Fri, 27 Jan 2017 00:01:36 +0000 (16:01 -0800)]
Add simple tests, cleanup

Tests for existence for dep-info output in simple compilation cases.

Deletes the dep-info file if it fails (for example, if it can't find
one of the dep-info inputs).

7 years agomake `cargo --version --verbose` print extra information
Nathan Froyd [Fri, 27 Jan 2017 17:24:56 +0000 (12:24 -0500)]
make `cargo --version --verbose` print extra information

Fixes #3584.

7 years agoremove CFG_RELEASE from the Makefile
Nathan Froyd [Fri, 27 Jan 2017 17:04:06 +0000 (12:04 -0500)]
remove CFG_RELEASE from the Makefile

The previous commit made this unused; much of the logic for assigning to
this variable now lives in Cargo itself.

7 years agoexport rich version information from cargo::version
Nathan Froyd [Fri, 27 Jan 2017 16:39:17 +0000 (11:39 -0500)]
export rich version information from cargo::version

To support `cargo --version --verbose`, ala rustc, we need more
information to be injected into cargo when it's built from the Makefile,
and a more explicit data structure to be returned from cargo::version.
We implement fmt::Display for our newly-created structure so clients
don't have to bother with the details of interpreting the structure if
all they want is a string.

7 years agoAuto merge of #3603 - ehuss:patch-1, r=alexcrichton
bors [Fri, 27 Jan 2017 17:05:05 +0000 (17:05 +0000)]
Auto merge of #3603 - ehuss:patch-1, r=alexcrichton

Fix broken code block

It seems like the Markdown parser requires a blank line before a code block (otherwise it treats it like an inline span).

7 years agoFix broken code block
ehuss [Fri, 27 Jan 2017 16:59:48 +0000 (08:59 -0800)]
Fix broken code block

It seems like the Markdown parser requires a blank line before a code block (otherwise it treats it like an inline span).

7 years agoAuto merge of #3600 - onur:fix-link, r=alexcrichton
bors [Fri, 27 Jan 2017 05:50:12 +0000 (05:50 +0000)]
Auto merge of #3600 - onur:fix-link, r=alexcrichton

Fix crates.io link under specifying dependencies

I just realized when I was replying to #2947, second crates.io link under "Specifying path dependencies" is not working.

And TBH the phrase in parentheses is unclear for me.

cc @carols10cents

7 years agoAuto merge of #3598 - pornel:proxyconf, r=alexcrichton
bors [Fri, 27 Jan 2017 03:56:09 +0000 (03:56 +0000)]
Auto merge of #3598 - pornel:proxyconf, r=alexcrichton

Example proxy config

#3596

7 years agoAuto merge of #3601 - alexcrichton:bump-openssl, r=brson
bors [Fri, 27 Jan 2017 01:42:39 +0000 (01:42 +0000)]
Auto merge of #3601 - alexcrichton:bump-openssl, r=brson

Update OpenSSL to 1.0.2k

Updates in accordance with the security advisory issued today.

7 years agoUpdate OpenSSL to 1.0.2k
Alex Crichton [Fri, 27 Jan 2017 00:07:14 +0000 (16:07 -0800)]
Update OpenSSL to 1.0.2k

Updates in accordance with the security advisory issued today.

7 years agoFix crates.io link under specifying dependencies
Onur Aslan [Thu, 26 Jan 2017 23:35:50 +0000 (01:35 +0200)]
Fix crates.io link under specifying dependencies

7 years agoExample proxy config
Kornel Lesiński [Thu, 26 Jan 2017 23:28:56 +0000 (23:28 +0000)]
Example proxy config

#3596

7 years agoAuto merge of #3597 - Susurrus:badge_docs, r=alexcrichton
bors [Thu, 26 Jan 2017 22:27:33 +0000 (22:27 +0000)]
Auto merge of #3597 - Susurrus:badge_docs, r=alexcrichton

Add gitlab to the supported services for AppVeyor badges.

This is undocumented but supported behavior for AppVeyor. I have already done this with a crate I own and the badge works on both the AppVeyor and crates.io end.

7 years agoAdd gitlab to the supported services for AppVeyor badges.
Bryant Mairs [Thu, 26 Jan 2017 22:12:58 +0000 (14:12 -0800)]
Add gitlab to the supported services for AppVeyor badges.

This is undocumented but supported behavior for AppVeyor.

7 years agoAdd build script rerun-if-changed dependencies
Raph Levien [Thu, 26 Jan 2017 21:43:13 +0000 (13:43 -0800)]
Add build script rerun-if-changed dependencies

Also pick up the rerun-if-changed dependencies from build scripts.

7 years agoBuffer file writing for dep-info
Raph Levien [Thu, 26 Jan 2017 21:12:14 +0000 (13:12 -0800)]
Buffer file writing for dep-info

Use BufWriter when generating .d files with dep-info, to avoid
excessive numbers of write syscalls.

7 years agoMore improvements
Raph Levien [Thu, 26 Jan 2017 17:09:07 +0000 (09:09 -0800)]
More improvements

Use Context::target_filenames rather than trying to redo that.

Traverse path dependencies recursively, so we get transitive deps.

Use existing fingerprint parsing.

7 years agoImprove error for dependencies that don't have the same source path for all build...
Bryant Mairs [Thu, 26 Jan 2017 01:18:19 +0000 (17:18 -0800)]
Improve error for dependencies that don't have the same source path for all build targets.

7 years agoAuto merge of #3588 - birkenfeld:issue3587, r=alexcrichton
bors [Wed, 25 Jan 2017 23:05:13 +0000 (23:05 +0000)]
Auto merge of #3588 - birkenfeld:issue3587, r=alexcrichton

Show new version of package on overwrite error

Fixes #3587

7 years agoremove newline after stacktrace
dgellow [Wed, 25 Jan 2017 21:59:32 +0000 (22:59 +0100)]
remove newline after stacktrace

7 years agoShow version of package to be installed (before potential overwrite errors)
Georg Brandl [Tue, 24 Jan 2017 06:49:50 +0000 (07:49 +0100)]
Show version of package to be installed (before potential overwrite errors)

Fixes #3587

7 years agoUse handle_error instead of shell.error to print stack trace if in verbose
dgellow [Wed, 25 Jan 2017 19:06:08 +0000 (20:06 +0100)]
Use handle_error instead of shell.error to print stack trace if in verbose

7 years agoAuto merge of #3582 - KalitaAlexey:add-info-about-examples-as-libraries, r=alexcrichton
bors [Wed, 25 Jan 2017 19:04:30 +0000 (19:04 +0000)]
Auto merge of #3582 - KalitaAlexey:add-info-about-examples-as-libraries, r=alexcrichton

Added information about examples as libraries to the documentation

[Allow examples to be library](https://github.com/rust-lang/cargo/pull/3556) has been committed.
The PR adds information to the documentation.

7 years agoWhen an error occured in a JobQueue print it directly
dgellow [Wed, 25 Jan 2017 17:25:41 +0000 (18:25 +0100)]
When an error occured in a JobQueue print it directly

7 years agoFixed error
Kalita Alexey [Wed, 25 Jan 2017 06:52:59 +0000 (09:52 +0300)]
Fixed error

7 years agoTrack TargetKind::Example split
Raph Levien [Wed, 25 Jan 2017 01:49:39 +0000 (17:49 -0800)]
Track TargetKind::Example split

7 years agoAdd dep-info generation
Raph Levien [Tue, 17 Jan 2017 21:22:05 +0000 (13:22 -0800)]
Add dep-info generation

Make cargo output a ".d" file containing dependency info (in a format
that make and ninja can consume) for each artifact it produces. This
will help in integrating into other build systems.

7 years agoAuto merge of #3589 - mathstuf:repository-docs-clarify, r=alexcrichton
bors [Tue, 24 Jan 2017 18:20:29 +0000 (18:20 +0000)]
Auto merge of #3589 - mathstuf:repository-docs-clarify, r=alexcrichton

doc/manifest: clarify the meaning of the URLs

7 years agoFixed comments
Kalita Alexey [Tue, 24 Jan 2017 16:40:20 +0000 (19:40 +0300)]
Fixed comments
[ci skip]

7 years agodoc/manifest: clarify the meaning of the URLs
Ben Boeckel [Tue, 24 Jan 2017 16:23:02 +0000 (11:23 -0500)]
doc/manifest: clarify the meaning of the URLs

7 years agoAdded information about examples as libraries to the documentation
Kalita Alexey [Mon, 23 Jan 2017 08:45:11 +0000 (11:45 +0300)]
Added information about examples as libraries to the documentation

7 years agoAuto merge of #3570 - integer32llc:fix-slug-link, r=alexcrichton
bors [Sat, 21 Jan 2017 00:59:01 +0000 (00:59 +0000)]
Auto merge of #3570 - integer32llc:fix-slug-link, r=alexcrichton

Link to the category slugs page from the docs instead

Oops, just noticed that I didn't change this link in the docs when we changed to specifying slugs for categories in `Cargo.toml` :-/

7 years agoAuto merge of #3569 - malept:manifest-example-typo-fix, r=alexcrichton
bors [Fri, 20 Jan 2017 23:02:02 +0000 (23:02 +0000)]
Auto merge of #3569 - malept:manifest-example-typo-fix, r=alexcrichton

Fix typo in badges section of example manifest

Extremely small typo I saw when I was looking at the new badges feature.

7 years agoLink to the category slugs page from the docs instead
Carol (Nichols || Goulding) [Fri, 20 Jan 2017 21:19:30 +0000 (16:19 -0500)]
Link to the category slugs page from the docs instead

7 years agoAuto merge of #3556 - KalitaAlexey:allow-examples-to-be-library, r=alexcrichton
bors [Fri, 20 Jan 2017 20:57:21 +0000 (20:57 +0000)]
Auto merge of #3556 - KalitaAlexey:allow-examples-to-be-library, r=alexcrichton

Allow examples to be library

This PR allows to specify **crate-type** to an example in **Cargo.toml**.
After this PR an example's **crate-type** can be:

* lib
* rlib
* dylib
* proc-macro

Please look at src/cargo/core/manifest.rs:116 because I am not sure whether I done it right.

I haven't added any tests.
I'd like to add them if someone says me how to do that.

Fixes #2358.

7 years agoFix typo in badges section of example manifest
Mark Lee [Fri, 20 Jan 2017 19:09:11 +0000 (11:09 -0800)]
Fix typo in badges section of example manifest

7 years agoAuto merge of #3554 - bmwiedemann:patch-1, r=alexcrichton
bors [Fri, 20 Jan 2017 18:48:12 +0000 (18:48 +0000)]
Auto merge of #3554 - bmwiedemann:patch-1, r=alexcrichton

make build reproducible

see https://reproducible-builds.org/ for why this is good
and https://wiki.debian.org/ReproducibleBuilds/TimestampsProposal#Bash_.2F_POSIX_shell for variants that also work on BSD

7 years agoMerge branch 'master' into allow-examples-to-be-library
Alexey [Fri, 20 Jan 2017 17:27:25 +0000 (21:27 +0400)]
Merge branch 'master' into allow-examples-to-be-library

7 years agoAuto merge of #3568 - alexcrichton:fix-small, r=alexcrichton
bors [Fri, 20 Jan 2017 16:51:03 +0000 (16:51 +0000)]
Auto merge of #3568 - alexcrichton:fix-small, r=alexcrichton

Update travis token and fix warning

7 years agoUpdate travis token and fix warning
Alex Crichton [Fri, 20 Jan 2017 16:49:30 +0000 (08:49 -0800)]
Update travis token and fix warning

7 years agomake build reproducible
Bernhard M. Wiedemann [Tue, 17 Jan 2017 14:53:45 +0000 (14:53 +0000)]
make build reproducible

by allowing build systems to use a constant date instead of the current one
see https://reproducible-builds.org/ for why this is good

This call is designed to work with both GNU date and BSD date implementations

7 years agoFixed the test
Kalita Alexey [Fri, 20 Jan 2017 06:50:13 +0000 (09:50 +0300)]
Fixed the test

7 years agoFixed tests and removed the unnecessary comment
Kalita Alexey [Fri, 20 Jan 2017 05:12:12 +0000 (08:12 +0300)]
Fixed tests and removed the unnecessary comment

7 years agoAuto merge of #3565 - integer32llc:fix-gh-pages, r=alexcrichton
bors [Thu, 19 Jan 2017 23:43:24 +0000 (23:43 +0000)]
Auto merge of #3565 - integer32llc:fix-gh-pages, r=alexcrichton

Fix doc publishing: Remove $USER from the --user argument from pip install

[This looks to be the cause of why docs aren't publishing to gh-pages](https://travis-ci.org/rust-lang/cargo/jobs/193507734#L1059). I was able to publish the docs to [my repo's gh-pages](https://integer32llc.github.io/cargo/) with this change (and setting my own secure gh-token).

It looks like this problem got introduced [in this commit](https://github.com/rust-lang/cargo/commit/dc15ca5d202d6d10f6be45f388759a902723de6c). I don't really know python/pip, but `$USER` wasn't there before and [Travis' docs just say `--user`](https://docs.travis-ci.com/user/languages/python/#pip).

7 years agoRemove $USER from the --user argument from pip install
Carol (Nichols || Goulding) [Thu, 19 Jan 2017 21:11:41 +0000 (16:11 -0500)]
Remove $USER from the --user argument from pip install

7 years agoFixed tests
Kalita Alexey [Thu, 19 Jan 2017 20:43:56 +0000 (23:43 +0300)]
Fixed tests

7 years agoAuto merge of #3563 - alexcrichton:upload-docs-again, r=alexcrichton
bors [Thu, 19 Jan 2017 19:03:13 +0000 (19:03 +0000)]
Auto merge of #3563 - alexcrichton:upload-docs-again, r=alexcrichton

Run full Travis builds on all non-PR branches

This'll result in duplicate work when merging, but otherwise we're not uploading
docs.

7 years agoRun full Travis builds on all non-PR branches
Alex Crichton [Thu, 19 Jan 2017 17:02:19 +0000 (09:02 -0800)]
Run full Travis builds on all non-PR branches

This'll result in duplicate work when merging, but otherwise we're not uploading
docs.

7 years agoAuto merge of #3560 - KalitaAlexey:make-doc-subcommand-print-duration, r=alexcrichton
bors [Wed, 18 Jan 2017 23:01:03 +0000 (23:01 +0000)]
Auto merge of #3560 - KalitaAlexey:make-doc-subcommand-print-duration, r=alexcrichton

Made doc subcommand print duration

This PR makes `cargo doc` print duration.
Fixes #3016.

7 years agoMade doc subcommand print duration
Kalita Alexey [Wed, 18 Jan 2017 19:37:52 +0000 (22:37 +0300)]
Made doc subcommand print duration

7 years agoAuto merge of #3558 - matklad:fix-test, r=alexcrichton
bors [Wed, 18 Jan 2017 18:12:21 +0000 (18:12 +0000)]
Auto merge of #3558 - matklad:fix-test, r=alexcrichton

Fix a test.

That's the test we've discussed in #3443

7 years agoAdded tests for building an example as a library
Kalita Alexey [Wed, 18 Jan 2017 07:56:22 +0000 (10:56 +0300)]
Added tests for building an example as a library

7 years agoFixed style issues
Kalita Alexey [Wed, 18 Jan 2017 07:56:11 +0000 (10:56 +0300)]
Fixed style issues