From: bors <bors@rust-lang.org>
Date: Mon, 20 Apr 2020 19:11:28 +0000 (+0000)
Subject: Auto merge of #71356 - Dylan-DPC:rollup-liockhk, r=Dylan-DPC
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=20fc02f836f3035b86b56a7cedb97c5cd4ed9612;p=rust.git

Auto merge of #71356 - Dylan-DPC:rollup-liockhk, r=Dylan-DPC

Rollup of 5 pull requests

Successful merges:

 - #71250 (Replace big JS dict with JSON parsing)
 - #71270 (Fix `has_no_input_arg` check and rename it to `has_only_self_parameter`)
 - #71284 (fix -Zast-json to output correct JSON form)
 - #71328 (Stabilize PathBuf capacity methods)
 - #71334 (Update pattern docs.)

Failed merges:

r? @ghost
---

20fc02f836f3035b86b56a7cedb97c5cd4ed9612