Don't generate empty json variables#59890
Merged
bors merged 1 commit intorust-lang:masterfrom Apr 14, 2019
Merged
Conversation
rust-highfive
added
the
S-waiting-on-review
jonas-schievink
added
the
T-rustdoc
Contributor
|
Won't this generate a bunch of errors when |
Member
Author
|
It's supposed to be checked in the JS. (I'll rerun it locally to be sure though) |
GuillaumeGomez
force-pushed
the
empty-json-variables
branch
from
34426ff to
796e6e3
Compare
Member
Author
|
You were absolutely right, I wasn't checking those variables. Shame on me! |
QuietMisdreavus
approved these changes
Apr 12, 2019
Contributor
QuietMisdreavus
left a comment
QuietMisdreavus
left a comment
There was a problem hiding this comment.
This looks good now, thanks! r=me when travis is green.
Member
Author
|
@bors: r=QuietMisdreavus |
Collaborator
|
📌 Commit 796e6e3 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Apr 13, 2019
…, r=QuietMisdreavus Don't generate empty json variables r? @rust-lang/rustdoc
Centril
added a commit
to Centril/rust
that referenced
this pull request
Apr 13, 2019
Rollup of 9 pull requests Successful merges: - rust-lang#59655 (Use a proc macro to declare preallocated symbols) - rust-lang#59769 (compiletest normalization: preserve non-JSON lines such as ICEs) - rust-lang#59776 (Apply resource-suffix to search-index and source-files scripts as well) - rust-lang#59784 (Suggest importing macros from the crate root) - rust-lang#59812 (Exclude profiler-generated symbols from MSVC __imp_-symbol workaround.) - rust-lang#59856 (update polonius-engine) - rust-lang#59874 (Clean up handling of `-Z pgo-gen` commandline option.) - rust-lang#59890 (Don't generate empty json variables) - rust-lang#59911 (Revert "compile crates under test w/ -Zemit-stack-sizes") Failed merges: r? @ghost
Centril
added a commit
to Centril/rust
that referenced
this pull request
Apr 13, 2019
…, r=QuietMisdreavus Don't generate empty json variables r? @rust-lang/rustdoc
Centril
added a commit
to Centril/rust
that referenced
this pull request
Apr 13, 2019
…, r=QuietMisdreavus Don't generate empty json variables r? @rust-lang/rustdoc
bors
added a commit
that referenced
this pull request
Apr 14, 2019
Rollup of 6 pull requests Successful merges: - #59776 (Apply resource-suffix to search-index and source-files scripts as well) - #59784 (Suggest importing macros from the crate root) - #59812 (Exclude profiler-generated symbols from MSVC __imp_-symbol workaround.) - #59874 (Clean up handling of `-Z pgo-gen` commandline option.) - #59890 (Don't generate empty json variables) - #59911 (Revert "compile crates under test w/ -Zemit-stack-sizes") Failed merges: r? @ghost
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
5 participants
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? @rust-lang/rustdoc