8091 Commits

Author SHA1 Message Date
bors
e3563dbdcd Auto merge of #7119 - jonhoo:cirrus-ci-badge, r=Eh2406
Add Cirrus CI badge to manifest

Reflect changes from https://github.com/rust-lang/crates.io/pull/1782.

NOTE: Should not land until https://github.com/rust-lang/crates.io/pull/1782 lands.
2019-07-16 19:22:44 +00:00
bors
f4aca6dc97 Auto merge of #7140 - ehuss:update-mdbook, r=alexcrichton
Update mdbook to 0.3.

This updates to mdbook 0.3 which uses relative links, which are much better
(the pages mostly work when viewing on GitHub for example).
2019-07-16 16:01:35 +00:00
Eric Huss
b119b891df Update mdbook to 0.3.
This updates to mdbook 0.3 which uses relative links, which are much better
(the pages mostly work when viewing on GitHub for example).
2019-07-15 16:10:06 -07:00
bors
be17b00d01 Auto merge of #7131 - ehuss:remove-unused-opt-feature, r=alexcrichton
Remove unused feature filter.

NOTE: Do not merge this lightly. This upended my understanding of how the resolver handles features, and I'm still not sure about it.

Remove an unused check that an optional dependency is activated.

This was originally added 4 years ago in #1812, during a time when this code iterated over the actual dependencies from `Package.dependencies()`. In #5415 this was refactored so that it gets the `deps` list directly from the Resolver, which AFAIK has already filtered out the features. IIUC, this filtering is done [here](705009eb38/src/cargo/core/resolver/dep_cache.rs (L270-L272)).
2019-07-15 19:38:18 +00:00
bors
1760f1f6cc Auto merge of #7127 - alexcrichton:less-params, r=Eh2406
Remove now-unused `WorkspaceResolve`

The reason this type existed was to pass in a `Workspace`, but that's no
longer necessary!
2019-07-15 14:32:43 +00:00
Alex Crichton
1a37d00a64 Remove now-unused WorkspaceResolve
The reason this type existed was to pass in a `Workspace`, but that's no
longer necessary!
2019-07-15 07:32:24 -07:00
bors
7b84c53f39 Auto merge of #7135 - ehuss:clippy-fixes, r=Eh2406
Fix some clippy warnings.
2019-07-15 00:50:13 +00:00
Eric Huss
9fa65608e4 Fix some clippy warnings. 2019-07-14 15:19:33 -07:00
bors
1140c527c4 Auto merge of #7134 - ehuss:remap-rustc, r=Eh2406
Also ignore remap-path-prefix in metadata for `cargo rustc`.

Also ignore `--remap-path-prefix` in `cargo rustc`.  Who knew that `BuildContext` had 3 sets of arguments?

Closes #7133
2019-07-14 22:04:26 +00:00
Eric Huss
d99b7fede7 Also ignore remap-path-prefix in metadata for cargo rustc. 2019-07-14 14:38:47 -07:00
Eric Huss
f1bf38236f Remove unused feature filter. 2019-07-14 12:41:18 -07:00
bors
705009eb38 Auto merge of #7129 - ehuss:string-reformat, r=Eh2406
Fix some formatting for some strings.

Some of these strings were formatted in a strange way by rustfmt.

Also fixed some strings missing trailing backslashes.  Specifically, the "path override for crate" string, and the strings in `http_auth_offered`.
2019-07-14 01:54:15 +00:00
Eric Huss
a4e9611453 Fix some formatting for some strings. 2019-07-13 16:00:47 -07:00
bors
0dd7c508d0 Auto merge of #7118 - alexcrichton:patch-bug, r=Eh2406
Handle activation conflicts for `[patch]` sources

This commit updates the resolver to ensure that it recognizes conflicts
when `[patch]` is used to augment an older version of what's already in
a source, for example. Previously the deduplication based on
semver-compatible versions didn't actually work when `[patch]` was used.
This meant that when you used `[patch]` it might not transitively affect
the entire crate graph, instead just giving you a version of a
dependency and everyone else. This violates the intention of `[patch]`!

The fix here is to catch this use case happening, when a `Dependency`
source specification mismatches an activated package we need to list a
second activation in the resolver to prevent major versions from being
selected from both the original source as well as the source of the id.

