8056 Commits

Author SHA1 Message Date
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
bors
1d8ac3c06c Auto merge of #7063 - matthiaskrgr:travis_fmt, r=alexcrichton
travis: enforce formatting of subcrates as well
2019-06-23 01:42:14 +00:00
Matthias Krüger
51a56a452d format crates-io and cargo-test-macro subcrates 2019-06-23 00:29:52 +02:00
Matthias Krüger
cbc4589c4c travis: run cargo fmt on subcrates as well 2019-06-23 00:28:33 +02:00
bors
ecc41f48a9 Auto merge of #7060 - lzutao:zsh-complete-package, r=ehuss
_cargo: Make function style consistent

They are just white-space changes. I'm planning to bring back Zsh completion
for `-p` (package) option, which was disabled in #1713. This PR is the first
stepping stone towards that goal.

A disadvantageous is that I am just starting to learn Zsh completion system.
Guess how far can I go?

r? @ehuss
2019-06-22 18:12:51 +00:00
Lzu Tao
44f782c049 _cargo: Explain how _cargo_cmds works 2019-06-23 01:08:11 +07:00
Lzu Tao
29e6278f43 _cargo: Fix some warnings caught by shellcheck 2019-06-23 01:08:11 +07:00
bors
5277137d85 Auto merge of #7061 - ehuss:update-fix-comments, r=alexcrichton
Update some fix comments.

- Primary handling changed in #5824.
- cargo_as_rustc_wrapper changed in #6759.
2019-06-22 17:28:28 +00:00
Eric Huss
247063c35b Update some fix comments. 2019-06-22 10:07:54 -07:00
Lzu Tao
e3b286bae9 _cargo: Make function style consistent 2019-06-22 20:40:40 +07:00
bors
973356143c Auto merge of #7056 - ehuss:default-run-stabilize, r=alexcrichton
Stabilize default-run

This stabilizes the default-run feature.

I've included some error message changes. If `default-run` specifies an unknown binary, it now tells you that the `default-run` field is incorrect and which manifest it is located in, instead of just saying "could not determine which binary to run".

I also consolidated some of the suggestion code so it is not repeated all over.

Closes #7032
2019-06-21 20:53:30 +00:00
Eric Huss
7d7fe6797a Stabilize default-run 2019-06-21 11:36:53 -07:00
bors
142603ae22 Auto merge of #7054 - nmattia:nm/fix-typo, r=Eh2406
Fix typo in comment
2019-06-21 14:32:26 +00:00
Nicolas Mattia
df4775954f Fix typo in comment 2019-06-21 16:26:44 +02:00
bors
797ea153bf Auto merge of #7050 - schomatis:fix/fingerprint/dont-update-intermediate-artifacts-mtime, r=Eh2406
fix(fingerpring): do not touch intermediate artifacts

Fixes https://github.com/rust-lang/cargo/issues/6972.

