Skip to content

Don't generate empty json variables - #59890

Merged
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:empty-json-variables
Apr 14, 2019
Merged

Don't generate empty json variables#59890
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:empty-json-variables

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

r? @rust-lang/rustdoc

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 11, 2019
@jonas-schievinkjonas-schievink added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Apr 11, 2019
@QuietMisdreavus

Copy link
Copy Markdown
Contributor

Won't this generate a bunch of errors when source-script.js attempts to access these missing fields?

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

It's supposed to be checked in the JS. (I'll rerun it locally to be sure though)

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

You were absolutely right, I wasn't checking those variables. Shame on me!

@QuietMisdreavusQuietMisdreavus left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good now, thanks! r=me when travis is green.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r=QuietMisdreavus

@bors

bors commented Apr 12, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 796e6e3 has been approved by QuietMisdreavus

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 12, 2019
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
@CentrilCentril mentioned this pull request Apr 13, 2019
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
@CentrilCentril mentioned this pull request Apr 13, 2019
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
@CentrilCentril mentioned this pull request Apr 13, 2019
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
@bors
bors merged commit 796e6e3 into rust-lang:masterApr 14, 2019
@GuillaumeGomez
GuillaumeGomez deleted the empty-json-variables branch April 14, 2019 10:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@GuillaumeGomez@QuietMisdreavus@bors@jonas-schievink@rust-highfive