Carol (Nichols || Goulding) [Tue, 17 May 2016 23:08:24 +0000 (19:08 -0400)]
At the end, point to docs that might be interesting next
Carol (Nichols || Goulding) [Tue, 17 May 2016 22:48:35 +0000 (18:48 -0400)]
Add info about what's different between debug/release
Carol (Nichols || Goulding) [Tue, 17 May 2016 22:41:31 +0000 (18:41 -0400)]
Add info about `build-dependencies` to the specifying deps page
Carol (Nichols || Goulding) [Tue, 17 May 2016 22:33:27 +0000 (18:33 -0400)]
Add a `[dev-dependencies]` example
Carol (Nichols || Goulding) [Tue, 17 May 2016 22:33:13 +0000 (18:33 -0400)]
Correct typo when referring to 64 bit
Carol (Nichols || Goulding) [Sun, 15 May 2016 14:39:40 +0000 (10:39 -0400)]
Clarify statements about ignoring/checking in Cargo.lock
Carol (Nichols || Goulding) [Sun, 15 May 2016 14:30:40 +0000 (10:30 -0400)]
Small rewordings
Carol (Nichols || Goulding) [Sun, 15 May 2016 14:28:40 +0000 (10:28 -0400)]
Clarify that you should not manually edit Cargo.lock
Carol (Nichols || Goulding) [Sun, 15 May 2016 14:27:40 +0000 (10:27 -0400)]
Add an ascii directory tree to the project layout section
Carol (Nichols || Goulding) [Sun, 15 May 2016 14:19:13 +0000 (10:19 -0400)]
Clarify that integration tests go in tests/
"External" is a bit confusing. Then if we say where integration tests
go, that might make someone wonder where the unit tests go, so I added a
note about unit tests.
Carol (Nichols || Goulding) [Sat, 14 May 2016 21:16:42 +0000 (17:16 -0400)]
Reword note about git init default to be in the positive
Carol (Nichols || Goulding) [Sat, 14 May 2016 14:17:43 +0000 (10:17 -0400)]
Remove section about converting a project to cargo
Since most projects start with cargo these days.
Carol (Nichols || Goulding) [Sat, 14 May 2016 00:05:38 +0000 (20:05 -0400)]
Replace references to conduit(-static) with uuid/rand
Since they're official rust crates.
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:56:54 +0000 (19:56 -0400)]
Combine related thoughts into the same paragraph
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:56:11 +0000 (19:56 -0400)]
Reword to not call a non-rust-tuple thing a tuple
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:55:07 +0000 (19:55 -0400)]
Use — instead of --
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:54:36 +0000 (19:54 -0400)]
Use code formatting for `git`
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:53:19 +0000 (19:53 -0400)]
Add all three channels to the sample .travis.yml
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:50:33 +0000 (19:50 -0400)]
Replace refs to color-rs crate to rust-lang's rand crate
Bonus: rand has a `next` branch so the git branch example makes more
sense!
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:42:40 +0000 (19:42 -0400)]
Clarify that release builds go in the release dir, not another subdir
Good call @steveklabnik! This matches much more nicely with the contrast
to `target/debug`.
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:42:01 +0000 (19:42 -0400)]
Link crates.io everywhere
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:40:53 +0000 (19:40 -0400)]
Fix markdown links that repeat their link text unnecessarily
Carol (Nichols || Goulding) [Fri, 13 May 2016 20:47:11 +0000 (16:47 -0400)]
Add instructions for rendering docs locally to the README
Carol (Nichols || Goulding) [Fri, 13 May 2016 20:09:02 +0000 (16:09 -0400)]
Make the crates.io docs about publishing only, not using
Try to make this flow a bit more and have sections based on what
situation you might find yourself in.
Carol (Nichols || Goulding) [Fri, 13 May 2016 19:13:36 +0000 (15:13 -0400)]
Consolidate all info about specifying deps into one page.
I think information about specifying dependencies deserves to have its
own page since this info is commonly needed and there are a LOT of
different ways to specify dependencies.
Previously this information was spread across multiple pages, now
there's one place to go if you're looking for any of these ways, rather
than checking the multiple pages this info was spread across before.
Carol (Nichols || Goulding) [Fri, 13 May 2016 18:16:39 +0000 (14:16 -0400)]
Incorporate "using crates from crates.io" into the main guide
Connects to rust-lang/cargo#1035. Using crates from crates.io is a
common thing that many people will want to know how to do right away and
deserves to be part of the main guide.
Carol (Nichols || Goulding) [Fri, 13 May 2016 18:10:42 +0000 (14:10 -0400)]
Move the Travis CI section under the testing section
I'm guessing the path dependency section got added in between. Also
linked to the Travis CI rust docs and removed the hyphen since Travis CI
seems to spell it without.
Carol (Nichols || Goulding) [Fri, 13 May 2016 18:00:46 +0000 (14:00 -0400)]
Small rewording changes; mostly to clear up potential ambiguity
Carol (Nichols || Goulding) [Fri, 13 May 2016 16:39:15 +0000 (12:39 -0400)]
Correct reference to `foo` to `hello_world`
Copypasta, or forgotten name change
Carol (Nichols || Goulding) [Fri, 13 May 2016 16:34:31 +0000 (12:34 -0400)]
Clarify that the "somewhere" is github
Carol (Nichols || Goulding) [Fri, 13 May 2016 16:31:57 +0000 (12:31 -0400)]
Mention that binary location changes when using --release
Carol (Nichols || Goulding) [Fri, 13 May 2016 16:27:10 +0000 (12:27 -0400)]
Remove out of place instructions on passing args and flags
This doesn't feel like it fits very well at this point, since our
example program doesn't take args and beginners to cargo probably don't
have a reason to want to pass flags on to rustc at this point. Also it
doesn't even say rustc, just "which flags go where"... where would they
go?!?!
Carol (Nichols || Goulding) [Fri, 13 May 2016 16:25:37 +0000 (12:25 -0400)]
Correct `Fresh` to `Compiling` since we aren't running with -v
I only see `Fresh` if I use `cargo run -v`, but this example uses `cargo
run`. Someone following along might not see either of these if they just
built in the previous step, though, so clarify that you'll only see that
if you have made changes.
Carol (Nichols || Goulding) [Fri, 13 May 2016 16:58:26 +0000 (12:58 -0400)]
Remove extranneous commas
Steve and commas, sittin in a tree!
Fixes rust-lang/crates.io#334.
bors [Fri, 13 May 2016 06:06:54 +0000 (23:06 -0700)]
Auto merge of #2682 - srinivasreddy:refactor_2, r=alexcrichton
remove deprecated attr - change connect() to join()
Srinivas Reddy Thatiparthy [Fri, 13 May 2016 00:31:37 +0000 (06:01 +0530)]
remove deprecated attr - change connect() to join()
bors [Fri, 13 May 2016 00:28:15 +0000 (17:28 -0700)]
Auto merge of #2681 - alexcrichton:cargo-env-home, r=brson
Canonicalize CARGO_HOME fallback on Windows
This commit ensures that we always return the same fallback value on Windows
regardless of whichever shell we happen to be run from. We do this by removing
the `$HOME` environment variable which `std::env::home_dir` will inspect to
force it to fall back to the system APIs. If the old directory exists then we
favor that one, but otherwise we favor locations like `C:\Users\$user`
Supercedes and closes #2604
Alex Crichton [Thu, 12 May 2016 22:12:16 +0000 (15:12 -0700)]
Canonicalize CARGO_HOME fallback on Windows
This commit ensures that we always return the same fallback value on Windows
regardless of whichever shell we happen to be run from. We do this by removing
the `$HOME` environment variable which `std::env::home_dir` will inspect to
force it to fall back to the system APIs. If the old directory exists then we
favor that one, but otherwise we favor locations like `C:\Users\$user`
Supercedes and closes #2604
bors [Thu, 12 May 2016 21:09:45 +0000 (14:09 -0700)]
Auto merge of #2678 - matklad:simplify-tests-2, r=alexcrichton
Simplify more tests
This is the followup of #2670
It contains [one](https://github.com/rust-lang/cargo/commit/
28887beee054bfa9b56207667df3f5ae38a8ac6f#diff-ebcf8bfb935037902f135a7c225479b5L322) more or less significant change, everything else is just search/replace.
r? @alexcrichton
Aleksey Kladov [Thu, 12 May 2016 17:06:36 +0000 (20:06 +0300)]
remove useless formats
Aleksey Kladov [Thu, 12 May 2016 15:23:53 +0000 (18:23 +0300)]
simplify tests
remove ADDING, REMOVING, DOCTEST, DOWNLOADING, PACKAGING, UPLOADING,
VERIFYING, ARCHIVING, INSTALLING, REPLACING constants
bors [Thu, 12 May 2016 18:45:03 +0000 (11:45 -0700)]
Auto merge of #2396 - sbeckeriv:network-retry-1602, r=alexcrichton
Network retry issue 1602
Dearest Reviewer,
This branch resolves #1602 which relates to retrying network
issues automatically. There is a new utility helper for retrying
any network call.
There is a new config called net.retry value in the .cargo.config
file. The default value is 2. The documentation has also been
updated to reflect the new value.
Thanks
Becker
Stephen Becker IV [Thu, 12 May 2016 01:34:15 +0000 (18:34 -0700)]
Network retry issue 1602
Dearest Reviewer,
This branch resolves #1602 which relates to retrying network
issues automatically. There is a new utility helper for retrying
any network call.
There is a new config called net.retry value in the .cargo.config
file. The default value is 2. The documentation has also been
updated to reflect the new value.
Thanks
Becker
bors [Wed, 11 May 2016 23:31:53 +0000 (16:31 -0700)]
Auto merge of #2674 - alexcrichton:less-third-party-cruft, r=brson
Don't print extra error info for subcommands
Assume they take care of error printing, so just ferry along the exit status if
they fail
Closes #2673
Alex Crichton [Wed, 11 May 2016 23:27:47 +0000 (16:27 -0700)]
Don't print extra error info for subcommands
Assume they take care of error printing, so just ferry along the exit status if
they fail
Closes #2673
bors [Wed, 11 May 2016 22:13:55 +0000 (15:13 -0700)]
Auto merge of #2670 - matklad:simplify-tests, r=alexcrichton
Simplify tests
@alexcrichton I think there is one bit of tests that could be simplified.
What do you think about writing this
```Rust
test!(simple {
pkg("foo", "0.0.1");
assert_that(cargo_process("install").arg("foo"),
execs().with_status(0).with_stdout(&format!("\
[UPDATING] registry `[..]`
[DOWNLOADING] foo v0.0.1 (registry file://[..])
[COMPILING] foo v0.0.1 (registry file://[..])
[INSTALLING] {home}[..]bin[..]foo[..]
",
home = cargo_home().display())));
assert_that(cargo_home(), has_installed_exe("foo"));
assert_that(cargo_process("uninstall").arg("foo"),
execs().with_status(0).with_stdout(&format!("\
[REMOVING] {home}[..]bin[..]foo[..]
",
home = cargo_home().display())));
assert_that(cargo_home(), is_not(has_installed_exe("foo")));
});
```
instead of this
```Rust
test!(simple {
pkg("foo", "0.0.1");
assert_that(cargo_process("install").arg("foo"),
execs().with_status(0).with_stdout(&format!("\
{updating} registry `[..]`
{downloading} foo v0.0.1 (registry file://[..])
{compiling} foo v0.0.1 (registry file://[..])
{installing} {home}[..]bin[..]foo[..]
",
updating = UPDATING,
downloading = DOWNLOADING,
compiling = COMPILING,
installing = INSTALLING,
home = cargo_home().display())));
assert_that(cargo_home(), has_installed_exe("foo"));
assert_that(cargo_process("uninstall").arg("foo"),
execs().with_status(0).with_stdout(&format!("\
{removing} {home}[..]bin[..]foo[..]
",
removing = REMOVING,
home = cargo_home().display())));
assert_that(cargo_home(), is_not(has_installed_exe("foo")));
});
```
This PR has a proof of concept implementation of this feature applied to a couple of tests.
r? @alexcrichton
Aleksey Kladov [Wed, 11 May 2016 16:55:43 +0000 (19:55 +0300)]
simplify tests
remove RUNNING, COMPILING, ERROR, DOCUMENTING, FRESH and UPDATING
constants
bors [Wed, 11 May 2016 06:37:09 +0000 (23:37 -0700)]
Auto merge of #2669 - mbrubeck:dev-dep-doc, r=alexcrichton
Document that dev-dependencies are used when building examples
None
Aleksey Kladov [Tue, 10 May 2016 23:52:02 +0000 (02:52 +0300)]
Simplify tests
Matt Brubeck [Tue, 10 May 2016 21:37:25 +0000 (14:37 -0700)]
Document that dev-dependencies are used when building examples
bors [Mon, 9 May 2016 04:58:01 +0000 (21:58 -0700)]
Auto merge of #2666 - matklad:simplify, r=alexcrichton
Simplify error printing
Aleksey Kladov [Sun, 8 May 2016 21:22:46 +0000 (00:22 +0300)]
Simplify error printing
bors [Fri, 6 May 2016 17:49:57 +0000 (10:49 -0700)]
Auto merge of #2656 - knight42:fix, r=alexcrichton
zsh: enable autocompletion for sub-command `init`
bors [Fri, 6 May 2016 17:13:02 +0000 (10:13 -0700)]
Auto merge of #2647 - alx741:improve-manpage, r=alexcrichton
Man page: Improve build command section
Addresses #2645
This is a proposal for improving the documentation available in the man page about each command; It has been applied to the **build** command only, if it is useful i will do the same with the other ones.
bors [Fri, 6 May 2016 16:19:36 +0000 (09:19 -0700)]
Auto merge of #2653 - frewsxcv:cleanup, r=alexcrichton
A few cleanup commits.
None
Knight [Fri, 6 May 2016 12:00:51 +0000 (20:00 +0800)]
zsh: enable autocompletion for sub-command `init`
Daniel Campoverde [alx741] [Fri, 6 May 2016 04:36:32 +0000 (23:36 -0500)]
Add man sub-pages in Makefile.in
Daniel Campoverde [alx741] [Fri, 6 May 2016 04:27:28 +0000 (23:27 -0500)]
Man page: Add cargo-build page
Daniel Campoverde [alx741] [Fri, 6 May 2016 04:27:09 +0000 (23:27 -0500)]
Man page: Add reference to cargo-build page
Corey Farwell [Fri, 6 May 2016 01:36:13 +0000 (21:36 -0400)]
Utilize `if let` over single branch `match`.
Corey Farwell [Thu, 5 May 2016 23:07:36 +0000 (19:07 -0400)]
Remove `String` ownership constraint, fewer allocations.
Corey Farwell [Thu, 5 May 2016 22:40:47 +0000 (18:40 -0400)]
Turn `url_ref` utility function into method.
bors [Thu, 5 May 2016 02:50:09 +0000 (19:50 -0700)]
Auto merge of #2648 - frewsxcv:unused-to-url, r=alexcrichton
Remove unused `ToUrl` impls.
None
Corey Farwell [Thu, 5 May 2016 01:46:36 +0000 (21:46 -0400)]
Remove unused `ToUrl` impls.
Daniel Campoverde [alx741] [Thu, 5 May 2016 00:38:50 +0000 (19:38 -0500)]
Man page: Improve build command section
bors [Wed, 4 May 2016 02:17:14 +0000 (19:17 -0700)]
Auto merge of #2635 - frewsxcv:toml-cleanup, r=alexcrichton
Various cleanup in `src/cargo/util/toml.rs`.
None
bors [Tue, 3 May 2016 22:11:27 +0000 (15:11 -0700)]
Auto merge of #2639 - SimonSapin:url-1.0, r=alexcrichton
Update to rust-url 1.x
This is ready to go now :)
bors [Tue, 3 May 2016 17:59:34 +0000 (10:59 -0700)]
Auto merge of #2634 - frewsxcv:flake8, r=alexcrichton
Address flake8 issues.
None
Simon Sapin [Wed, 2 Mar 2016 15:37:44 +0000 (16:37 +0100)]
Update to rust-url 1.x
bors [Tue, 3 May 2016 16:40:16 +0000 (09:40 -0700)]
Auto merge of #2636 - sanxiyn:unused-trait-import, r=alexcrichton
Remove unused trait imports
Seo Sanghyeon [Tue, 3 May 2016 16:37:19 +0000 (01:37 +0900)]
Update OpenSSL version to 1.0.2h
Seo Sanghyeon [Tue, 3 May 2016 09:21:27 +0000 (18:21 +0900)]
Remove unused trait imports
Corey Farwell [Tue, 3 May 2016 01:18:14 +0000 (21:18 -0400)]
Utilize `if let` construct over single branch `match`.
Corey Farwell [Tue, 3 May 2016 01:17:01 +0000 (21:17 -0400)]
Remove unnecessary `Vec` allocation when iterating.
Corey Farwell [Tue, 3 May 2016 01:04:26 +0000 (21:04 -0400)]
Refactor `TomlTarget` validation functions into methods.
Corey Farwell [Tue, 3 May 2016 00:59:39 +0000 (20:59 -0400)]
Use constructor pattern for `project_layout` in `toml.rs`.
Corey Farwell [Tue, 3 May 2016 00:26:41 +0000 (20:26 -0400)]
Minor whitespace fixes for flake8.
Corey Farwell [Tue, 3 May 2016 00:25:05 +0000 (20:25 -0400)]
Remove unused Python imports.
bors [Mon, 2 May 2016 16:54:56 +0000 (09:54 -0700)]
Auto merge of #2405 - gkoz:reinstall, r=alexcrichton
Add `--force` flag to cargo install
Close #2082.
Adding `--force` (`-f`) instructs cargo to overwrite existing binaries (updating the metadata accordingly).
This allows updating crates via `cargo install -f <crate>`.
Installation happens in two stages now: binaries are copied into a temporary subdirectory of the destination first, then moved into destination. This should catch some errors earlier.
In case of installation error cargo will remove new binaries but won't attempt to undo successful overwrites.
Gleb Kozyrev [Sat, 30 Apr 2016 23:46:41 +0000 (02:46 +0300)]
cargo-install: move binaries from the build dir if possible
Try moving the binaries (and fall back to copying) if the build
directory is a temporary one (source isn't a local path).
Gleb Kozyrev [Fri, 15 Apr 2016 11:20:45 +0000 (14:20 +0300)]
Add `--force` flag to cargo install
Close #2082
Adding `--force` (`-f`) instructs cargo to overwrite existing binaries
(updating the metadata accordingly).
This allows updating crates via `cargo install -f <crate>`.
Installation happens in two stages now: binaries are copied into a
temporary subdirectory of the destination first, then moved into
destination. This should catch some errors earlier.
In case of installation error cargo will remove new binaries but won't
attempt to undo successful overwrites.
bors [Sat, 30 Apr 2016 00:46:56 +0000 (17:46 -0700)]
Auto merge of #2629 - alexcrichton:moar-rustflags, r=brson
Pass RUSTFLAGS when we learn about target info
This should help us learn about `target_feature` additions!
Closes #2628
Alex Crichton [Fri, 29 Apr 2016 23:36:55 +0000 (16:36 -0700)]
Pass RUSTFLAGS when we learn about target info
This should help us learn about `target_feature` additions!
Closes #2628
bors [Fri, 29 Apr 2016 17:15:47 +0000 (10:15 -0700)]
Auto merge of #2623 - alexcrichton:nfs-lol-no, r=brson
Don't use flock on NFS mounts
Completely skip file locking when we detect an NFS mount via `statfs`.
Closes #2615
bors [Wed, 27 Apr 2016 17:00:37 +0000 (10:00 -0700)]
Auto merge of #2625 - aidanhs:aphs-path-crates-io, r=alexcrichton
`path` dependencies are ignored from crates.io
Aidan Hobson Sayers [Wed, 27 Apr 2016 14:54:58 +0000 (15:54 +0100)]
`path` dependencies are ignored from crates.io
Alex Crichton [Tue, 26 Apr 2016 22:58:49 +0000 (15:58 -0700)]
Don't use flock on NFS mounts
Completely skip file locking when we detect an NFS mount via `statfs`.
Closes #2615
bors [Tue, 26 Apr 2016 06:11:10 +0000 (23:11 -0700)]
Auto merge of #2619 - japaric:freebsd32, r=alexcrichton
prepare for i686-unknown-freebsd nightlies
Tested with:
```
$ python -B src/etc/install-deps.py
$ ./configure --local-rust-root=$PWD/rustc --enable-optimize --enable-nightly --target=i686-unknown-freebsd
$ make
```
r? @alexcrichton
Jorge Aparicio [Tue, 26 Apr 2016 05:22:30 +0000 (00:22 -0500)]
prepare for i686-unknown-freebsd nightlies
bors [Mon, 25 Apr 2016 16:17:58 +0000 (09:17 -0700)]
Auto merge of #2617 - sanxiyn:reset-rustflags, r=alexcrichton
Reset RUSTFLAGS when running tests
Seo Sanghyeon [Mon, 25 Apr 2016 13:58:09 +0000 (22:58 +0900)]
Reset RUSTFLAGS when running tests
bors [Sun, 24 Apr 2016 05:15:19 +0000 (22:15 -0700)]
Auto merge of #2610 - japaric:install-from-tempdir, r=alexcrichton
cargo-install: prefer building artifacts in the system temporary directory
and each cargo-install instance creates and uses its own build directory. This
allows running several cargo-install instances in parallel.
If we fail to create a temporary directory for whatever reason fallback to
creating and using a target-install directory in the current directory.
closes #2606
---
r? @alexcrichton
Qs:
- Should we preserve the current behavior (`target-install` in `cwd`) as a fallback or remove it and error if we can't create a `TempDir` in `env::temp_dir()`? (we currently error if we can't create `target-install` directory in `cwd`)
- Should I add tests for the issues I raised at #2606? If yes, how can I test `cargo-install` parallelism? Lack of "Blocking waiting for file lock on build directory" in the output of the `cargo` commands? or something else?
Jorge Aparicio [Sat, 23 Apr 2016 03:33:58 +0000 (22:33 -0500)]
add tests for #2606
Jorge Aparicio [Fri, 22 Apr 2016 22:49:12 +0000 (17:49 -0500)]
cargo-install: prefer building artifacts in the system temporary directory
and each cargo-install instance creates and uses its own build directory. This
allows running several cargo-install instances in parallel.
If we fail to create a temporary directory for whatever reason fallback to
creating and using a target-install directory in the current directory.
closes #2606
bors [Thu, 21 Apr 2016 18:16:01 +0000 (11:16 -0700)]
Auto merge of #2602 - durka:patch-5, r=alexcrichton
fix rerun-if-changed documentation
The documentation corresponded to the initial proposed implementation, which was changed to remove special handling of directories before it was ever merged.
closes #2599
r? @alexcrichton
Alex Burka [Thu, 21 Apr 2016 17:55:24 +0000 (13:55 -0400)]
fix rerun-if-changed documentation
The documentation corresponded to the initial proposed implementation, which was changed to remove special handling of directories before it was ever merged.
bors [Thu, 21 Apr 2016 17:40:42 +0000 (10:40 -0700)]
Auto merge of #2578 - alexcrichton:test-doc, r=brson
Add `cargo test --doc`
Supports testing only the documentation (like `--lib`, `--bin`, etc).
bors [Thu, 21 Apr 2016 17:09:27 +0000 (10:09 -0700)]
Auto merge of #2551 - alexcrichton:explain, r=brson
Add support for `cargo --explain`
The error messages in the compiler are being tweaked and will likely drop the
`rustc --explain` part of the error message in favor of `--explain`. In that
case you're expected to basically take whatever tool you're using and pass
`--explain` to it with an error code, so let's add it to Cargo as well!
Alex Crichton [Fri, 8 Apr 2016 00:27:49 +0000 (17:27 -0700)]
Add support for `cargo --explain`
The error messages in the compiler are being tweaked and will likely drop the
`rustc --explain` part of the error message in favor of `--explain`. In that
case you're expected to basically take whatever tool you're using and pass
`--explain` to it with an error code, so let's add it to Cargo as well!
bors [Thu, 21 Apr 2016 16:34:38 +0000 (09:34 -0700)]
Auto merge of #2576 - alexcrichton:silence-warnings-with-q, r=brson
Don't print warnings when -q is passed
Closes #2571