rustdoc_json: more conversion cleanups#142896

nnethercote wants to merge 2 commits intorust-lang:masterrust-lang/rust:masterfrom

nnethercote:json-conversion-cleanups-2nnethercote/rust:json-conversion-cleanups-2Copy head branch name to clipboard