[beta]: Fixup the 1.30.0 branch #6057
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
…hton Print file paths instead of file:// URLs. Fixes rust-lang#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.
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.
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`.
…alexcrichton Stabilize -Zcompile-progress. Closes rust-lang#2536.
This is an alternate approach to determining the window size that works on more Windows terminals. Terminals with accurate width detection: Normal Windows console, cmder, ConEmu, VS Code, Hyper, etc. mintty-based terminals will always be 60 characters wide. Cygwin in a command console is ok, but running under x-windows will also always be 60. Tested on Windows 8 and Windows 10. Closes rust-lang#5124.
Get window size on more Windows terminals. This is an alternate approach to determining the window size that works on more Windows terminals. Terminals with accurate width detection: Normal Windows console, cmder, ConEmu, VS Code, Hyper, etc. mintty-based terminals will always be 60 characters wide. Cygwin in a command console is ok, but running under x-windows will also always be 60. Tested on Windows 8 and Windows 10. Closes rust-lang#5124.
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.
Fix --document-private-items for multiple targets. Closes rust-lang#5958.
…crichton Validate that the package name contains no invalid characters. Fixes rust-lang#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.
|
@bors r+ |
|
📌 Commit a62aadb has been approved by |
bors
added a commit
that referenced
this pull request
Sep 19, 2018
[beta]: Fixup the 1.30.0 branch Reconciles data found in this comment rust-lang/rust#54342 (comment) 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! r? @ehuss
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reconciles data found in this comment rust-lang/rust#54342 (comment) 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-progressas well as a number of other nice fixes!r? @ehuss