The newly introduced [test](9aa7a4dce5) is [failing](https://travis-ci.com/rust-lang/cargo/jobs/209849725#L2569-L2580) as discussed in https://github.com/rust-lang/cargo/issues/6972#issuecomment-502241124 (replicating the issue). Removing the `touching of intermediate artifacts` as suggested fixes the issue, but makes the old test `simple_deps_cleaner_does_not_rebuild` fail. The `simple_deps_cleaner_does_not_rebuild` test is not needed anymore so it's removed.

r? @Eh2406
2019-06-21 14:07:02 +00:00
Lucas Molas
009876a88a fix(fingerprint): rustfmt 2019-06-21 00:40:30 -03:00
Lucas Molas
8343fb7396 test(freshness): remove simple_deps_cleaner_does_not_rebuild
Now that the `mtime` of intermediate artifacts is not updated there's no need
for this test anymore (it now fails because without the `mtime`s it cannot
perform the intended  GC operation).
2019-06-21 00:15:59 -03:00
Lucas Molas
78927e6b15 fix(fingerpring): do not touch intermediate artifacts 2019-06-20 23:40:05 -03:00
Lucas Molas
9aa7a4dce5 test(freshness): check that updating dependency mtime does not rebuild 2019-06-20 23:34:45 -03:00
bors
37cb9bbe24 Auto merge of #7045 - Eh2406:resolver-test/debug-cleanup, r=alexcrichton
Resolver test/debug cleanup

This is several small things salvaged from abandoned PRs and implemented on top of #7011

In working on this I noted that the prop tests are very sensitive to whether backtrace are turned on. Maybe we should set that env to 0 for that builder?
2019-06-21 01:30:05 +00:00
Eh2406
cb95f5ef7c check is_public vs Kind more carefully 2019-06-20 13:58:51 -04:00
bors
eebd1da3a8 Auto merge of #7048 - jeremystucki:into_url, r=Eh2406
Rename to_url → into_url

I think it should be `into_url` as it consumes itself.

[Relevant clippy lint](https://rust-lang.github.io/rust-clippy/master/index.html#wrong_self_convention)
2019-06-20 16:40:51 +00:00
Jeremy Stucki
2415a2980f
Make rustfmt happy 2019-06-20 18:23:55 +02:00
bors
92427df835 Auto merge of #7047 - jeremystucki:needless-lifetimes, r=Eh2406
Remove needless lifetimes
2019-06-20 15:43:09 +00:00
Jeremy Stucki
930134c75b
Rename to_url -> into_url 2019-06-20 16:53:24 +02:00
Jeremy Stucki
e97fef0239
Indicate anonymous lifetime 2019-06-20 16:46:46 +02:00
Jeremy Stucki
90e6bc6d01
Remove needless lifetimes 2019-06-20 14:03:09 +02:00
Eh2406
034c5908d8 check that the SAT solver exempts the result from the resolver 2019-06-19 16:58:25 -04:00
Eh2406
f203deaa05 optimize conflict_store for looking up only older matches 2019-06-19 13:02:08 -04:00
bors
2ee292f068 Auto merge of #7042 - ehuss:no-global-rm-rf, r=alexcrichton
Revert test directory cleaning change.

#6900 changed it so that the entire `cit` directory was cleaned once when tests started. Previously, each `t#` directory was deleted just before each test ran. This restores the old behavior due to problems on Windows.

The problem is that the call to `rm_rf` would fail with various errors ("Not found", "directory not empty", etc.) if you run `cargo test` twice. The first panic would poison the lazy static initializer, causing all subsequent tests to fail.

There are a variety of reasons deleting a file on Windows is difficult. My hypothesis in this case is that services like the indexing service and Defender swoop in and temporarily hold handles to files. This seems to be worse on slower systems, where presumably these services take longer to process all the files created by the test suite. It may also be related to how files are "marked for deletion" but are not immediately deleted.

The solution here is to spread out the deletion over time, giving Windows more of an opportunity to release its handles. This is a poor solution, and should only help reduce the frequency, but not entirely fix it.

I believe that this cannot be solved using `DeleteFileW`. There are more details at https://github.com/rust-lang/rust/issues/29497, which is a long-standing problem that there are no good Rust implementations for recursively deleting a directory.

An example of something that implements a "safe" delete is [Cygwin's unlink implementation](ad101bcb0f/winsup/cygwin/syscalls.cc (L675-L1064)). As you can see, it is quite complex. Of course our use case does not need to handle quite as many edge cases, but I think any implementation is going to be nontrivial, and require Windows-specific APIs not available in std.

Note: Even before #6900 I still get a lot of errors on a slow VM (particularly "directory not empty"), with Defender and Indexing off. I'm not sure why. This PR should make it more bearable, though.
2019-06-19 16:22:59 +00:00
Eh2406
f4bd3a4c6e dont have arg if it is all ways pkg_id("root") 2019-06-19 11:59:33 -04:00
Eh2406
5a30d17238 conflicting_activations should always apply to cx
This is a small assert, but it scuttled a pub/priv deps PR, so lets do it all the time.
2019-06-19 11:34:58 -04:00
Eh2406
1a1ba8054b cur is not as helpful as age when debugging 2019-06-19 10:21:00 -04:00
bors
a3ea13595d Auto merge of #7041 - michaellass:patch-1, r=ehuss
cargo book /reference/manifest: fix typo
2019-06-18 21:31:24 +00:00
Eric Huss
00822903bb Revert test directory cleaning change. 2019-06-18 14:14:24 -07:00