Commit graph

7139 commits

Author SHA1 Message Date
Dale Wijnand 04ddd4d0fc
Upgrade to Rust 2018 2018-12-06 20:18:35 +01:00
bors cdcb8f29d2 Auto merge of #6382 - ehuss:fix-builtin-alias, r=alexcrichton
Fix built-in aliases taking arguments.

The built-in aliases weren't parsing their arguments. Change implementation to treat built-in aliases the same as user aliases.

Fixes #6381
2018-12-06 14:35:08 +00:00
Eric Huss e8f37daeff Fix built-in aliases taking arguments. 2018-12-05 09:29:10 -08:00
bors 485670b398 Auto merge of #6372 - dwijnand:bin_dst, r=dwijnand
Split OutputFile::bindst into OutputFile::bin_dst

None
2018-12-03 19:29:24 +00:00
Dale Wijnand b0a6c42603
Split OutputFile::bindst into OutputFile::bin_dst 2018-12-03 19:28:53 +00:00
bors bfd6618840 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.
2018-12-03 18:44:13 +00:00
bors 5e85ba14aa 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.
2018-12-02 14:37:25 +00:00
bors e66ae61da6 Auto merge of #6368 - RandomInsano:patch-1, r=alexcrichton
Remove `cmake` as a requirement

No longer needed as outlined in https://github.com/rust-lang/cargo/issues/6367
2018-12-02 13:47:56 +00:00
bors bfdbf10a5b Auto merge of #6369 - matthiaskrgr:1_crates, r=dwijnand
progress: display "Downloading 1 crate" instead of "Downloading 1 crates"
2018-12-02 12:00:16 +00:00
Matthias Krüger ebced4acc6 progress: display "Downloading 1 crate" instead of "Downloading 1 crates" 2018-12-02 12:28:56 +01:00
Edwin Amsler 3b0f31e2d7
Remove cmake as a requirement
No longer needed as outlined in https://github.com/rust-lang/cargo/issues/6367
2018-12-02 01:36:12 -06:00
Eh2406 eeaebfcdfc oops... 2018-12-01 19:45:48 -05:00
Eh2406 2814ca2b19 fuzzer found a bad case 2018-12-01 17:38:35 -05:00
bors de1ef75659 Auto merge of #6364 - dwijnand:test-json-parse-expect-over-unwrap, r=alexcrichton
Use expect over unwrap, for panic-in-panic aborts

... doesn't help, but it can't hurt either, right?
2018-12-01 19:19:18 +00:00
Dale Wijnand 020efe02f5
Trim the bench test so it cannot be non-deterministic 2018-12-01 18:35:31 +00:00
Dale Wijnand 70af0636d4
Simplify & fix int test test 2018-12-01 16:52:20 +00:00
Eh2406 50af117587 we only need to search the part of the Trie that may contain the filler 2018-12-01 10:48:46 -05:00
Eh2406 b5453f3912 inline the filter 2018-12-01 10:17:26 -05:00
Eh2406 3bd1005c0d regain determinism 2018-12-01 10:04:03 -05:00
Eh2406 8c7f6af4e8 I think this shrinks better. 2018-12-01 10:00:06 -05:00
Dale Wijnand b938637893
Use expect over unwrap, for panic-in-panic aborts
... doesn't help, but it can't hurt either, right?
2018-12-01 07:53:05 +00:00
Dale Wijnand b0046c084d
Fix message order 2018-11-30 23:16:34 +00:00
Dale Wijnand c78cd0ceb7
Ignore filenames, to avoid extra Windows file
Apparently on Windows it creates an .exe & a .pdb.
2018-11-30 23:15:31 +00:00
Dale Wijnand 282f238d93
Include executable in JSON output. 2018-11-30 22:12:30 +00:00
Dale Wijnand 982b9e8f9e
Switch Artifacts.filenames to paths 2018-11-30 22:12:11 +00:00
bors d27b47baf6 Auto merge of #6362 - dwijnand:pretty_env_logger, r=alexcrichton
Switch to pretty_env_logger, under --features pretty-env-logger

Fixes #6348
2018-11-30 15:55:34 +00:00
Dale Wijnand aa8eff88a9
Switch to pretty_env_logger, under --features pretty-env-logger 2018-11-30 14:13:35 +00:00
bors e70bccff8b Auto merge of #6280 - zachreizner:master, r=dwijnand
use allow-dirty option in `cargo package` to skip vcs checks

