Do not require stage 2 compiler for rustdoc#51436
Merged
bors merged 1 commit intorust-lang:masterfrom Jun 9, 2018
Merged
Conversation
Contributor
|
I'm not 100% solid on the internals of what's going on here, but it looks like that should do what you say. cc @kennytm for a second opinion. |
kennytm
approved these changes
Jun 8, 2018
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 721f2e7 has been approved by |
Collaborator
|
🌲 The tree is currently closed for pull requests below priority 1, this pull request will be tested once the tree is reopened |
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Jun 8, 2018
…Misdreavus Do not require stage 2 compiler for rustdoc r? @QuietMisdreavus Fixes rust-lang#51424 I *think* this is correct; though I'm not certain. If it passes CI though I expect that to be good enough...
bors
added a commit
that referenced
this pull request
Jun 8, 2018
Rollup of 13 pull requests Successful merges: - #50143 (Add deprecation lint for duplicated `macro_export`s) - #51099 (Fix Issue 38777) - #51276 (Dedup auto traits in trait objects.) - #51298 (Stabilize unit tests with non-`()` return type) - #51360 (Suggest parentheses when a struct literal needs them) - #51391 (Use spans pointing at the inside of a rustdoc attribute) - #51394 (Use scope tree depths to speed up `nearest_common_ancestor`.) - #51396 (Make the size of Option<NonZero*> a documented guarantee.) - #51401 (Warn on `repr` without hints) - #51412 (Avoid useless Vec clones in pending_obligations().) - #51427 (compiletest: autoremove duplicate .nll.* files (#51204)) - #51436 (Do not require stage 2 compiler for rustdoc) - #51437 (rustbuild: generate full list of dependencies for metadata) Failed merges:
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
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.
r? @QuietMisdreavus
Fixes #51424
I think this is correct; though I'm not certain. If it passes CI though I expect that to be good enough...