Closes #7117
2019-07-12 20:10:19 +00:00
bors
ba606d267a Auto merge of #7126 - ehuss:beta-git-new-root, r=alexcrichton
[BETA] Fix `cargo new` in root directory.

A temporary fix for #7049, master/nightly will (eventually) get the fix by updating libgit2.
2019-07-12 18:03:38 +00:00
Eric Huss
2f12ab6fb4 [BETA] Fix cargo new in root directory. 2019-07-12 10:35:06 -07:00
bors
cd1e4bf7e9 Auto merge of #7125 - Mark-Simulacrum:remove-myfnonce, r=alexcrichton
Remove MyFnOnce

This is no longer needed, as `Box<dyn FnOnce(...)>` works on stable now since 1.35.
2019-07-12 16:21:29 +00:00
Mark Rousskov
ae4b792fa4 Remove MyFnOnce 2019-07-12 11:17:33 -04:00
Jon Gjengset
f559f16e92
Add Cirrus CI badge to manifest
Reflect changes from https://github.com/rust-lang/crates.io/pull/1782.
2019-07-10 20:41:45 -04:00
Alex Crichton
83bb30cedf Handle activation conflicts for [patch] sources
This commit updates the resolver to ensure that it recognizes conflicts
when `[patch]` is used to augment an older version of what's already in
a source, for example. Previously the deduplication based on
semver-compatible versions didn't actually work when `[patch]` was used.
This meant that when you used `[patch]` it might not transitively affect
the entire crate graph, instead just giving you a version of a
dependency and everyone else. This violates the intention of `[patch]`!

The fix here is to catch this use case happening, when a `Dependency`
source specification mismatches an activated package we need to list a
second activation in the resolver to prevent major versions from being
selected from both the original source as well as the source of the id.

Closes #7117
2019-07-10 11:21:24 -07:00
bors
0bb6e14ee8 Auto merge of #7116 - alexcrichton:print-errs, r=Eh2406
Don't suppress error messages with `-q`

If we're printing an error, make sure we always print it regardless of
verbosity settings!

Closes #7025
2019-07-10 18:05:28 +00:00
Alex Crichton
bdb0ce84e2 Don't suppress error messages with -q
If we're printing an error, make sure we always print it regardless of
verbosity settings!
2019-07-10 10:01:09 -07:00
bors
bee04877ff Auto merge of #7115 - rust-lang:ehuss-patch-1, r=alexcrichton
Fix changelog date

Oops
2019-07-10 15:21:29 +00:00
Eric Huss
1707d37f8b
Fix changelog date
Oops
2019-07-10 08:15:48 -07:00
bors
677a180f4c Auto merge of #7106 - lukaslueg:master, r=ehuss
Update dependencies

This removes the `byteorder`-dependency, which was used in a few tests only anyway and is not needed since 1.32; also removes the `derive`-feature from the `failure`-crate, which is not needed also.
2019-07-08 13:43:02 +00:00
Lukas Lueg
91186e8c58 Remove byteorder-dependency 2019-07-08 12:35:34 +02:00
bors
644c8089f3 Auto merge of #7057 - hugwijst:apple-depinfo, r=ehuss
Fix overwriting .d file for binary with dSYM on apple targets.

When building a binary on targets containing `-apple-`, the resulting `.d` file gets overwritten with the dependencies of the `.dSYM` file. Eg. in the changed unit test, `foo.d` would start with `p.bin(foo).with_extension("dSYM")` instead of `p.bin(foo)`.

This PR fixes that problem by not generating `.d` dependency information files for outputs of the `DebugInfo` flavor.
2019-07-06 17:49:25 +00:00
bors
a3eee9f33c Auto merge of #7102 - ehuss:update-changelog, r=Eh2406
Update changelog.
2019-07-05 19:19:17 +00:00
Eric Huss
9e9c5868d1 Update changelog. 2019-07-05 12:09:58 -07:00
bors
a3b46ff42f Auto merge of #7099 - ehuss:revert-7093, r=alexcrichton
Revert "Fix 'getting started' internal links"