If `cargo package` is run for a crate that is not version controlled in
a way that cargo expects, git2 will overreach upwards and grab a
irrelevant .git repo. This change uses `--allow-dirty` to imply to `cargo package` that it should not be checking for version control information, fixing this issue.
2018-11-29 09:07:16 +00:00
bors d8f066eafe Auto merge of #6352 - Eh2406:dell-copy, r=alexcrichton
remove clones made redundant by Intern PackageId

This is a follow up to #6332. I used clippy to find all the places we called `.clone()`  on a `PackageId` or where we passed `&PackageId`. Yes that touches 44 files and 400+ lines, that is way we wanted `PackageId` to be `copy`.
2018-11-28 04:55:10 +00:00
Zach Reizner fd5fb6e2dc use allow-dirty option in cargo package to skip vcs checks
To avoid introducing another flag, this change uses the `--allow-dirty`
flag to skip checking for vcs information. This is logical because a
user that passes that flag is indicating to `cargo package` that they
do not care about the state of vcs at that time.
2018-11-27 17:28:59 -08:00
Zach Reizner 09cc2f2cb6 add --no-vcs option to cargo package
If `cargo package` is run for a crate that is not version controlled in
a way that cargo expects, git2 will overreach upwards and grab a
irrelevant .git repo. This change adds `--no-vcs` as an option to
`cargo package` to prevent this.
2018-11-27 17:28:55 -08:00
Eh2406 dae87a2624 PackageId is copy, clippy thinks we dont need &PackageId or PackageId.clone() 2018-11-27 17:43:23 -05:00
bors e3435d105d Auto merge of #6345 - dlaehnemann:docs_correct-profile-usage-info, r=ehuss
docs: correct profile usage of `cargo test --release`

From trying it out on a project (see <https://github.com/PROSIC/libprosic/pull/54#issuecomment-441211463>), I have realised that the `profile` usage by `cargo test --release` differs from what is documented in the cargo book. So here comes my correction suggestion...
2018-11-27 18:49:23 +00:00
bors 0273e734cd Auto merge of #6354 - collin5:b4417, r=dwijnand
Improve doc for `cargo install`

Fixes #4417
2018-11-27 18:23:08 +00:00
Collins Abitekaniza b738f486a4 improve description for cargo install 2018-11-27 16:24:51 +03:00
David Laehnemann a472e7c46f docs: requested clarification and word wrap for profiles doc 2018-11-27 10:22:24 +01:00
bors 151c2253b1 Auto merge of #6332 - dwijnand:intern-more, r=Eh2406
Intern PackageId

Refs #6207
2018-11-26 19:10:38 +00:00
Dale Wijnand efd03bdecf
A nicer way to hash a pointer 2018-11-26 17:45:52 +00:00
Dale Wijnand e269936633
Re-expose custom SourceId equality in outer PackageId 2018-11-26 17:32:47 +00:00
Dale Wijnand ea87ca3e98
Use pointer eq/hash for SourceIdInner 2018-11-26 17:32:27 +00:00
bors 6d57b59ab5 Auto merge of #6349 - collin5:b6339, r=dwijnand
Clean only release artifacts if --release option is set

Fixes #6339
2018-11-26 15:55:03 +00:00
Collins Abitekaniza f61966403a assert for non-release artifacts 2018-11-26 18:12:11 +03:00
Collins Abitekaniza 84be123f79 test cargo clean with --release option 2018-11-26 18:01:51 +03:00
Collins Abitekaniza c5d0c34bc7 only clean release artifacts if --release option is set 2018-11-26 17:50:04 +03:00
David Laehnemann 41f788aac2 docs: specify profile usage for cargo test --release 2018-11-26 12:51:19 +01:00
Dale Wijnand a73c5171f8
Add pointer equality to PartialEq for PackageId 2018-11-26 11:04:01 +00:00
Dale Wijnand 0abfcc0dd4
Make PackageId derive Copy 2018-11-26 11:04:01 +00:00
Dale Wijnand 0593e1c167
Intern PackageId 2018-11-26 11:04:01 +00:00
Dale Wijnand 2e35475121
Add debug info to git::two_deps_only_update_one test 2018-11-26 11:04:01 +00:00
Dale Wijnand 5ddc8b1338
Test PackageId Debug & Display 2018-11-26 11:04:01 +00:00