bors [Mon, 17 Dec 2018 18:13:06 +0000 (18:13 +0000)]
Auto merge of #6405 - ehuss:new-man, r=alexcrichton
New man pages.
This is a rewrite and update of the man pages. This also adds them to the website documentation. They are now in Asciidoc format to make it easy to output multiple formats and have decent formatting. There is a Makefile with instructions on how to rebuild the man pages.
bors [Mon, 17 Dec 2018 17:13:53 +0000 (17:13 +0000)]
Auto merge of #6451 - dwijnand:reify-DepFingerprint, r=alexcrichton
Reify the DepFingerprint type
I'm very slightly concerned I might've incompatibly changed the serialise/deserialise code with respect to existing serialised data, so please double-check my work.
bors [Mon, 17 Dec 2018 15:42:58 +0000 (15:42 +0000)]
Auto merge of #6448 - dwijnand:upgrade-the-metabuild-to-rust-2018, r=ehuss
Upgrade the metabuild to Rust 2018
Just happened across the code that @ehuss mentioned in https://github.com/rust-lang/cargo/pull/6423#issuecomment-446807216 and thought of reviving that effort.
@ehuss says there's no reason to. Let's see if it passes CI and we should land this change or not.
bors [Mon, 17 Dec 2018 03:28:16 +0000 (03:28 +0000)]
Auto merge of #6447 - ehuss:doc-name-authors, r=alexcrichton
Document `name` and `authors` in [package]
I don't think we need to take a principled stand on the exact meaning of
"authors", so I left it somewhat vague. Also, it was made optional in #3682 so
the existing docs were a little wrong.
bors [Fri, 14 Dec 2018 16:56:14 +0000 (16:56 +0000)]
Auto merge of #6439 - rust-lang:dependabot/cargo/git2-curl-0.9.0, r=alexcrichton
Update git2-curl requirement from 0.8.1 to 0.9.0
Updates the requirements on [git2-curl](https://github.com/alexcrichton/git2-rs) to permit the latest version.
<details>
<summary>Commits</summary>
- See full diff in [compare view](https://github.com/alexcrichton/git2-rs/commits)
</details>
<br />
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme
Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)
Finally, you can contact us by mentioning @dependabot.
dependabot[bot] [Fri, 14 Dec 2018 16:30:00 +0000 (16:30 +0000)]
Update git2-curl requirement from 0.8.1 to 0.9.0
Updates the requirements on [git2-curl](https://github.com/alexcrichton/git2-rs) to permit the latest version.
- [Release notes](https://github.com/alexcrichton/git2-rs/releases)
- [Commits](https://github.com/alexcrichton/git2-rs/commits)
bors [Fri, 14 Dec 2018 15:50:31 +0000 (15:50 +0000)]
Auto merge of #6438 - rust-lang:dependabot/cargo/git2-0.8.0, r=alexcrichton
Update git2 requirement from 0.7.5 to 0.8.0
Updates the requirements on [git2](https://github.com/alexcrichton/git2-rs) to permit the latest version.
<details>
<summary>Commits</summary>
- See full diff in [compare view](https://github.com/alexcrichton/git2-rs/commits/git2-curl-0.8.0)
</details>
<br />
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme
Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)
Finally, you can contact us by mentioning @dependabot.
dependabot[bot] [Fri, 14 Dec 2018 05:51:03 +0000 (05:51 +0000)]
Update git2 requirement from 0.7.5 to 0.8.0
Updates the requirements on [git2](https://github.com/alexcrichton/git2-rs) to permit the latest version.
- [Release notes](https://github.com/alexcrichton/git2-rs/releases)
- [Commits](https://github.com/alexcrichton/git2-rs/commits/git2-curl-0.8.0)
bors [Fri, 14 Dec 2018 00:11:15 +0000 (00:11 +0000)]
Auto merge of #6419 - ehuss:fix-show-errors, r=alexcrichton
Display errors when `cargo fix` fails.
It can be difficult to figure out what's wrong when a user reports that `cargo fix` fails. It can be hard to figure out which suggestion caused a compile error, especially if the error is in another file/location.
bors [Thu, 13 Dec 2018 23:31:39 +0000 (23:31 +0000)]
Auto merge of #6434 - ehuss:fix-fix-concurrent, r=dwijnand
cargo fix: fix targets with shared sources.
If `cargo fix` attempts to fix multiple targets concurrently that have shared
source files, it would apply fixes multiple times causing corruption of the
source code. Fix this by locking on the package path instead of the target
filename, essentially serializing all targets within a package.
Eric Huss [Thu, 13 Dec 2018 22:29:26 +0000 (14:29 -0800)]
cargo fix: fix targets with shared sources.
If `cargo fix` attempts to fix multiple targets concurrently that have shared
source files, it would apply fixes multiple times causing corruption of the
source code. Fix this by locking on the package path instead of the target
filename, essentially serializing all targets within a package.
Eric Huss [Wed, 12 Dec 2018 00:24:20 +0000 (16:24 -0800)]
Display errors when `cargo fix` fails.
It can be difficult to figure out what's wrong when a user reports that
`cargo fix` fails. There's often a large list of warnings, and it can
be hard to figure out which one caused a compile error.
bors [Thu, 13 Dec 2018 20:12:04 +0000 (20:12 +0000)]
Auto merge of #6431 - ehuss:panic-in-panic, r=nrc
Fix panic-in-panic in tests.
There are some very rare circumstances that can cause a double panic during
development. For example, `.with_json("")` (or any invalid JSON) will panic, and then the drop
will also panic. This can cause a confusing SIGILL.
Eric Huss [Thu, 13 Dec 2018 19:55:38 +0000 (11:55 -0800)]
Fix panic-in-panic in tests.
There are some very rare circumstances that can cause a double panic during
development. For example, `.with_json("")` will panic, and then the drop
will also panic.
bors [Thu, 13 Dec 2018 01:10:43 +0000 (01:10 +0000)]
Auto merge of #6426 - dwijnand:allow-testsuite-warnings-in-dev, r=nrc
Allow testsuite warnings in dev
This makes the deny(warnings) in the testsuite conditional on a new
"deny-warnings" feature, that is then enabled in CI.
Ideally I could use the (reasonably well established) CI env var (like
we do for proptests), but I don't know how to get the attribute to be
defined in terms of an env var.
Dale Wijnand [Thu, 13 Dec 2018 01:00:27 +0000 (01:00 +0000)]
Allow testsuite warnings in dev
This makes the deny(warnings) in the testsuite conditional on a new
"deny-warnings" feature, that is then enabled in CI.
Ideally I could use the (reasonably well established) CI env var (like
we do for proptests), but I don't know how to get the attribute to be
defined in terms of an env var.
bors [Tue, 11 Dec 2018 03:16:36 +0000 (03:16 +0000)]
Auto merge of #6409 - spk:add-dev-deps-metadata-test, r=ehuss
Add dev-dependencies test on cargo_metadata_with_deps_and_version
Hi, this just add some test for `dev-dependencies` on metadata with some registery update for others tests `+https://github.com/rust-lang/crates.io-index` (let me know if I should do another PR), cheers
bors [Mon, 10 Dec 2018 03:44:17 +0000 (03:44 +0000)]
Auto merge of #6402 - pietroalbini:fix-cargofix, r=alexcrichton
Only ensure solutions are in the same file in cargo fix
This PR changes `cargo fix` to avoid rejecting machine-applicable lints with multiple suggestions. Instead, now it only checks the solutions are in the same file.
I don't know how to write a test for this, since no lint in rustc relies on the new behavior and the existing `cargo fix` tests just invoke lints in rustc. Any idea on that would be appreciated.
r? @alexcrichton
cc @killercup
fixes https://github.com/rust-lang/cargo/issues/6401
bors [Sun, 9 Dec 2018 21:09:50 +0000 (21:09 +0000)]
Auto merge of #6411 - ehuss:fix-bfbo, r=alexcrichton
Fix flakey broken_fixes_backed_out test.
Since `fix` does `--all-targets` there is a race condition as to which target goes first. This has less than a 1% failure rate on CI, but it has been seen several times lately:
Eric Huss [Sun, 9 Dec 2018 19:59:42 +0000 (11:59 -0800)]
Fix flakey broken_fixes_backed_out test.
Since `fix` does `--all-targets` there is a race condition as to which target goes first. This has less than a 1% failure rate on CI, but it has been seen several times lately:
bors [Sun, 9 Dec 2018 02:31:17 +0000 (02:31 +0000)]
Auto merge of #6404 - ehuss:fix-install-link, r=alexcrichton
Fix install link.
The new website broke the old links. They are setting up redirects (https://github.com/rust-lang/www.rust-lang.org/pull/597), but I figured may as well use the new location to avoid the redirect.
Eric Huss [Sun, 9 Dec 2018 01:34:48 +0000 (17:34 -0800)]
Fix install link.
The new website broke the old links. They are setting up redirects (https://github.com/rust-lang/www.rust-lang.org/pull/597), but I figured may as well use the new location to avoid the redirect.
bors [Fri, 7 Dec 2018 09:03:57 +0000 (09:03 +0000)]
Auto merge of #6392 - rust-lang:dependabot/cargo/pretty_env_logger-0.3, r=dwijnand
Update pretty_env_logger requirement from 0.2 to 0.3
Updates the requirements on [pretty_env_logger](https://github.com/seanmonstar/pretty-env-logger) to permit the latest version.
<details>
<summary>Commits</summary>
- See full diff in [compare view](https://github.com/seanmonstar/pretty-env-logger/commits/v0.3.0)
</details>
<br />
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme
Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)
Finally, you can contact us by mentioning @dependabot.
dependabot[bot] [Fri, 7 Dec 2018 06:48:49 +0000 (06:48 +0000)]
Update pretty_env_logger requirement from 0.2 to 0.3
Updates the requirements on [pretty_env_logger](https://github.com/seanmonstar/pretty-env-logger) to permit the latest version.
- [Release notes](https://github.com/seanmonstar/pretty-env-logger/releases)
- [Commits](https://github.com/seanmonstar/pretty-env-logger/commits/v0.3.0)
bors [Mon, 3 Dec 2018 18:44:13 +0000 (18:44 +0000)]
Auto merge of #6363 - dwijnand:add-executable-in-json-output, r=matklad
Include executable in JSON output.
Fixes #5426
Rebase of @patriksvensson's #5517
CC @matklad
I didn't really get into the issue or the code, I just interatively rebased Patrik's branch and then massaged and cleaned up the code until the tests passed. So please double check it for code correctness, test case correctness and test case coverage.
Particularly the branch changed an if condition according to [this suggestion](https://github.com/rust-lang/cargo/pull/5517#issuecomment-388557248) by Aleksey. I rolled that back because at one point it helped fix a series of tests. But let me know if that should be included here.
bors [Sun, 2 Dec 2018 14:37:25 +0000 (14:37 +0000)]
Auto merge of #6366 - Eh2406:faster-filtered-search, r=alexcrichton
ConflictStoreTrie: Faster filtered search
This is an optimization that I was thinking of doing in #6283. I did not then as this is optimizing a not particularly hot path. I wish to do it now as it is stuck in my head, and I need that head space for more important things.
This also "accidentally" fixes the [indeterminacy](https://github.com/rust-lang/cargo/pull/6283#issuecomment-443358988) introduced in #6283, by replacing the `HashMap.iter().find()` like code with `BTreeMap.iter().find()` like code. This is not strictly needed, as @alexcrichton pointed out (In most use cases the index will change between any two invocations anyway), but does make it much easier to deal with (fuzz) test cases.
projects / cargo.git / log