Merge pull request #2458 from fmease/followup-type-rustdoc-test-suite

Merge pull request #2458 from fmease/followup-type-rustdoc-test-suite #4930