Auto merge of #6062 - joelgallant:rustdoc-edition, r=alexcrichton
Removes -Zunstable-options for rustdoc testing
As far as I understand, this flag isn't needed anymore, since --edition is stable on beta.
I ran in to this when running `cargo +beta test --doc --verbose` on my crate, which errors with:
```
Running `rustdoc -Zunstable-options --edition=2018 [omitted...]`
error: the option `Z` is only accepted on the nightly compiler
```
Auto merge of #6057 - alexcrichton:beta-next, r=ehuss
[beta]: Fixup the 1.30.0 branch
Reconciles data found in this comment https://github.com/rust-lang/rust/pull/54342#issuecomment-422640987 by merging the cargo submodule's commit of the original beta for 1.30.0 into the current 1.30.0 branch.
Includes stabilization of `-Z compile-progress` as well as a number of other nice fixes!
Auto merge of #6021 - zachlute:validate-package-name, r=alexcrichton
Validate that the package name contains no invalid characters.
Fixes #2388.
Invalid characters are currently defined as alphanumeric, _, and -. This matches the rustc restrictions but is not as restrictive as `cargo new` or crates.io.
Mostly this is just so there will be better error messages in the case where characters in the package name aren't valid path characters.
Validate that the package name contains no invalid characters.
Invalid characters are currently defined as alphanumeric, _, and -. This matches the rustc restrictions but is not as restrictive as `cargo new` or crates.io.
Mostly this is just so there will be better error messages in the case where characters in the package name aren't valid path characters.
Do not add --color to rustdoc if it doesn't support it.
We detect this by executing `rustdoc --color never -V` and see if the
result is successful. To avoid repeatedly creating a new process, we
cache the result into `.rustc_info.json`.
Auto merge of #6006 - EPashkin:master, r=alexcrichton
Fix example for usage still not published uuid 2.0.0
IMHO There some inconsistency in https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#prepublishing-a-breaking-change
We have unpublished version 2.0.0 for uuid crate in branch with same name.
Now we can test it in `my-library` without waiting for publish as written in docs.
But if `my-library` changes committed to its master, for `my-binary` patch need be same as in library,
as uuid 2.0.0 still not published.
Auto merge of #5994 - zachlute:convert-file-uris, r=alexcrichton
Print file paths instead of file:// URLs.
Fixes #4661.
This change ensures cargo will output file paths in the expected format
(C:\foo\... on Windows, /foo/... elsewhere). Previously it would output
file:// URLs instead.
To support this change, additional changes were made to the test suite
string processing such that [ROOT] is now replaced with the appropriate
file path root for the platform.
The CWD template was also updated to use [CWD] like other replacement
templates and to do the replacement on the expected value rather than
the actual value to avoid replacing things we don't expect with CWD.
This change ensures cargo will output file paths in the expected format
(C:\foo\... on Windows, /foo/... elsewhere). Previously it would output
file:// URLs instead.
To support this change, additional changes were made to the test suite
string processing such that [ROOT] is now replaced with the appropriate
file path root for the platform.
The CWD template was also updated to use [CWD] like other replacement
templates and to do the replacement on the expected value rather than
the actual value to avoid replacing things we don't expect with CWD.
Auto merge of #5989 - alexcrichton:change-default, r=Mark-Simulacrum
Change the default edition for `cargo new` to 2018
As it says on the tin! Some tests were updated to explicitly pass 2015 so they
can continue to work on stable, and otherwise `cargo new` should now by default
generate a 2018 project.
Alex Crichton [Fri, 7 Sep 2018 00:01:20 +0000 (17:01 -0700)]
Change the default edition for `cargo new` to 2018
As it says on the tin! Some tests were updated to explicitly pass 2015 so they
can continue to work on stable, and otherwise `cargo new` should now by default
generate a 2018 project.
Auto merge of #5984 - alexcrichton:stabilize-edition, r=ehuss
Stabilize `edition` key and add `cargo new --edition`
This commit stabilizes the `edition` key in `Cargo.toml`, both in the
`[package]` section and inside subtargets. Additionally the `cargo new` and
`cargo init` subcommands have been enhanced with a `--edition` flag to allow
explicitly specifying the edition to be generated.
This commit does not yet change the default edition that's generated.
Alex Crichton [Wed, 5 Sep 2018 22:29:22 +0000 (15:29 -0700)]
Stabilize `edition` key and add `cargo new --edition`
This commit stabilizes the `edition` key in `Cargo.toml`, both in the
`[package]` section and inside subtargets. Additionally the `cargo new` and
`cargo init` subcommands have been enhanced with a `--edition` flag to allow
explicitly specifying the edition to be generated.
This commit does not yet change the default edition that's generated.
Auto merge of #5983 - alexcrichton:fix-rustc-wrapper, r=dwijnand
fix: Fix unusual errors with `RUSTC_WRAPPER`
This commit fixes the interaction of `cargo fix` and `RUSTC_WRAPPER`, ensuring
that Cargo at least doesn't die internally. For now `RUSTC_WRAPPER` is
overridden for normal execution but we can eventually one day probably support
`RUSTC_WRAPPER`!
Alex Crichton [Wed, 5 Sep 2018 22:17:43 +0000 (15:17 -0700)]
fix: Fix unusual errors with `RUSTC_WRAPPER`
This commit fixes the interaction of `cargo fix` and `RUSTC_WRAPPER`, ensuring
that Cargo at least doesn't die internally. For now `RUSTC_WRAPPER` is
overridden for normal execution but we can eventually one day probably support
`RUSTC_WRAPPER`!
projects / cargo.git / log