This reverts commit 60f25f56b8f398e935d7e8d952c4c2e6cc0bc7d5 (#7093).

Cargo currently uses mdbook 0.1, so the links were correct.
2019-07-05 18:42:35 +00:00
bors
ad5a728521 Auto merge of #7100 - ehuss:version-bump, r=alexcrichton
Bump to 0.39.0
2019-07-05 18:06:55 +00:00
Eric Huss
2208c1f62f Bump to 0.39.0 2019-07-05 10:42:46 -07:00
Eric Huss
99a78b879a Revert "Fix 'getting started' internal links"
This reverts commit 60f25f56b8f398e935d7e8d952c4c2e6cc0bc7d5.
2019-07-05 10:35:40 -07:00
bors
3a985c7f8e Auto merge of #7098 - lukaslueg:patch-1, r=ehuss
Update dependency.rs

Typo due to copypasta
2019-07-05 17:27:56 +00:00
lukaslueg
455f80b6c4
Update dependency.rs
Typo due to copypasta
2019-07-05 19:08:57 +02:00
bors
ab75a4bb28 Auto merge of #7097 - shepmaster:patch-2, r=Eh2406
Typo
2019-07-05 16:46:52 +00:00
Jake Goulding
09006ddccc
Typo 2019-07-05 12:03:35 -04:00
bors
8ee5b096c3 Auto merge of #7093 - tcharding:getting-started-links, r=alexcrichton
Fix 'getting started' internal links

Currently the internal links do not work, the path is incorrect.

Update the path for internal links in the index file of 'getting started' section thereby fixing the links generated in HTML.
2019-07-04 18:53:25 +00:00
tcharding
60f25f56b8 Fix 'getting started' internal links
Currently the internal links do not work, the path is incorrect.

Update the path for internal links in the index file of 'getting started'
section thereby fixing the links generated in HTML.
2019-07-04 08:37:50 +10:00
bors
9fd0332f61 Auto merge of #7090 - nmattia:nm-misleading-comment, r=Eh2406
Fix misleading comment in testsuite

The test is actually creating crates 0,1,...29 as opposed to 0,1,...19.
2019-07-03 15:06:42 +00:00
Nicolas Mattia
8d1ef5a936 Fix misleading comment in testsuite 2019-07-03 16:11:23 +02:00
bors
092b8f27c6 Auto merge of #7083 - sekhat:issue/7003-allow-dirty, r=alexcrichton
improve uncommitted changes cargo-package message

fixes #7003

Explicitly state what the suggested flag `--allow-dirty`
actually does when packaging/publishing the crate. Primarily,
that the uncommitted changes are included within the resulting
package.
2019-07-01 20:54:18 +00:00
Sekhat Temporus
69226ed887 improve uncommitted changes cargo-package message
fixes #7003

Explicitly state what the suggested flag `--allow-dirty`
actually does when packaging/publishing the crate. Primarily,
that the uncommited changes are included within the resulting
package.
2019-07-01 18:48:59 +01:00
bors
143aaed0ee Auto merge of #7082 - ehuss:git-fetch-with-cli-env-clean, r=Eh2406
Clean environment when git-fetch-with-cli is used.

When the GIT_DIR environment variable is set, git-the-cli will use that instead of looking at cwd.  This can happen, for example, when using the `exec` command in `git rebase` to call cargo.  This causes cargo to fetch into the wrong directory.

Closes #7072
2019-06-29 23:09:15 +00:00
Eric Huss
00fd31dd9b Clean environment when git-fetch-with-cli is used. 2019-06-29 13:32:21 -07:00
bors
83d086da94 Auto merge of #7062 - goffrie:master, r=alexcrichton
Fix exponentiality in depend_on_deps_of_deps.

With `CARGO_BUILD_PIPELINING=true`, cargo was spending a long time (15 seconds) before starting any compilation. That is caused by a naive graph traversal in `depend_on_deps_of_deps`. Instead, let's make sure not to keep traversing the same deps. With this patch, things are fast again.
2019-06-25 06:28:12 +00:00
Geoffry Song
15e08029f1 Add a test for build pipelining with a complex build graph. 2019-06-24 14:29:01 -07:00
Geoffry Song
1863aa2847 Fix exponentiality in depend_on_deps_of_deps. 2019-06-24 14:29:01 -07:00
bors
4c1fa54d10 Auto merge of #7066 - nmattia:nm/fix-typo-2, r=alexcrichton
Fix typo in comment
2019-06-24 11:24:18 +00:00
Nicolas Mattia
0f4ddf9034 Fix typo in comment 2019-06-24 11:30:19 +02:00