about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/librustc_errors/diagnostic_builder.rs3
-rw-r--r--src/librustc_errors/emitter.rs89
-rw-r--r--src/librustc_errors/lib.rs51
-rw-r--r--src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr2
-rw-r--r--src/test/ui-fulldeps/proc-macro/signature.stderr2
-rw-r--r--src/test/ui/anonymous-higher-ranked-lifetime.stderr2
-rw-r--r--src/test/ui/arbitrary-self-types-not-object-safe.stderr2
-rw-r--r--src/test/ui/asm-out-assign-imm.stderr2
-rw-r--r--src/test/ui/associated-const-impl-wrong-lifetime.stderr2
-rw-r--r--src/test/ui/associated-const-impl-wrong-type.stderr2
-rw-r--r--src/test/ui/associated-type-projection-from-multiple-supertraits.stderr4
-rw-r--r--src/test/ui/associated-types-ICE-when-projecting-out-of-err.stderr2
-rw-r--r--src/test/ui/associated-types-in-ambiguous-context.stderr2
-rw-r--r--src/test/ui/attr-usage-repr.stderr2
-rw-r--r--src/test/ui/augmented-assignments.stderr4
-rw-r--r--src/test/ui/binary-op-on-double-ref.stderr2
-rw-r--r--src/test/ui/blind-item-item-shadow.stderr2
-rw-r--r--src/test/ui/block-result/block-must-not-have-result-do.stderr2
-rw-r--r--src/test/ui/block-result/block-must-not-have-result-res.stderr2
-rw-r--r--src/test/ui/block-result/block-must-not-have-result-while.stderr2
-rw-r--r--src/test/ui/block-result/consider-removing-last-semi.stderr2
-rw-r--r--src/test/ui/block-result/issue-11714.stderr2
-rw-r--r--src/test/ui/block-result/issue-13428.stderr2
-rw-r--r--src/test/ui/block-result/issue-13624.stderr2
-rw-r--r--src/test/ui/block-result/issue-20862.stderr4
-rw-r--r--src/test/ui/block-result/issue-22645.stderr4
-rw-r--r--src/test/ui/block-result/issue-3563.stderr2
-rw-r--r--src/test/ui/block-result/issue-5500.stderr2
-rw-r--r--src/test/ui/block-result/unexpected-return-on-unit.stderr2
-rw-r--r--src/test/ui/bogus-tag.stderr2
-rw-r--r--src/test/ui/borrowck/borrowck-box-insensitivity.stderr4
-rw-r--r--src/test/ui/borrowck/borrowck-closures-two-mut.stderr2
-rw-r--r--src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr2
-rw-r--r--src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr2
-rw-r--r--src/test/ui/borrowck/borrowck-in-static.stderr2
-rw-r--r--src/test/ui/borrowck/borrowck-move-error-with-note.stderr4
-rw-r--r--src/test/ui/borrowck/borrowck-move-out-of-vec-tail.stderr2
-rw-r--r--src/test/ui/borrowck/borrowck-reinit.stderr2
-rw-r--r--src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr4
-rw-r--r--src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr4
-rw-r--r--src/test/ui/borrowck/immutable-arg.stderr2
-rw-r--r--src/test/ui/borrowck/issue-41962.stderr2
-rw-r--r--src/test/ui/borrowck/mut-borrow-in-loop.stderr2
-rw-r--r--src/test/ui/borrowck/mut-borrow-outside-loop.stderr2
-rw-r--r--src/test/ui/borrowck/regions-bound-missing-bound-in-impl.stderr4
-rw-r--r--src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr2
-rw-r--r--src/test/ui/cast-as-bool.stderr2
-rw-r--r--src/test/ui/cast-errors-issue-43825.stderr2
-rw-r--r--src/test/ui/cast-rfc0401-2.stderr2
-rw-r--r--src/test/ui/cast-to-unsized-trait-object-suggestion.stderr2
-rw-r--r--src/test/ui/casts-differing-anon.stderr2
-rw-r--r--src/test/ui/casts-issue-46365.stderr2
-rw-r--r--src/test/ui/changing-crates.stderr2
-rw-r--r--src/test/ui/check_match/issue-35609.stderr2
-rw-r--r--src/test/ui/closure-expected-type/expect-region-supply-region.stderr2
-rw-r--r--src/test/ui/closure_context/issue-26046-fn-mut.stderr2
-rw-r--r--src/test/ui/closure_context/issue-26046-fn-once.stderr2
-rw-r--r--src/test/ui/closure_context/issue-42065.stderr2
-rw-r--r--src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr2
-rw-r--r--src/test/ui/codemap_tests/empty_span.stderr2
-rw-r--r--src/test/ui/codemap_tests/huge_multispan_highlight.stderr2
-rw-r--r--src/test/ui/codemap_tests/issue-11715.stderr2
-rw-r--r--src/test/ui/codemap_tests/issue-28308.stderr2
-rw-r--r--src/test/ui/codemap_tests/one_line.stderr2
-rw-r--r--src/test/ui/codemap_tests/overlapping_inherent_impls.stderr2
-rw-r--r--src/test/ui/codemap_tests/overlapping_spans.stderr2
-rw-r--r--src/test/ui/codemap_tests/tab.stderr4
-rw-r--r--src/test/ui/codemap_tests/tab_3.stderr2
-rw-r--r--src/test/ui/codemap_tests/two_files.stderr1
-rw-r--r--src/test/ui/codemap_tests/unicode_2.stderr2
-rw-r--r--src/test/ui/coercion-missing-tail-expected-type.stderr2
-rw-r--r--src/test/ui/coherence-error-suppression.stderr2
-rw-r--r--src/test/ui/coherence-impls-copy.stderr4
-rw-r--r--src/test/ui/coherence-overlap-downstream-inherent.stderr2
-rw-r--r--src/test/ui/coherence-overlap-downstream.stderr2
-rw-r--r--src/test/ui/coherence-overlap-issue-23516-inherent.stderr2
-rw-r--r--src/test/ui/coherence-overlap-issue-23516.stderr2
-rw-r--r--src/test/ui/coherence-overlap-upstream-inherent.stderr2
-rw-r--r--src/test/ui/coherence-overlap-upstream.stderr2
-rw-r--r--src/test/ui/command-line-diagnostics.stderr2
-rw-r--r--src/test/ui/compare-method/proj-outlives-region.stderr2
-rw-r--r--src/test/ui/compare-method/region-extra-2.stderr2
-rw-r--r--src/test/ui/compare-method/region-extra.stderr2
-rw-r--r--src/test/ui/compare-method/region-unrelated.stderr2
-rw-r--r--src/test/ui/compare-method/reordered-type-param.stderr2
-rw-r--r--src/test/ui/compare-method/trait-bound-on-type-parameter.stderr2
-rw-r--r--src/test/ui/compare-method/traits-misc-mismatch-1.stderr2
-rw-r--r--src/test/ui/compare-method/traits-misc-mismatch-2.stderr2
-rw-r--r--src/test/ui/const-deref-ptr.stderr2
-rw-r--r--src/test/ui/const-eval-overflow-2.stderr2
-rw-r--r--src/test/ui/const-eval-overflow-4.stderr2
-rw-r--r--src/test/ui/const-eval-span.stderr2
-rw-r--r--src/test/ui/const-eval/conditional_array_execution.stderr2
-rw-r--r--src/test/ui/const-eval/index_out_of_bound.stderr2
-rw-r--r--src/test/ui/const-eval/issue-43197.stderr2
-rw-r--r--src/test/ui/const-fn-error.stderr4
-rw-r--r--src/test/ui/const-fn-mismatch.stderr2
-rw-r--r--src/test/ui/const-fn-not-in-trait.stderr2
-rw-r--r--src/test/ui/const-len-underflow-separate-spans.stderr2
-rw-r--r--src/test/ui/const-pattern-irrefutable.stderr2
-rw-r--r--src/test/ui/const-unsized.stderr2
-rw-r--r--src/test/ui/cycle-trait-supertrait-indirect.stderr2
-rw-r--r--src/test/ui/deref-suggestion.stderr2
-rw-r--r--src/test/ui/derived-errors/issue-31997-1.stderr2
-rw-r--r--src/test/ui/did_you_mean/E0178.stderr2
-rw-r--r--src/test/ui/did_you_mean/bad-assoc-pat.stderr2
-rw-r--r--src/test/ui/did_you_mean/bad-assoc-ty.stderr4
-rw-r--r--src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-31424.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-34126.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-34337.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-35937.stderr4
-rw-r--r--src/test/ui/did_you_mean/issue-36798.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-36798_unknown_field.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-37139.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-38147-1.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-38147-2.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-38147-3.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-38147-4.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-39544.stderr4
-rw-r--r--src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-40006.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-40823.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr4
-rw-r--r--src/test/ui/did_you_mean/issue-42764.stderr2
-rw-r--r--src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr4
-rw-r--r--src/test/ui/did_you_mean/recursion_limit.stderr2
-rw-r--r--src/test/ui/did_you_mean/recursion_limit_deref.stderr4
-rw-r--r--src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr4
-rw-r--r--src/test/ui/discrim-overflow-2.stderr2
-rw-r--r--src/test/ui/discrim-overflow.stderr2
-rw-r--r--src/test/ui/double-import.stderr2
-rw-r--r--src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr2
-rw-r--r--src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr2
-rw-r--r--src/test/ui/dropck/dropck-eyepatch-reorder.stderr2
-rw-r--r--src/test/ui/dropck/dropck-eyepatch.stderr2
-rw-r--r--src/test/ui/e0119/complex-impl.stderr4
-rw-r--r--src/test/ui/e0119/conflict-with-std.stderr2
-rw-r--r--src/test/ui/e0119/issue-23563.stderr2
-rw-r--r--src/test/ui/e0119/issue-27403.stderr2
-rw-r--r--src/test/ui/e0119/issue-28981.stderr4
-rw-r--r--src/test/ui/e0119/so-37347311.stderr2
-rw-r--r--src/test/ui/empty-struct-unit-expr.stderr2
-rw-r--r--src/test/ui/enum-and-module-in-same-scope.stderr2
-rw-r--r--src/test/ui/error-codes/E0004-2.stderr2
-rw-r--r--src/test/ui/error-codes/E0004.stderr2
-rw-r--r--src/test/ui/error-codes/E0005.stderr2
-rw-r--r--src/test/ui/error-codes/E0007.stderr4
-rw-r--r--src/test/ui/error-codes/E0008.stderr2
-rw-r--r--src/test/ui/error-codes/E0009.stderr2
-rw-r--r--src/test/ui/error-codes/E0010-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0010.stderr2
-rw-r--r--src/test/ui/error-codes/E0017.stderr4
-rw-r--r--src/test/ui/error-codes/E0023.stderr2
-rw-r--r--src/test/ui/error-codes/E0025.stderr2
-rw-r--r--src/test/ui/error-codes/E0026-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0026.stderr2
-rw-r--r--src/test/ui/error-codes/E0027-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0027.stderr2
-rw-r--r--src/test/ui/error-codes/E0029-teach.stderr4
-rw-r--r--src/test/ui/error-codes/E0029.stderr4
-rw-r--r--src/test/ui/error-codes/E0030-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0030.stderr2
-rw-r--r--src/test/ui/error-codes/E0033-teach.stderr4
-rw-r--r--src/test/ui/error-codes/E0033.stderr4
-rw-r--r--src/test/ui/error-codes/E0034.stderr2
-rw-r--r--src/test/ui/error-codes/E0038.stderr2
-rw-r--r--src/test/ui/error-codes/E0040.stderr2
-rw-r--r--src/test/ui/error-codes/E0044.stderr2
-rw-r--r--src/test/ui/error-codes/E0045.stderr2
-rw-r--r--src/test/ui/error-codes/E0049.stderr2
-rw-r--r--src/test/ui/error-codes/E0050.stderr2
-rw-r--r--src/test/ui/error-codes/E0054.stderr2
-rw-r--r--src/test/ui/error-codes/E0055.stderr2
-rw-r--r--src/test/ui/error-codes/E0057.stderr2
-rw-r--r--src/test/ui/error-codes/E0059.stderr2
-rw-r--r--src/test/ui/error-codes/E0060.stderr2
-rw-r--r--src/test/ui/error-codes/E0061.stderr2
-rw-r--r--src/test/ui/error-codes/E0062.stderr2
-rw-r--r--src/test/ui/error-codes/E0063.stderr2
-rw-r--r--src/test/ui/error-codes/E0067.stderr4
-rw-r--r--src/test/ui/error-codes/E0069.stderr2
-rw-r--r--src/test/ui/error-codes/E0070.stderr4
-rw-r--r--src/test/ui/error-codes/E0071.stderr2
-rw-r--r--src/test/ui/error-codes/E0075.stderr2
-rw-r--r--src/test/ui/error-codes/E0076.stderr2
-rw-r--r--src/test/ui/error-codes/E0077.stderr2
-rw-r--r--src/test/ui/error-codes/E0080.stderr2
-rw-r--r--src/test/ui/error-codes/E0081.stderr2
-rw-r--r--src/test/ui/error-codes/E0084.stderr2
-rw-r--r--src/test/ui/error-codes/E0087.stderr2
-rw-r--r--src/test/ui/error-codes/E0088.stderr2
-rw-r--r--src/test/ui/error-codes/E0089.stderr2
-rw-r--r--src/test/ui/error-codes/E0090.stderr2
-rw-r--r--src/test/ui/error-codes/E0091.stderr2
-rw-r--r--src/test/ui/error-codes/E0092.stderr2
-rw-r--r--src/test/ui/error-codes/E0093.stderr2
-rw-r--r--src/test/ui/error-codes/E0094.stderr2
-rw-r--r--src/test/ui/error-codes/E0106.stderr2
-rw-r--r--src/test/ui/error-codes/E0107.stderr2
-rw-r--r--src/test/ui/error-codes/E0109.stderr2
-rw-r--r--src/test/ui/error-codes/E0110.stderr2
-rw-r--r--src/test/ui/error-codes/E0116.stderr2
-rw-r--r--src/test/ui/error-codes/E0117.stderr4
-rw-r--r--src/test/ui/error-codes/E0118.stderr2
-rw-r--r--src/test/ui/error-codes/E0119.stderr2
-rw-r--r--src/test/ui/error-codes/E0120.stderr2
-rw-r--r--src/test/ui/error-codes/E0121.stderr2
-rw-r--r--src/test/ui/error-codes/E0124.stderr2
-rw-r--r--src/test/ui/error-codes/E0128.stderr2
-rw-r--r--src/test/ui/error-codes/E0130.stderr2
-rw-r--r--src/test/ui/error-codes/E0131.stderr2
-rw-r--r--src/test/ui/error-codes/E0132.stderr2
-rw-r--r--src/test/ui/error-codes/E0133.stderr2
-rw-r--r--src/test/ui/error-codes/E0137.stderr2
-rw-r--r--src/test/ui/error-codes/E0138.stderr2
-rw-r--r--src/test/ui/error-codes/E0152.stderr2
-rw-r--r--src/test/ui/error-codes/E0161.stderr4
-rw-r--r--src/test/ui/error-codes/E0162.stderr2
-rw-r--r--src/test/ui/error-codes/E0164.stderr2
-rw-r--r--src/test/ui/error-codes/E0165.stderr2
-rw-r--r--src/test/ui/error-codes/E0184.stderr2
-rw-r--r--src/test/ui/error-codes/E0185.stderr2
-rw-r--r--src/test/ui/error-codes/E0186.stderr2
-rw-r--r--src/test/ui/error-codes/E0191.stderr2
-rw-r--r--src/test/ui/error-codes/E0192.stderr2
-rw-r--r--src/test/ui/error-codes/E0194.stderr2
-rw-r--r--src/test/ui/error-codes/E0195.stderr2
-rw-r--r--src/test/ui/error-codes/E0197.stderr2
-rw-r--r--src/test/ui/error-codes/E0198.stderr2
-rw-r--r--src/test/ui/error-codes/E0199.stderr2
-rw-r--r--src/test/ui/error-codes/E0200.stderr2
-rw-r--r--src/test/ui/error-codes/E0201.stderr2
-rw-r--r--src/test/ui/error-codes/E0206.stderr4
-rw-r--r--src/test/ui/error-codes/E0207.stderr2
-rw-r--r--src/test/ui/error-codes/E0214.stderr2
-rw-r--r--src/test/ui/error-codes/E0220.stderr4
-rw-r--r--src/test/ui/error-codes/E0221.stderr2
-rw-r--r--src/test/ui/error-codes/E0223.stderr2
-rw-r--r--src/test/ui/error-codes/E0225.stderr2
-rw-r--r--src/test/ui/error-codes/E0229.stderr2
-rw-r--r--src/test/ui/error-codes/E0232.stderr2
-rw-r--r--src/test/ui/error-codes/E0243.stderr2
-rw-r--r--src/test/ui/error-codes/E0244.stderr2
-rw-r--r--src/test/ui/error-codes/E0252.stderr2
-rw-r--r--src/test/ui/error-codes/E0253.stderr2
-rw-r--r--src/test/ui/error-codes/E0254.stderr2
-rw-r--r--src/test/ui/error-codes/E0255.stderr2
-rw-r--r--src/test/ui/error-codes/E0259.stderr2
-rw-r--r--src/test/ui/error-codes/E0260.stderr2
-rw-r--r--src/test/ui/error-codes/E0261.stderr2
-rw-r--r--src/test/ui/error-codes/E0262.stderr2
-rw-r--r--src/test/ui/error-codes/E0263.stderr2
-rw-r--r--src/test/ui/error-codes/E0264.stderr2
-rw-r--r--src/test/ui/error-codes/E0267.stderr2
-rw-r--r--src/test/ui/error-codes/E0268.stderr2
-rw-r--r--src/test/ui/error-codes/E0271.stderr2
-rw-r--r--src/test/ui/error-codes/E0275.stderr2
-rw-r--r--src/test/ui/error-codes/E0276.stderr2
-rw-r--r--src/test/ui/error-codes/E0277-2.stderr2
-rw-r--r--src/test/ui/error-codes/E0277.stderr2
-rw-r--r--src/test/ui/error-codes/E0282.stderr2
-rw-r--r--src/test/ui/error-codes/E0283.stderr2
-rw-r--r--src/test/ui/error-codes/E0296.stderr2
-rw-r--r--src/test/ui/error-codes/E0297.stderr2
-rw-r--r--src/test/ui/error-codes/E0301.stderr2
-rw-r--r--src/test/ui/error-codes/E0302.stderr2
-rw-r--r--src/test/ui/error-codes/E0303.stderr4
-rw-r--r--src/test/ui/error-codes/E0308-4.stderr2
-rw-r--r--src/test/ui/error-codes/E0308.stderr2
-rw-r--r--src/test/ui/error-codes/E0365.stderr2
-rw-r--r--src/test/ui/error-codes/E0370.stderr2
-rw-r--r--src/test/ui/error-codes/E0374.stderr2
-rw-r--r--src/test/ui/error-codes/E0375.stderr2
-rw-r--r--src/test/ui/error-codes/E0376.stderr2
-rw-r--r--src/test/ui/error-codes/E0388.stderr4
-rw-r--r--src/test/ui/error-codes/E0389.stderr2
-rw-r--r--src/test/ui/error-codes/E0390.stderr2
-rw-r--r--src/test/ui/error-codes/E0392.stderr2
-rw-r--r--src/test/ui/error-codes/E0393.stderr2
-rw-r--r--src/test/ui/error-codes/E0394.stderr2
-rw-r--r--src/test/ui/error-codes/E0395.stderr2
-rw-r--r--src/test/ui/error-codes/E0396.stderr2
-rw-r--r--src/test/ui/error-codes/E0401.stderr2
-rw-r--r--src/test/ui/error-codes/E0403.stderr2
-rw-r--r--src/test/ui/error-codes/E0404.stderr1
-rw-r--r--src/test/ui/error-codes/E0405.stderr1
-rw-r--r--src/test/ui/error-codes/E0407.stderr2
-rw-r--r--src/test/ui/error-codes/E0408.stderr2
-rw-r--r--src/test/ui/error-codes/E0411.stderr2
-rw-r--r--src/test/ui/error-codes/E0412.stderr2
-rw-r--r--src/test/ui/error-codes/E0415.stderr2
-rw-r--r--src/test/ui/error-codes/E0416.stderr2
-rw-r--r--src/test/ui/error-codes/E0423.stderr2
-rw-r--r--src/test/ui/error-codes/E0424.stderr2
-rw-r--r--src/test/ui/error-codes/E0425.stderr2
-rw-r--r--src/test/ui/error-codes/E0426.stderr2
-rw-r--r--src/test/ui/error-codes/E0428.stderr2
-rw-r--r--src/test/ui/error-codes/E0429.stderr2
-rw-r--r--src/test/ui/error-codes/E0430.stderr4
-rw-r--r--src/test/ui/error-codes/E0431.stderr2
-rw-r--r--src/test/ui/error-codes/E0432.stderr2
-rw-r--r--src/test/ui/error-codes/E0433.stderr2
-rw-r--r--src/test/ui/error-codes/E0434.stderr2
-rw-r--r--src/test/ui/error-codes/E0435.stderr2
-rw-r--r--src/test/ui/error-codes/E0437.stderr2
-rw-r--r--src/test/ui/error-codes/E0438.stderr2
-rw-r--r--src/test/ui/error-codes/E0439.stderr2
-rw-r--r--src/test/ui/error-codes/E0440.stderr2
-rw-r--r--src/test/ui/error-codes/E0441.stderr2
-rw-r--r--src/test/ui/error-codes/E0442.stderr2
-rw-r--r--src/test/ui/error-codes/E0443.stderr2
-rw-r--r--src/test/ui/error-codes/E0444.stderr2
-rw-r--r--src/test/ui/error-codes/E0445.stderr2
-rw-r--r--src/test/ui/error-codes/E0446.stderr2
-rw-r--r--src/test/ui/error-codes/E0449.stderr2
-rw-r--r--src/test/ui/error-codes/E0451.stderr2
-rw-r--r--src/test/ui/error-codes/E0452.stderr2
-rw-r--r--src/test/ui/error-codes/E0453.stderr2
-rw-r--r--src/test/ui/error-codes/E0454.stderr2
-rw-r--r--src/test/ui/error-codes/E0458.stderr4
-rw-r--r--src/test/ui/error-codes/E0459.stderr2
-rw-r--r--src/test/ui/error-codes/E0463.stderr2
-rw-r--r--src/test/ui/error-codes/E0478.stderr2
-rw-r--r--src/test/ui/error-codes/E0492.stderr2
-rw-r--r--src/test/ui/error-codes/E0494.stderr2
-rw-r--r--src/test/ui/error-codes/E0496.stderr2
-rw-r--r--src/test/ui/error-codes/E0499.stderr2
-rw-r--r--src/test/ui/error-codes/E0502.stderr2
-rw-r--r--src/test/ui/error-codes/E0503.stderr2
-rw-r--r--src/test/ui/error-codes/E0504.stderr2
-rw-r--r--src/test/ui/error-codes/E0505.stderr2
-rw-r--r--src/test/ui/error-codes/E0507.stderr2
-rw-r--r--src/test/ui/error-codes/E0509.stderr2
-rw-r--r--src/test/ui/error-codes/E0511.stderr2
-rw-r--r--src/test/ui/error-codes/E0512.stderr2
-rw-r--r--src/test/ui/error-codes/E0516.stderr2
-rw-r--r--src/test/ui/error-codes/E0517.stderr2
-rw-r--r--src/test/ui/error-codes/E0518.stderr2
-rw-r--r--src/test/ui/error-codes/E0520.stderr2
-rw-r--r--src/test/ui/error-codes/E0522.stderr4
-rw-r--r--src/test/ui/error-codes/E0527.stderr2
-rw-r--r--src/test/ui/error-codes/E0528.stderr2
-rw-r--r--src/test/ui/error-codes/E0529.stderr2
-rw-r--r--src/test/ui/error-codes/E0530.stderr2
-rw-r--r--src/test/ui/error-codes/E0532.stderr2
-rw-r--r--src/test/ui/error-codes/E0534.stderr2
-rw-r--r--src/test/ui/error-codes/E0558.stderr2
-rw-r--r--src/test/ui/error-codes/E0559.stderr2
-rw-r--r--src/test/ui/error-codes/E0560.stderr2
-rw-r--r--src/test/ui/error-codes/E0565-1.stderr2
-rw-r--r--src/test/ui/error-codes/E0565.stderr2
-rw-r--r--src/test/ui/error-codes/E0572.stderr2
-rw-r--r--src/test/ui/error-codes/E0582.stderr2
-rw-r--r--src/test/ui/error-codes/E0585.stderr2
-rw-r--r--src/test/ui/error-codes/E0586.stderr2
-rw-r--r--src/test/ui/error-codes/E0597.stderr2
-rw-r--r--src/test/ui/error-codes/E0599.stderr2
-rw-r--r--src/test/ui/error-codes/E0600.stderr2
-rw-r--r--src/test/ui/error-codes/E0602.stderr2
-rw-r--r--src/test/ui/error-codes/E0603.stderr2
-rw-r--r--src/test/ui/error-codes/E0604.stderr2
-rw-r--r--src/test/ui/error-codes/E0605.stderr2
-rw-r--r--src/test/ui/error-codes/E0606.stderr2
-rw-r--r--src/test/ui/error-codes/E0607.stderr2
-rw-r--r--src/test/ui/error-codes/E0608.stderr2
-rw-r--r--src/test/ui/error-codes/E0609.stderr2
-rw-r--r--src/test/ui/error-codes/E0610.stderr2
-rw-r--r--src/test/ui/error-codes/E0611.stderr2
-rw-r--r--src/test/ui/error-codes/E0612.stderr2
-rw-r--r--src/test/ui/error-codes/E0614.stderr2
-rw-r--r--src/test/ui/error-codes/E0615.stderr2
-rw-r--r--src/test/ui/error-codes/E0616.stderr2
-rw-r--r--src/test/ui/error-codes/E0617.stderr2
-rw-r--r--src/test/ui/error-codes/E0618.stderr2
-rw-r--r--src/test/ui/error-codes/E0620.stderr2
-rw-r--r--src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr2
-rw-r--r--src/test/ui/error-codes/E0622.stderr2
-rw-r--r--src/test/ui/error-codes/E0624.stderr2
-rw-r--r--src/test/ui/error-codes/E0637.stderr2
-rw-r--r--src/test/ui/error-codes/E0657.stderr2
-rw-r--r--src/test/ui/error-codes/E0658.stderr2
-rw-r--r--src/test/ui/error-codes/E0659.stderr2
-rw-r--r--src/test/ui/error-festival.stderr4
-rw-r--r--src/test/ui/fat-ptr-cast.stderr4
-rw-r--r--src/test/ui/feature-gate-abi-msp430-interrupt.stderr2
-rw-r--r--src/test/ui/feature-gate-abi.stderr2
-rw-r--r--src/test/ui/feature-gate-abi_unadjusted.stderr2
-rw-r--r--src/test/ui/feature-gate-advanced-slice-features.stderr2
-rw-r--r--src/test/ui/feature-gate-allocator_internals.stderr2
-rw-r--r--src/test/ui/feature-gate-allow-internal-unsafe-nested-macro.stderr2
-rw-r--r--src/test/ui/feature-gate-allow-internal-unstable-nested-macro.stderr2
-rw-r--r--src/test/ui/feature-gate-allow-internal-unstable-struct.stderr2
-rw-r--r--src/test/ui/feature-gate-allow-internal-unstable.stderr2
-rw-r--r--src/test/ui/feature-gate-allow_fail.stderr2
-rw-r--r--src/test/ui/feature-gate-arbitrary-self-types.stderr2
-rw-r--r--src/test/ui/feature-gate-arbitrary_self_types-raw-pointer.stderr2
-rw-r--r--src/test/ui/feature-gate-asm.stderr2
-rw-r--r--src/test/ui/feature-gate-asm2.stderr2
-rw-r--r--src/test/ui/feature-gate-assoc-type-defaults.stderr2
-rw-r--r--src/test/ui/feature-gate-box-expr.stderr2
-rw-r--r--src/test/ui/feature-gate-box_patterns.stderr2
-rw-r--r--src/test/ui/feature-gate-box_syntax.stderr2
-rw-r--r--src/test/ui/feature-gate-catch_expr.stderr2
-rw-r--r--src/test/ui/feature-gate-cfg-target-feature.stderr2
-rw-r--r--src/test/ui/feature-gate-cfg-target-has-atomic.stderr2
-rw-r--r--src/test/ui/feature-gate-cfg-target-thread-local.stderr2
-rw-r--r--src/test/ui/feature-gate-cfg-target-vendor.stderr2
-rw-r--r--src/test/ui/feature-gate-clone-closures.stderr2
-rw-r--r--src/test/ui/feature-gate-compiler-builtins.stderr2
-rw-r--r--src/test/ui/feature-gate-concat_idents.stderr2
-rw-r--r--src/test/ui/feature-gate-concat_idents2.stderr2
-rw-r--r--src/test/ui/feature-gate-concat_idents3.stderr2
-rw-r--r--src/test/ui/feature-gate-conservative_impl_trait.stderr2
-rw-r--r--src/test/ui/feature-gate-const_fn.stderr4
-rw-r--r--src/test/ui/feature-gate-copy-closures.stderr2
-rw-r--r--src/test/ui/feature-gate-crate_in_paths.stderr2
-rw-r--r--src/test/ui/feature-gate-crate_visibility_modifier.stderr2
-rw-r--r--src/test/ui/feature-gate-custom_attribute.stderr2
-rw-r--r--src/test/ui/feature-gate-custom_attribute2.stderr2
-rw-r--r--src/test/ui/feature-gate-custom_derive.stderr2
-rw-r--r--src/test/ui/feature-gate-decl_macro.stderr2
-rw-r--r--src/test/ui/feature-gate-doc_cfg.stderr2
-rw-r--r--src/test/ui/feature-gate-doc_masked.stderr2
-rw-r--r--src/test/ui/feature-gate-doc_spotlight.stderr2
-rw-r--r--src/test/ui/feature-gate-dotdoteq_in_patterns.stderr2
-rw-r--r--src/test/ui/feature-gate-dropck-ugeh.stderr2
-rw-r--r--src/test/ui/feature-gate-dyn-trait.stderr2
-rw-r--r--src/test/ui/feature-gate-exclusive-range-pattern.stderr2
-rw-r--r--src/test/ui/feature-gate-extern_absolute_paths.stderr4
-rw-r--r--src/test/ui/feature-gate-extern_in_paths.stderr2
-rw-r--r--src/test/ui/feature-gate-extern_types.stderr2
-rw-r--r--src/test/ui/feature-gate-external_doc.stderr2
-rw-r--r--src/test/ui/feature-gate-fundamental.stderr2
-rw-r--r--src/test/ui/feature-gate-generators.stderr2
-rw-r--r--src/test/ui/feature-gate-generic_associated_types.stderr2
-rw-r--r--src/test/ui/feature-gate-generic_param_attrs.stderr2
-rw-r--r--src/test/ui/feature-gate-global_allocator.stderr2
-rw-r--r--src/test/ui/feature-gate-global_asm.stderr2
-rw-r--r--src/test/ui/feature-gate-i128_type.stderr2
-rw-r--r--src/test/ui/feature-gate-i128_type2.stderr4
-rw-r--r--src/test/ui/feature-gate-if_while_or_patterns.stderr2
-rw-r--r--src/test/ui/feature-gate-in_band_lifetimes.stderr2
-rw-r--r--src/test/ui/feature-gate-intrinsics.stderr2
-rw-r--r--src/test/ui/feature-gate-lang-items.stderr2
-rw-r--r--src/test/ui/feature-gate-link_args.stderr2
-rw-r--r--src/test/ui/feature-gate-link_cfg.stderr2
-rw-r--r--src/test/ui/feature-gate-link_llvm_intrinsics.stderr2
-rw-r--r--src/test/ui/feature-gate-linkage.stderr2
-rw-r--r--src/test/ui/feature-gate-linker-flavor.stderr2
-rw-r--r--src/test/ui/feature-gate-log_syntax.stderr2
-rw-r--r--src/test/ui/feature-gate-log_syntax2.stderr2
-rw-r--r--src/test/ui/feature-gate-macro-lifetime-matcher.stderr2
-rw-r--r--src/test/ui/feature-gate-macro-vis-matcher.stderr2
-rw-r--r--src/test/ui/feature-gate-macro_at_most_once_rep.stderr2
-rw-r--r--src/test/ui/feature-gate-main.stderr2
-rw-r--r--src/test/ui/feature-gate-match_default_bindings.stderr2
-rw-r--r--src/test/ui/feature-gate-may-dangle.stderr2
-rw-r--r--src/test/ui/feature-gate-naked_functions.stderr2
-rw-r--r--src/test/ui/feature-gate-needs-allocator.stderr2
-rw-r--r--src/test/ui/feature-gate-negate-unsigned.stderr2
-rw-r--r--src/test/ui/feature-gate-never_type.stderr2
-rw-r--r--src/test/ui/feature-gate-nll.stderr2
-rw-r--r--src/test/ui/feature-gate-no-debug.stderr2
-rw-r--r--src/test/ui/feature-gate-no_core.stderr2
-rw-r--r--src/test/ui/feature-gate-non_ascii_idents.stderr2
-rw-r--r--src/test/ui/feature-gate-non_exhaustive.stderr2
-rw-r--r--src/test/ui/feature-gate-omit-gdb-pretty-printer-section.stderr2
-rw-r--r--src/test/ui/feature-gate-on-unimplemented.stderr2
-rw-r--r--src/test/ui/feature-gate-optin-builtin-traits.stderr2
-rw-r--r--src/test/ui/feature-gate-overlapping_marker_traits.stderr2
-rw-r--r--src/test/ui/feature-gate-pattern_parentheses.stderr2
-rw-r--r--src/test/ui/feature-gate-placement-expr.stderr2
-rw-r--r--src/test/ui/feature-gate-plugin.stderr2
-rw-r--r--src/test/ui/feature-gate-plugin_registrar.stderr2
-rw-r--r--src/test/ui/feature-gate-prelude_import.stderr2
-rw-r--r--src/test/ui/feature-gate-profiler-runtime.stderr2
-rw-r--r--src/test/ui/feature-gate-repr-simd.stderr2
-rw-r--r--src/test/ui/feature-gate-repr128.stderr2
-rw-r--r--src/test/ui/feature-gate-repr_transparent.stderr2
-rw-r--r--src/test/ui/feature-gate-rustc-attrs.stderr2
-rw-r--r--src/test/ui/feature-gate-rustc_const_unstable.stderr2
-rw-r--r--src/test/ui/feature-gate-sanitizer-runtime.stderr2
-rw-r--r--src/test/ui/feature-gate-simd.stderr2
-rw-r--r--src/test/ui/feature-gate-slice-patterns.stderr2
-rw-r--r--src/test/ui/feature-gate-start.stderr2
-rw-r--r--src/test/ui/feature-gate-static-nobundle.stderr2
-rw-r--r--src/test/ui/feature-gate-stmt_expr_attributes.stderr2
-rw-r--r--src/test/ui/feature-gate-target_feature.stderr2
-rw-r--r--src/test/ui/feature-gate-thread_local.stderr2
-rw-r--r--src/test/ui/feature-gate-trace_macros.stderr2
-rw-r--r--src/test/ui/feature-gate-type_ascription.stderr2
-rw-r--r--src/test/ui/feature-gate-unboxed-closures-manual-impls.stderr2
-rw-r--r--src/test/ui/feature-gate-unboxed-closures-method-calls.stderr2
-rw-r--r--src/test/ui/feature-gate-unboxed-closures-ufcs-calls.stderr2
-rw-r--r--src/test/ui/feature-gate-unboxed-closures.stderr2
-rw-r--r--src/test/ui/feature-gate-underscore-lifetimes.stderr2
-rw-r--r--src/test/ui/feature-gate-universal.stderr2
-rw-r--r--src/test/ui/feature-gate-unsized_tuple_coercion.stderr2
-rw-r--r--src/test/ui/feature-gate-untagged_unions.stderr2
-rw-r--r--src/test/ui/feature-gate-unwind-attributes.stderr2
-rw-r--r--src/test/ui/feature-gate-used.stderr2
-rw-r--r--src/test/ui/feature-gate/issue-43106-gating-of-bench.stderr2
-rw-r--r--src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr4
-rw-r--r--src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr2
-rw-r--r--src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr2
-rw-r--r--src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr2
-rw-r--r--src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr2
-rw-r--r--src/test/ui/feature-gate/issue-43106-gating-of-test.stderr2
-rw-r--r--src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr2
-rw-r--r--src/test/ui/fmt/send-sync.stderr2
-rw-r--r--src/test/ui/generator/auto-trait-regions.stderr4
-rw-r--r--src/test/ui/generator/borrowing.stderr2
-rw-r--r--src/test/ui/generator/dropck.stderr2
-rw-r--r--src/test/ui/generator/generator-with-nll.stderr2
-rw-r--r--src/test/ui/generator/issue-48048.stderr2
-rw-r--r--src/test/ui/generator/no-arguments-on-generators.stderr2
-rw-r--r--src/test/ui/generator/not-send-sync.stderr2
-rw-r--r--src/test/ui/generator/pattern-borrow.stderr2
-rw-r--r--src/test/ui/generator/ref-escapes-but-not-over-yield.stderr2
-rw-r--r--src/test/ui/generator/sized-yield.stderr2
-rw-r--r--src/test/ui/generator/unsafe-immovable.stderr2
-rw-r--r--src/test/ui/generator/yield-in-args.stderr2
-rw-r--r--src/test/ui/generator/yield-in-const.stderr4
-rw-r--r--src/test/ui/generator/yield-in-function.stderr2
-rw-r--r--src/test/ui/generator/yield-in-static.stderr4
-rw-r--r--src/test/ui/generator/yield-while-iterating.stderr4
-rw-r--r--src/test/ui/generator/yield-while-local-borrowed.stderr2
-rw-r--r--src/test/ui/generator/yield-while-ref-reborrowed.stderr2
-rw-r--r--src/test/ui/generic-type-less-params-with-defaults.stderr2
-rw-r--r--src/test/ui/generic-type-more-params-with-defaults.stderr2
-rw-r--r--src/test/ui/if-let-arm-types.stderr2
-rw-r--r--src/test/ui/impl-duplicate-methods.stderr2
-rw-r--r--src/test/ui/impl-trait/auto-trait-leak.stderr4
-rw-r--r--src/test/ui/impl-trait/equality.stderr4
-rw-r--r--src/test/ui/impl-trait/impl-trait-plus-priority.stderr2
-rw-r--r--src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.stderr2
-rw-r--r--src/test/ui/impl-trait/method-suggestion-no-duplication.stderr2
-rw-r--r--src/test/ui/impl-trait/no-method-suggested-traits.stderr2
-rw-r--r--src/test/ui/impl-trait/trait_type.stderr4
-rw-r--r--src/test/ui/impl-trait/universal-mismatched-type.stderr2
-rw-r--r--src/test/ui/impl-trait/universal-two-impl-traits.stderr2
-rw-r--r--src/test/ui/impl-trait/universal_wrong_bounds.stderr2
-rw-r--r--src/test/ui/impl-unused-rps-in-assoc-type.stderr2
-rw-r--r--src/test/ui/impl_trait_projections.stderr4
-rw-r--r--src/test/ui/imports/duplicate.stderr4
-rw-r--r--src/test/ui/imports/macro-paths.stderr4
-rw-r--r--src/test/ui/imports/macros.stderr4
-rw-r--r--src/test/ui/imports/shadow_builtin_macros.stderr2
-rw-r--r--src/test/ui/impossible_range.stderr2
-rw-r--r--src/test/ui/in-band-lifetimes/E0687.stderr2
-rw-r--r--src/test/ui/in-band-lifetimes/E0687_where.stderr2
-rw-r--r--src/test/ui/in-band-lifetimes/E0688.stderr2
-rw-r--r--src/test/ui/in-band-lifetimes/mismatched.stderr4
-rw-r--r--src/test/ui/in-band-lifetimes/mismatched_trait.stderr2
-rw-r--r--src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr4
-rw-r--r--src/test/ui/in-band-lifetimes/mismatched_trait_impl.stderr2
-rw-r--r--src/test/ui/in-band-lifetimes/mut_while_borrow.stderr2
-rw-r--r--src/test/ui/in-band-lifetimes/no_in_band_in_struct.stderr2
-rw-r--r--src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr2
-rw-r--r--src/test/ui/in-band-lifetimes/shadow.stderr2
-rw-r--r--src/test/ui/index-help.stderr2
-rw-r--r--src/test/ui/infinite-recursion-const-fn.stderr2
-rw-r--r--src/test/ui/interior-mutability/interior-mutability.stderr2
-rw-r--r--src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr2
-rw-r--r--src/test/ui/invalid-path-in-const.stderr2
-rw-r--r--src/test/ui/issue-10969.stderr2
-rw-r--r--src/test/ui/issue-11004.stderr2
-rw-r--r--src/test/ui/issue-11319.stderr2
-rw-r--r--src/test/ui/issue-12187-1.stderr2
-rw-r--r--src/test/ui/issue-12187-2.stderr2
-rw-r--r--src/test/ui/issue-12511.stderr2
-rw-r--r--src/test/ui/issue-13058.stderr4
-rw-r--r--src/test/ui/issue-14092.stderr2
-rw-r--r--src/test/ui/issue-15260.stderr2
-rw-r--r--src/test/ui/issue-15524.stderr2
-rw-r--r--src/test/ui/issue-17263.stderr4
-rw-r--r--src/test/ui/issue-17441.stderr2
-rw-r--r--src/test/ui/issue-18183.stderr2
-rw-r--r--src/test/ui/issue-18819.stderr2
-rw-r--r--src/test/ui/issue-19498.stderr2
-rw-r--r--src/test/ui/issue-19707.stderr2
-rw-r--r--src/test/ui/issue-19922.stderr2
-rw-r--r--src/test/ui/issue-20692.stderr2
-rw-r--r--src/test/ui/issue-21546.stderr2
-rw-r--r--src/test/ui/issue-21600.stderr2
-rw-r--r--src/test/ui/issue-21950.stderr4
-rw-r--r--src/test/ui/issue-22370.stderr2
-rw-r--r--src/test/ui/issue-22560.stderr4
-rw-r--r--src/test/ui/issue-22886.stderr2
-rw-r--r--src/test/ui/issue-22933-2.stderr2
-rw-r--r--src/test/ui/issue-23041.stderr2
-rw-r--r--src/test/ui/issue-23173.stderr2
-rw-r--r--src/test/ui/issue-23217.stderr2
-rw-r--r--src/test/ui/issue-23302-1.stderr2
-rw-r--r--src/test/ui/issue-23302-2.stderr2
-rw-r--r--src/test/ui/issue-23302-3.stderr2
-rw-r--r--src/test/ui/issue-23543.stderr2
-rw-r--r--src/test/ui/issue-23544.stderr2
-rw-r--r--src/test/ui/issue-23716.stderr2
-rw-r--r--src/test/ui/issue-24036.stderr2
-rw-r--r--src/test/ui/issue-24081.stderr2
-rw-r--r--src/test/ui/issue-24424.stderr2
-rw-r--r--src/test/ui/issue-25385.stderr2
-rw-r--r--src/test/ui/issue-25793.stderr2
-rw-r--r--src/test/ui/issue-25826.stderr2
-rw-r--r--src/test/ui/issue-26056.stderr2
-rw-r--r--src/test/ui/issue-26093.stderr2
-rw-r--r--src/test/ui/issue-26472.stderr2
-rw-r--r--src/test/ui/issue-26638.stderr2
-rw-r--r--src/test/ui/issue-26886.stderr2
-rw-r--r--src/test/ui/issue-27842.stderr2
-rw-r--r--src/test/ui/issue-27942.stderr2
-rw-r--r--src/test/ui/issue-2848.stderr2
-rw-r--r--src/test/ui/issue-28568.stderr2
-rw-r--r--src/test/ui/issue-28776.stderr2
-rw-r--r--src/test/ui/issue-28837.stderr2
-rw-r--r--src/test/ui/issue-28971.stderr2
-rw-r--r--src/test/ui/issue-29124.stderr2
-rw-r--r--src/test/ui/issue-29723.stderr2
-rw-r--r--src/test/ui/issue-3008-1.stderr2
-rw-r--r--src/test/ui/issue-3008-2.stderr2
-rw-r--r--src/test/ui/issue-30255.stderr2
-rw-r--r--src/test/ui/issue-30302.stderr1
-rw-r--r--src/test/ui/issue-3044.stderr2
-rw-r--r--src/test/ui/issue-32326.stderr2
-rw-r--r--src/test/ui/issue-33525.stderr4
-rw-r--r--src/test/ui/issue-33941.stderr2
-rw-r--r--src/test/ui/issue-34047.stderr2
-rw-r--r--src/test/ui/issue-34209.stderr2
-rw-r--r--src/test/ui/issue-35139.stderr2
-rw-r--r--src/test/ui/issue-35241.stderr2
-rw-r--r--src/test/ui/issue-35675.stderr4
-rw-r--r--src/test/ui/issue-35869.stderr2
-rw-r--r--src/test/ui/issue-36163.stderr2
-rw-r--r--src/test/ui/issue-36400.stderr2
-rw-r--r--src/test/ui/issue-36708.stderr2
-rw-r--r--src/test/ui/issue-3779.stderr2
-rw-r--r--src/test/ui/issue-37884.stderr2
-rw-r--r--src/test/ui/issue-40402-ref-hints/issue-40402-1.stderr2
-rw-r--r--src/test/ui/issue-40402-ref-hints/issue-40402-2.stderr2
-rw-r--r--src/test/ui/issue-41652/issue_41652.stderr2
-rw-r--r--src/test/ui/issue-42106.stderr2
-rw-r--r--src/test/ui/issue-4335.stderr4
-rw-r--r--src/test/ui/issue-44023.stderr2
-rw-r--r--src/test/ui/issue-45157.stderr2
-rw-r--r--src/test/ui/issue-45697-1.stderr4
-rw-r--r--src/test/ui/issue-45697.stderr4
-rw-r--r--src/test/ui/issue-45730.stderr2
-rw-r--r--src/test/ui/issue-46112.stderr2
-rw-r--r--src/test/ui/issue-46332.stderr2
-rw-r--r--src/test/ui/issue-46471-1.stderr2
-rw-r--r--src/test/ui/issue-46471.stderr2
-rw-r--r--src/test/ui/issue-46472.stderr2
-rw-r--r--src/test/ui/issue-46983.stderr2
-rw-r--r--src/test/ui/issue-47377.stderr2
-rw-r--r--src/test/ui/issue-47380.stderr2
-rw-r--r--src/test/ui/issue-47511.stderr2
-rw-r--r--src/test/ui/issue-47623.stderr2
-rw-r--r--src/test/ui/issue-47706-trait.stderr4
-rw-r--r--src/test/ui/issue-47706.stderr2
-rw-r--r--src/test/ui/issue-48276.stderr2
-rw-r--r--src/test/ui/issue-4935.stderr2
-rw-r--r--src/test/ui/issue-5239-1.stderr2
-rw-r--r--src/test/ui/issue-6458-3.stderr2
-rw-r--r--src/test/ui/issue-6458-4.stderr2
-rw-r--r--src/test/ui/issue-6458.stderr2
-rw-r--r--src/test/ui/issue-7813.stderr2
-rw-r--r--src/test/ui/lifetime-elision-return-type-requires-explicit-lifetime.stderr2
-rw-r--r--src/test/ui/lifetime-errors/42701_one_named_and_one_anonymous.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex1b-return-no-names-if-else.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex2a-push-one-existing-name-2.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex2a-push-one-existing-name.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex2b-push-no-existing-names.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex2c-push-inference-variable.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex2d-push-inference-variable-2.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex2e-push-inference-variable-3.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-2.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-3.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions.stderr2
-rw-r--r--src/test/ui/lifetime-errors/liveness-assign-imm-local-notes.stderr2
-rw-r--r--src/test/ui/lifetimes/borrowck-let-suggestion.stderr2
-rw-r--r--src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr4
-rw-r--r--src/test/ui/lint-forbid-attr.stderr2
-rw-r--r--src/test/ui/lint/outer-forbid.stderr2
-rw-r--r--src/test/ui/lint/use_suggestion_json.stderr10
-rw-r--r--src/test/ui/liveness-return-last-stmt-semi.stderr2
-rw-r--r--src/test/ui/loop-break-value-no-repeat.stderr2
-rw-r--r--src/test/ui/lub-glb/old-lub-glb-hr.stderr2
-rw-r--r--src/test/ui/lub-glb/old-lub-glb-object.stderr2
-rw-r--r--src/test/ui/macros/macro-backtrace-invalid-internals.stderr4
-rw-r--r--src/test/ui/macros/macro-backtrace-nested.stderr2
-rw-r--r--src/test/ui/macros/macro_path_as_generic_bound.stderr1
-rw-r--r--src/test/ui/macros/span-covering-argument-1.stderr2
-rw-r--r--src/test/ui/main-wrong-location.stderr2
-rw-r--r--src/test/ui/method-call-err-msg.stderr4
-rw-r--r--src/test/ui/method-missing-call.stderr2
-rw-r--r--src/test/ui/mismatched_types/E0053.stderr2
-rw-r--r--src/test/ui/mismatched_types/E0409.stderr4
-rw-r--r--src/test/ui/mismatched_types/E0631.stderr2
-rw-r--r--src/test/ui/mismatched_types/abridged.stderr2
-rw-r--r--src/test/ui/mismatched_types/binops.stderr2
-rw-r--r--src/test/ui/mismatched_types/cast-rfc0401.stderr4
-rw-r--r--src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr2
-rw-r--r--src/test/ui/mismatched_types/closure-arg-count.stderr2
-rw-r--r--src/test/ui/mismatched_types/closure-arg-type-mismatch.stderr4
-rw-r--r--src/test/ui/mismatched_types/closure-mismatch.stderr4
-rw-r--r--src/test/ui/mismatched_types/const-fn-in-trait.stderr2
-rw-r--r--src/test/ui/mismatched_types/fn-variance-1.stderr2
-rw-r--r--src/test/ui/mismatched_types/for-loop-has-unit-body.stderr2
-rw-r--r--src/test/ui/mismatched_types/issue-19109.stderr2
-rw-r--r--src/test/ui/mismatched_types/issue-26480.stderr4
-rw-r--r--src/test/ui/mismatched_types/issue-35030.stderr2
-rw-r--r--src/test/ui/mismatched_types/issue-36053-2.stderr4
-rw-r--r--src/test/ui/mismatched_types/issue-38371.stderr4
-rw-r--r--src/test/ui/mismatched_types/main.stderr2
-rw-r--r--src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr2
-rw-r--r--src/test/ui/mismatched_types/overloaded-calls-bad.stderr4
-rw-r--r--src/test/ui/mismatched_types/trait-bounds-cant-coerce.stderr2
-rw-r--r--src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr2
-rw-r--r--src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr2
-rw-r--r--src/test/ui/missing-items/issue-40221.stderr2
-rw-r--r--src/test/ui/missing-items/m2.stderr4
-rw-r--r--src/test/ui/missing-items/missing-type-parameter.stderr2
-rw-r--r--src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr2
-rw-r--r--src/test/ui/moves-based-on-type-block-bad.stderr2
-rw-r--r--src/test/ui/moves-based-on-type-match-bindings.stderr2
-rw-r--r--src/test/ui/moves-based-on-type-tuple.stderr2
-rw-r--r--src/test/ui/nested_impl_trait.stderr4
-rw-r--r--src/test/ui/nll/borrowed-local-error.stderr2
-rw-r--r--src/test/ui/nll/borrowed-match-issue-45045.stderr2
-rw-r--r--src/test/ui/nll/borrowed-referent-issue-38899.stderr2
-rw-r--r--src/test/ui/nll/borrowed-temporary-error.stderr2
-rw-r--r--src/test/ui/nll/borrowed-universal-error-2.stderr2
-rw-r--r--src/test/ui/nll/borrowed-universal-error.stderr2
-rw-r--r--src/test/ui/nll/capture-ref-in-struct.stderr2
-rw-r--r--src/test/ui/nll/closure-requirements/escape-argument.stderr2
-rw-r--r--src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr2
-rw-r--r--src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr2
-rw-r--r--src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr2
-rw-r--r--src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr2
-rw-r--r--src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr2
-rw-r--r--src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr2
-rw-r--r--src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr2
-rw-r--r--src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr2
-rw-r--r--src/test/ui/nll/drop-no-may-dangle.stderr2
-rw-r--r--src/test/ui/nll/get_default.stderr2
-rw-r--r--src/test/ui/nll/guarantor-issue-46974.stderr4
-rw-r--r--src/test/ui/nll/issue-31567.stderr2
-rw-r--r--src/test/ui/nll/issue-47470.stderr2
-rw-r--r--src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr2
-rw-r--r--src/test/ui/nll/maybe-initialized-drop-with-fragment.stderr2
-rw-r--r--src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr2
-rw-r--r--src/test/ui/nll/maybe-initialized-drop.stderr2
-rw-r--r--src/test/ui/nll/return-ref-mut-issue-46557.stderr2
-rw-r--r--src/test/ui/nll/trait-associated-constant.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/impl-trait-captures.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/impl-trait-outlives.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/projection-implied-bounds.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/projection-no-regions-fn.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/ty-param-fn-body.stderr2
-rw-r--r--src/test/ui/nll/ty-outlives/ty-param-fn.stderr2
-rw-r--r--src/test/ui/no-patterns-in-args.stderr4
-rw-r--r--src/test/ui/non-constant-expr-for-arr-len.stderr2
-rw-r--r--src/test/ui/non-exhaustive-pattern-witness.stderr2
-rw-r--r--src/test/ui/non_modrs_mods/non_modrs_mods.stderr2
-rw-r--r--src/test/ui/not-enough-arguments.stderr2
-rw-r--r--src/test/ui/numeric-fields.stderr4
-rw-r--r--src/test/ui/object-safety-associated-consts.stderr2
-rw-r--r--src/test/ui/object-safety-generics.stderr2
-rw-r--r--src/test/ui/object-safety-mentions-Self.stderr2
-rw-r--r--src/test/ui/object-safety-sized.stderr2
-rw-r--r--src/test/ui/object-safety-supertrait-mentions-Self.stderr2
-rw-r--r--src/test/ui/on-unimplemented/bad-annotation.stderr4
-rw-r--r--src/test/ui/on-unimplemented/multiple-impls.stderr2
-rw-r--r--src/test/ui/on-unimplemented/no-debug.stderr2
-rw-r--r--src/test/ui/on-unimplemented/on-impl.stderr2
-rw-r--r--src/test/ui/on-unimplemented/on-trait.stderr2
-rw-r--r--src/test/ui/on-unimplemented/slice-index.stderr2
-rw-r--r--src/test/ui/partialeq_help.stderr2
-rw-r--r--src/test/ui/pat-slice-old-style.stderr2
-rw-r--r--src/test/ui/qualified-path-params-2.stderr4
-rw-r--r--src/test/ui/reachable/expr_unary.stderr2
-rw-r--r--src/test/ui/recursive-requirements.stderr2
-rw-r--r--src/test/ui/region-borrow-params-issue-29793-small.stderr4
-rw-r--r--src/test/ui/regions-fn-subtyping-return-static.stderr2
-rw-r--r--src/test/ui/regions-nested-fns-2.stderr2
-rw-r--r--src/test/ui/resolve-conflict-item-vs-import.stderr2
-rw-r--r--src/test/ui/resolve-inconsistent-names.stderr2
-rw-r--r--src/test/ui/resolve/enums-are-namespaced-xc.stderr4
-rw-r--r--src/test/ui/resolve/issue-14254.stderr4
-rw-r--r--src/test/ui/resolve/issue-16058.stderr2
-rw-r--r--src/test/ui/resolve/issue-17518.stderr2
-rw-r--r--src/test/ui/resolve/issue-18252.stderr2
-rw-r--r--src/test/ui/resolve/issue-19452.stderr2
-rw-r--r--src/test/ui/resolve/issue-21221-1.stderr2
-rw-r--r--src/test/ui/resolve/issue-21221-2.stderr2
-rw-r--r--src/test/ui/resolve/issue-21221-3.stderr1
-rw-r--r--src/test/ui/resolve/issue-21221-4.stderr1
-rw-r--r--src/test/ui/resolve/issue-23305.stderr2
-rw-r--r--src/test/ui/resolve/issue-2356.stderr4
-rw-r--r--src/test/ui/resolve/issue-24968.stderr2
-rw-r--r--src/test/ui/resolve/issue-33876.stderr2
-rw-r--r--src/test/ui/resolve/issue-3907-2.stderr2
-rw-r--r--src/test/ui/resolve/issue-3907.stderr1
-rw-r--r--src/test/ui/resolve/issue-39226.stderr2
-rw-r--r--src/test/ui/resolve/issue-5035-2.stderr2
-rw-r--r--src/test/ui/resolve/issue-5035.stderr2
-rw-r--r--src/test/ui/resolve/issue-6702.stderr2
-rw-r--r--src/test/ui/resolve/levenshtein.stderr4
-rw-r--r--src/test/ui/resolve/name-clash-nullary.stderr2
-rw-r--r--src/test/ui/resolve/privacy-enum-ctor.stderr4
-rw-r--r--src/test/ui/resolve/privacy-struct-ctor.stderr4
-rw-r--r--src/test/ui/resolve/resolve-assoc-suggestions.stderr4
-rw-r--r--src/test/ui/resolve/resolve-hint-macro.stderr2
-rw-r--r--src/test/ui/resolve/resolve-speculative-adjustment.stderr2
-rw-r--r--src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr4
-rw-r--r--src/test/ui/resolve/token-error-correct-2.stderr2
-rw-r--r--src/test/ui/resolve/token-error-correct-3.stderr4
-rw-r--r--src/test/ui/resolve/tuple-struct-alias.stderr4
-rw-r--r--src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr2
-rw-r--r--src/test/ui/resolve/unresolved_static_type_field.stderr2
-rw-r--r--src/test/ui/resolve/use_suggestion_placement.stderr4
-rw-r--r--src/test/ui/rfc-2005-default-binding-mode/const.stderr2
-rw-r--r--src/test/ui/rfc-2005-default-binding-mode/enum.stderr2
-rw-r--r--src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr2
-rw-r--r--src/test/ui/rfc-2005-default-binding-mode/for.stderr2
-rw-r--r--src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr2
-rw-r--r--src/test/ui/rfc-2005-default-binding-mode/lit.stderr2
-rw-r--r--src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr2
-rw-r--r--src/test/ui/rfc-2005-default-binding-mode/slice.stderr2
-rw-r--r--src/test/ui/rfc-2005-default-binding-mode/suggestion.stderr2
-rw-r--r--src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.stderr2
-rw-r--r--src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr4
-rw-r--r--src/test/ui/rfc1598-generic-associated-types/iterable.stderr2
-rw-r--r--src/test/ui/rfc1598-generic-associated-types/pointer_family.stderr2
-rw-r--r--src/test/ui/rfc1598-generic-associated-types/streaming_iterator.stderr2
-rw-r--r--src/test/ui/self-impl.stderr2
-rw-r--r--src/test/ui/shadowed-lifetime.stderr2
-rw-r--r--src/test/ui/shadowed-type-parameter.stderr2
-rw-r--r--src/test/ui/span/E0046.stderr2
-rw-r--r--src/test/ui/span/E0057.stderr2
-rw-r--r--src/test/ui/span/E0072.stderr2
-rw-r--r--src/test/ui/span/E0204.stderr2
-rw-r--r--src/test/ui/span/E0493.stderr2
-rw-r--r--src/test/ui/span/E0535.stderr2
-rw-r--r--src/test/ui/span/E0536.stderr2
-rw-r--r--src/test/ui/span/E0537.stderr2
-rw-r--r--src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr4
-rw-r--r--src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr2
-rw-r--r--src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr4
-rw-r--r--src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr2
-rw-r--r--src/test/ui/span/borrowck-fn-in-const-b.stderr2
-rw-r--r--src/test/ui/span/borrowck-let-suggestion-suffixes.stderr2
-rw-r--r--src/test/ui/span/borrowck-object-mutability.stderr2
-rw-r--r--src/test/ui/span/borrowck-ref-into-rvalue.stderr2
-rw-r--r--src/test/ui/span/coerce-suggestions.stderr2
-rw-r--r--src/test/ui/span/destructor-restrictions.stderr2
-rw-r--r--src/test/ui/span/dropck-object-cycle.stderr2
-rw-r--r--src/test/ui/span/dropck_arr_cycle_checked.stderr2
-rw-r--r--src/test/ui/span/dropck_direct_cycle_with_drop.stderr2
-rw-r--r--src/test/ui/span/dropck_misc_variants.stderr2
-rw-r--r--src/test/ui/span/dropck_vec_cycle_checked.stderr2
-rw-r--r--src/test/ui/span/gated-features-attr-spans.stderr2
-rw-r--r--src/test/ui/span/impl-wrong-item-for-trait.stderr4
-rw-r--r--src/test/ui/span/issue-11925.stderr2
-rw-r--r--src/test/ui/span/issue-15480.stderr2
-rw-r--r--src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr2
-rw-r--r--src/test/ui/span/issue-23729.stderr2
-rw-r--r--src/test/ui/span/issue-23827.stderr2
-rw-r--r--src/test/ui/span/issue-24356.stderr2
-rw-r--r--src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr2
-rw-r--r--src/test/ui/span/issue-24805-dropck-trait-has-items.stderr2
-rw-r--r--src/test/ui/span/issue-24895-copy-clone-dropck.stderr2
-rw-r--r--src/test/ui/span/issue-25199.stderr2
-rw-r--r--src/test/ui/span/issue-26656.stderr2
-rw-r--r--src/test/ui/span/issue-27522.stderr2
-rw-r--r--src/test/ui/span/issue-29106.stderr2
-rw-r--r--src/test/ui/span/issue-29595.stderr2
-rw-r--r--src/test/ui/span/issue-33884.stderr2
-rw-r--r--src/test/ui/span/issue-34264.stderr4
-rw-r--r--src/test/ui/span/issue-35987.stderr2
-rw-r--r--src/test/ui/span/issue-36530.stderr2
-rw-r--r--src/test/ui/span/issue-36537.stderr2
-rw-r--r--src/test/ui/span/issue-37767.stderr2
-rw-r--r--src/test/ui/span/issue-39018.stderr2
-rw-r--r--src/test/ui/span/issue-39698.stderr2
-rw-r--r--src/test/ui/span/issue-40157.stderr2
-rw-r--r--src/test/ui/span/issue-42234-unknown-receiver-type.stderr2
-rw-r--r--src/test/ui/span/issue-7575.stderr2
-rw-r--r--src/test/ui/span/issue28498-reject-ex1.stderr2
-rw-r--r--src/test/ui/span/issue28498-reject-lifetime-param.stderr2
-rw-r--r--src/test/ui/span/issue28498-reject-passed-to-fn.stderr2
-rw-r--r--src/test/ui/span/issue28498-reject-trait-bound.stderr2
-rw-r--r--src/test/ui/span/missing-unit-argument.stderr2
-rw-r--r--src/test/ui/span/move-closure.stderr2
-rw-r--r--src/test/ui/span/multiline-span-E0072.stderr2
-rw-r--r--src/test/ui/span/multiline-span-simple.stderr2
-rw-r--r--src/test/ui/span/mut-arg-hint.stderr2
-rw-r--r--src/test/ui/span/mut-ptr-cant-outlive-ref.stderr2
-rw-r--r--src/test/ui/span/non-existing-module-import.stderr2
-rw-r--r--src/test/ui/span/pub-struct-field.stderr2
-rw-r--r--src/test/ui/span/range-2.stderr2
-rw-r--r--src/test/ui/span/recursive-type-field.stderr2
-rw-r--r--src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr2
-rw-r--r--src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr2
-rw-r--r--src/test/ui/span/regions-close-over-type-parameter-2.stderr2
-rw-r--r--src/test/ui/span/regions-escape-loop-via-variable.stderr2
-rw-r--r--src/test/ui/span/regions-escape-loop-via-vec.stderr4
-rw-r--r--src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr2
-rw-r--r--src/test/ui/span/send-is-not-static-ensures-scoping.stderr2
-rw-r--r--src/test/ui/span/send-is-not-static-std-sync-2.stderr2
-rw-r--r--src/test/ui/span/send-is-not-static-std-sync.stderr4
-rw-r--r--src/test/ui/span/slice-borrow.stderr2
-rw-r--r--src/test/ui/span/suggestion-non-ascii.stderr2
-rw-r--r--src/test/ui/span/type-binding.stderr2
-rw-r--r--src/test/ui/span/typo-suggestion.stderr2
-rw-r--r--src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr2
-rw-r--r--src/test/ui/span/vec_refs_data_with_early_death.stderr2
-rw-r--r--src/test/ui/span/wf-method-late-bound-regions.stderr2
-rw-r--r--src/test/ui/specialization-feature-gate-default.stderr2
-rw-r--r--src/test/ui/specialization-feature-gate-overlap.stderr2
-rw-r--r--src/test/ui/static-lifetime.stderr2
-rw-r--r--src/test/ui/str-concat-on-double-ref.stderr2
-rw-r--r--src/test/ui/str-lit-type-mismatch.stderr2
-rw-r--r--src/test/ui/struct-fields-decl-dupe.stderr2
-rw-r--r--src/test/ui/struct-fields-hints-no-dupe.stderr2
-rw-r--r--src/test/ui/struct-fields-hints.stderr2
-rw-r--r--src/test/ui/struct-fields-too-many.stderr2
-rw-r--r--src/test/ui/struct-path-self-type-mismatch.stderr2
-rw-r--r--src/test/ui/suggest-private-fields.stderr2
-rw-r--r--src/test/ui/suggestions/closure-immutable-outer-variable.stderr2
-rw-r--r--src/test/ui/suggestions/confuse-field-and-method/issue-18343.stderr2
-rw-r--r--src/test/ui/suggestions/confuse-field-and-method/issue-2392.stderr2
-rw-r--r--src/test/ui/suggestions/confuse-field-and-method/issue-32128.stderr2
-rw-r--r--src/test/ui/suggestions/confuse-field-and-method/issue-33784.stderr2
-rw-r--r--src/test/ui/suggestions/confuse-field-and-method/private-field.stderr2
-rw-r--r--src/test/ui/suggestions/conversion-methods.stderr2
-rw-r--r--src/test/ui/suggestions/dont-suggest-dereference-on-arg.stderr2
-rw-r--r--src/test/ui/suggestions/dont-suggest-private-trait-method.stderr2
-rw-r--r--src/test/ui/suggestions/extern-crate-rename.stderr2
-rw-r--r--src/test/ui/suggestions/fn-closure-mutable-capture.stderr2
-rw-r--r--src/test/ui/suggestions/for-c-in-str.stderr2
-rw-r--r--src/test/ui/suggestions/issue-32354-suggest-import-rename.stderr2
-rw-r--r--src/test/ui/suggestions/issue-43420-no-over-suggest.stderr2
-rw-r--r--src/test/ui/suggestions/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr2
-rw-r--r--src/test/ui/suggestions/issue-46756-consider-borrowing-cast-or-binexpr.stderr2
-rw-r--r--src/test/ui/suggestions/method-on-ambiguous-numeric-type.stderr2
-rw-r--r--src/test/ui/suggestions/numeric-cast-2.stderr2
-rw-r--r--src/test/ui/suggestions/numeric-cast.stderr2
-rw-r--r--src/test/ui/suggestions/return-type.stderr2
-rw-r--r--src/test/ui/suggestions/str-array-assignment.stderr4
-rw-r--r--src/test/ui/suggestions/suggest-labels.stderr2
-rw-r--r--src/test/ui/suggestions/suggest-methods.stderr2
-rw-r--r--src/test/ui/suggestions/try-on-option.stderr2
-rw-r--r--src/test/ui/suggestions/try-operator-on-main.stderr2
-rw-r--r--src/test/ui/suggestions/type-ascription-instead-of-initializer.stderr2
-rw-r--r--src/test/ui/suggestions/type-ascription-with-fn-call.stderr2
-rw-r--r--src/test/ui/svh-change-lit.stderr2
-rw-r--r--src/test/ui/svh-change-significant-cfg.stderr2
-rw-r--r--src/test/ui/svh-change-trait-bound.stderr2
-rw-r--r--src/test/ui/svh-change-type-arg.stderr2
-rw-r--r--src/test/ui/svh-change-type-ret.stderr2
-rw-r--r--src/test/ui/svh-change-type-static.stderr2
-rw-r--r--src/test/ui/svh-use-trait.stderr2
-rw-r--r--src/test/ui/switched-expectations.stderr2
-rw-r--r--src/test/ui/token/issue-10636-2.stderr2
-rw-r--r--src/test/ui/token/issue-15980.stderr2
-rw-r--r--src/test/ui/token/issue-41155.stderr4
-rw-r--r--src/test/ui/trait-alias.stderr2
-rw-r--r--src/test/ui/trait-duplicate-methods.stderr2
-rw-r--r--src/test/ui/trait-method-private.stderr2
-rw-r--r--src/test/ui/trait-safety-fn-body.stderr2
-rw-r--r--src/test/ui/trait-suggest-where-clause.stderr2
-rw-r--r--src/test/ui/traits-multidispatch-convert-ambig-dest.stderr2
-rw-r--r--src/test/ui/transmute/main.stderr2
-rw-r--r--src/test/ui/transmute/transmute-from-fn-item-types-error.stderr4
-rw-r--r--src/test/ui/transmute/transmute-type-parameters.stderr2
-rw-r--r--src/test/ui/type-annotation-needed.stderr2
-rw-r--r--src/test/ui/type-check-defaults.stderr2
-rw-r--r--src/test/ui/type-check/assignment-in-if.stderr2
-rw-r--r--src/test/ui/type-check/cannot_infer_local_or_array.stderr2
-rw-r--r--src/test/ui/type-check/cannot_infer_local_or_vec.stderr2
-rw-r--r--src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.stderr2
-rw-r--r--src/test/ui/type-check/issue-22897.stderr2
-rw-r--r--src/test/ui/type-check/issue-40294.stderr2
-rw-r--r--src/test/ui/type-check/issue-41314.stderr4
-rw-r--r--src/test/ui/type-check/missing_trait_impl.stderr2
-rw-r--r--src/test/ui/type-check/unknown_type_for_closure.stderr2
-rw-r--r--src/test/ui/type-recursive.stderr2
-rw-r--r--src/test/ui/typeck-builtin-bound-type-parameters.stderr4
-rw-r--r--src/test/ui/typeck_type_placeholder_item.stderr2
-rw-r--r--src/test/ui/typeck_type_placeholder_lifetime_1.stderr2
-rw-r--r--src/test/ui/typeck_type_placeholder_lifetime_2.stderr2
-rw-r--r--src/test/ui/ui-testing-optout.stderr2
-rw-r--r--src/test/ui/unboxed-closure-no-cyclic-sig.stderr2
-rw-r--r--src/test/ui/unboxed-closure-sugar-wrong-trait.stderr4
-rw-r--r--src/test/ui/unboxed-closures-infer-fn-once-move-from-projection.stderr2
-rw-r--r--src/test/ui/unconstrained-none.stderr2
-rw-r--r--src/test/ui/unconstrained-ref.stderr2
-rw-r--r--src/test/ui/union/union-derive-eq.stderr2
-rw-r--r--src/test/ui/union/union-fields-2.stderr4
-rw-r--r--src/test/ui/union/union-sized-field.stderr2
-rw-r--r--src/test/ui/union/union-suggest-field.stderr4
-rw-r--r--src/test/ui/unknown-language-item.stderr2
-rw-r--r--src/test/ui/unsafe-const-fn.stderr2
-rw-r--r--src/test/ui/unsized-enum2.stderr2
-rw-r--r--src/test/ui/use-mod.stderr4
-rw-r--r--src/test/ui/use-nested-groups-error.stderr2
-rw-r--r--src/test/ui/variadic-ffi-3.stderr4
-rw-r--r--src/test/ui/variance-unused-type-param.stderr2
-rw-r--r--src/test/ui/vector-no-ann.stderr2
-rw-r--r--src/tools/compiletest/src/json.rs20
-rw-r--r--src/tools/compiletest/src/runtest.rs43
1049 files changed, 1280 insertions, 1242 deletions
diff --git a/src/librustc_errors/diagnostic_builder.rs b/src/librustc_errors/diagnostic_builder.rs
index 2536fc648c7..945ecce7ab3 100644
--- a/src/librustc_errors/diagnostic_builder.rs
+++ b/src/librustc_errors/diagnostic_builder.rs
@@ -92,7 +92,8 @@ impl<'a> DiagnosticBuilder<'a> {
             Level::Bug |
             Level::Fatal |
             Level::PhaseFatal |
-            Level::Error => {
+            Level::Error |
+            Level::FailureNote => {
                 true
             }
 
diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
index f481b36daa3..3b6e6db7f46 100644
--- a/src/librustc_errors/emitter.rs
+++ b/src/librustc_errors/emitter.rs
@@ -21,7 +21,7 @@ use atty;
 use std::borrow::Cow;
 use std::io::prelude::*;
 use std::io;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 use std::cmp::min;
 use termcolor::{StandardStream, ColorChoice, ColorSpec, BufferWriter};
 use termcolor::{WriteColor, Color, Buffer};
@@ -33,6 +33,11 @@ const ANONYMIZED_LINE_NUM: &str = "LL";
 pub trait Emitter {
     /// Emit a structured diagnostic.
     fn emit(&mut self, db: &DiagnosticBuilder);
+
+    /// Check if should show explanations about "rustc --explain"
+    fn should_show_explain(&self) -> bool {
+        true
+    }
 }
 
 impl Emitter for EmitterWriter {
@@ -80,6 +85,10 @@ impl Emitter for EmitterWriter {
                                    &children,
                                    &suggestions);
     }
+
+    fn should_show_explain(&self) -> bool {
+        !self.short_message
+    }
 }
 
 /// maximum number of lines we will print for each error; arbitrary.
@@ -114,7 +123,6 @@ pub struct EmitterWriter {
     cm: Option<Lrc<CodeMapper>>,
     short_message: bool,
     teach: bool,
-    error_codes: HashSet<String>,
     ui_testing: bool,
 }
 
@@ -124,34 +132,6 @@ struct FileWithAnnotatedLines {
     multiline_depth: usize,
 }
 
-impl Drop for EmitterWriter {
-    fn drop(&mut self) {
-        if !self.short_message && !self.error_codes.is_empty() {
-            let mut error_codes = self.error_codes.clone().into_iter().collect::<Vec<_>>();
-            let mut dst = self.dst.writable();
-            error_codes.sort();
-            if error_codes.len() > 1 {
-                let limit = if error_codes.len() > 9 { 9 } else { error_codes.len() };
-                writeln!(dst,
-                         "You've got a few errors: {}{}",
-                         error_codes[..limit].join(", "),
-                         if error_codes.len() > 9 { "..." } else { "" }
-                        ).expect("failed to give tips...");
-                writeln!(dst,
-                         "If you want more information on an error, try using \
-                          \"rustc --explain {}\"",
-                         &error_codes[0]).expect("failed to give tips...");
-            } else {
-                writeln!(dst,
-                         "If you want more information on this error, try using \
-                          \"rustc --explain {}\"",
-                         &error_codes[0]).expect("failed to give tips...");
-            }
-            dst.flush().expect("failed to emit errors");
-        }
-    }
-}
-
 impl EmitterWriter {
     pub fn stderr(color_config: ColorConfig,
                   code_map: Option<Lrc<CodeMapper>>,
@@ -164,7 +144,6 @@ impl EmitterWriter {
             cm: code_map,
             short_message,
             teach,
-            error_codes: HashSet::new(),
             ui_testing: false,
         }
     }
@@ -179,7 +158,6 @@ impl EmitterWriter {
             cm: code_map,
             short_message,
             teach,
-            error_codes: HashSet::new(),
             ui_testing: false,
         }
     }
@@ -993,18 +971,26 @@ impl EmitterWriter {
                 buffer.prepend(0, " ", Style::NoStyle);
             }
             draw_note_separator(&mut buffer, 0, max_line_num_len + 1);
-            buffer.append(0, &level.to_string(), Style::HeaderMsg);
-            buffer.append(0, ": ", Style::NoStyle);
+            let level_str = level.to_string();
+            if !level_str.is_empty() {
+                buffer.append(0, &level_str, Style::HeaderMsg);
+                buffer.append(0, ": ", Style::NoStyle);
+            }
             self.msg_to_buffer(&mut buffer, msg, max_line_num_len, "note", None);
         } else {
-            buffer.append(0, &level.to_string(), Style::Level(level.clone()));
+            let level_str = level.to_string();
+            if !level_str.is_empty() {
+                buffer.append(0, &level_str, Style::Level(level.clone()));
+            }
             // only render error codes, not lint codes
             if let Some(DiagnosticId::Error(ref code)) = *code {
                 buffer.append(0, "[", Style::Level(level.clone()));
                 buffer.append(0, &code, Style::Level(level.clone()));
                 buffer.append(0, "]", Style::Level(level.clone()));
             }
-            buffer.append(0, ": ", Style::HeaderMsg);
+            if !level_str.is_empty() {
+                buffer.append(0, ": ", Style::HeaderMsg);
+            }
             for &(ref text, _) in msg.iter() {
                 buffer.append(0, text, Style::HeaderMsg);
             }
@@ -1020,14 +1006,12 @@ impl EmitterWriter {
             if primary_span != &&DUMMY_SP {
                 (cm.lookup_char_pos(primary_span.lo()), cm)
             } else {
-                emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message,
-                                    &mut self.error_codes)?;
+                emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
                 return Ok(());
             }
         } else {
             // If we don't have span information, emit and exit
-            emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message,
-                                &mut self.error_codes)?;
+            emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
             return Ok(());
         };
         if let Ok(pos) =
@@ -1200,8 +1184,7 @@ impl EmitterWriter {
         }
 
         // final step: take our styled buffer, render it, then output it
-        emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message,
-                            &mut self.error_codes)?;
+        emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
 
         Ok(())
 
@@ -1218,8 +1201,11 @@ impl EmitterWriter {
             let mut buffer = StyledBuffer::new();
 
             // Render the suggestion message
-            buffer.append(0, &level.to_string(), Style::Level(level.clone()));
-            buffer.append(0, ": ", Style::HeaderMsg);
+            let level_str = level.to_string();
+            if !level_str.is_empty() {
+                buffer.append(0, &level_str, Style::Level(level.clone()));
+                buffer.append(0, ": ", Style::HeaderMsg);
+            }
             self.msg_to_buffer(&mut buffer,
                                &[(suggestion.msg.to_owned(), Style::NoStyle)],
                                max_line_num_len,
@@ -1289,8 +1275,7 @@ impl EmitterWriter {
                 let msg = format!("and {} other candidates", suggestions.len() - MAX_SUGGESTIONS);
                 buffer.puts(row_num, 0, &msg, Style::NoStyle);
             }
-            emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message,
-                                &mut self.error_codes)?;
+            emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
         }
         Ok(())
     }
@@ -1321,7 +1306,7 @@ impl EmitterWriter {
                         draw_col_separator_no_space(&mut buffer, 0, max_line_num_len + 1);
                     }
                     match emit_to_destination(&buffer.render(), level, &mut self.dst,
-                                              self.short_message, &mut self.error_codes) {
+                                              self.short_message) {
                         Ok(()) => (),
                         Err(e) => panic!("failed to emit error: {}", e)
                     }
@@ -1416,8 +1401,7 @@ fn overlaps(a1: &Annotation, a2: &Annotation, padding: usize) -> bool {
 fn emit_to_destination(rendered_buffer: &Vec<Vec<StyledString>>,
                        lvl: &Level,
                        dst: &mut Destination,
-                       short_message: bool,
-                       error_codes: &mut HashSet<String>)
+                       short_message: bool)
                        -> io::Result<()> {
     use lock;
 
@@ -1436,16 +1420,13 @@ fn emit_to_destination(rendered_buffer: &Vec<Vec<StyledString>>,
     // same buffering approach.  Instead, we use a global Windows mutex, which we acquire long
     // enough to output the full error message, then we release.
     let _buffer_lock = lock::acquire_global_lock("rustc_errors");
-    for line in rendered_buffer {
+    for (pos, line) in rendered_buffer.iter().enumerate() {
         for part in line {
             dst.apply_style(lvl.clone(), part.style)?;
             write!(dst, "{}", part.text)?;
-            if !short_message && part.text.len() == 12 && part.text.starts_with("error[E") {
-                error_codes.insert(part.text[6..11].to_owned());
-            }
             dst.reset()?;
         }
-        if !short_message {
+        if !short_message && (!lvl.is_failure_note() || pos != rendered_buffer.len() - 1) {
             write!(dst, "\n")?;
         }
     }
diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs
index 924ed71ef0d..7148969191f 100644
--- a/src/librustc_errors/lib.rs
+++ b/src/librustc_errors/lib.rs
@@ -509,12 +509,14 @@ impl Handler {
     pub fn span_unimpl<S: Into<MultiSpan>>(&self, sp: S, msg: &str) -> ! {
         self.span_bug(sp, &format!("unimplemented {}", msg));
     }
+    pub fn failure(&self, msg: &str) {
+        DiagnosticBuilder::new(self, FailureNote, msg).emit()
+    }
     pub fn fatal(&self, msg: &str) -> FatalError {
         if self.flags.treat_err_as_bug {
             self.bug(msg);
         }
-        let mut db = DiagnosticBuilder::new(self, Fatal, msg);
-        db.emit();
+        DiagnosticBuilder::new(self, Fatal, msg).emit();
         FatalError
     }
     pub fn err(&self, msg: &str) {
@@ -567,8 +569,39 @@ impl Handler {
                 s = format!("aborting due to {} previous errors", self.err_count());
             }
         }
+        let err = self.fatal(&s);
+
+        let can_show_explain = self.emitter.borrow().should_show_explain();
+        let are_there_diagnostics = !self.tracked_diagnostic_codes.borrow().is_empty();
+        if can_show_explain && are_there_diagnostics {
+            let mut error_codes =
+                self.tracked_diagnostic_codes.borrow()
+                                             .clone()
+                                             .into_iter()
+                                             .filter_map(|x| match x {
+                                                 DiagnosticId::Error(ref s) => Some(s.clone()),
+                                                 _ => None,
+                                             })
+                                             .collect::<Vec<_>>();
+            if !error_codes.is_empty() {
+                error_codes.sort();
+                if error_codes.len() > 1 {
+                    let limit = if error_codes.len() > 9 { 9 } else { error_codes.len() };
+                    self.failure(&format!("Some errors occurred: {}{}",
+                                          error_codes[..limit].join(", "),
+                                          if error_codes.len() > 9 { "..." } else { "." }));
+                    self.failure(&format!("For more information about an error, try \
+                                           `rustc --explain {}`.",
+                                          &error_codes[0]));
+                } else {
+                    self.failure(&format!("For more information about this error, try \
+                                           `rustc --explain {}`.",
+                                          &error_codes[0]));
+                }
+            }
+        }
 
-        self.fatal(&s).raise();
+        err.raise();
     }
     pub fn emit(&self, msp: &MultiSpan, msg: &str, lvl: Level) {
         if lvl == Warning && !self.flags.can_emit_warnings {
@@ -654,6 +687,7 @@ pub enum Level {
     Note,
     Help,
     Cancelled,
+    FailureNote,
 }
 
 impl fmt::Display for Level {
@@ -682,9 +716,10 @@ impl Level {
                 spec.set_fg(Some(Color::Cyan))
                     .set_intense(true);
             }
+            FailureNote => {}
             Cancelled => unreachable!(),
         }
-        return spec
+        spec
     }
 
     pub fn to_str(self) -> &'static str {
@@ -694,7 +729,15 @@ impl Level {
             Warning => "warning",
             Note => "note",
             Help => "help",
+            FailureNote => "",
             Cancelled => panic!("Shouldn't call on cancelled error"),
         }
     }
+
+    pub fn is_failure_note(&self) -> bool {
+        match *self {
+            FailureNote => true,
+            _ => false,
+        }
+    }
 }
diff --git a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr b/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr
index ac26b5212ec..c03ee7f983f 100644
--- a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr
+++ b/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr
@@ -21,4 +21,4 @@ LL | #[allow(test_lint)]
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0453"
+For more information about this error, try `rustc --explain E0453`.
diff --git a/src/test/ui-fulldeps/proc-macro/signature.stderr b/src/test/ui-fulldeps/proc-macro/signature.stderr
index dad403ccf3a..fdd10c3c5b9 100644
--- a/src/test/ui-fulldeps/proc-macro/signature.stderr
+++ b/src/test/ui-fulldeps/proc-macro/signature.stderr
@@ -12,4 +12,4 @@ LL | | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/anonymous-higher-ranked-lifetime.stderr b/src/test/ui/anonymous-higher-ranked-lifetime.stderr
index ff31595ee9b..82f527f8cca 100644
--- a/src/test/ui/anonymous-higher-ranked-lifetime.stderr
+++ b/src/test/ui/anonymous-higher-ranked-lifetime.stderr
@@ -154,4 +154,4 @@ LL | fn h2<F>(_: F) where F: for<'t0> Fn(&(), Box<Fn(&())>, &'t0 (), fn(&(), &()
 
 error: aborting due to 11 previous errors
 
-If you want more information on this error, try using "rustc --explain E0631"
+For more information about this error, try `rustc --explain E0631`.
diff --git a/src/test/ui/arbitrary-self-types-not-object-safe.stderr b/src/test/ui/arbitrary-self-types-not-object-safe.stderr
index ba240c8d511..b3f9cbc587b 100644
--- a/src/test/ui/arbitrary-self-types-not-object-safe.stderr
+++ b/src/test/ui/arbitrary-self-types-not-object-safe.stderr
@@ -17,4 +17,4 @@ LL |     let x = Box::new(5usize) as Box<Foo>;
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0038"
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/asm-out-assign-imm.stderr b/src/test/ui/asm-out-assign-imm.stderr
index 16df627578e..4ec758b97f2 100644
--- a/src/test/ui/asm-out-assign-imm.stderr
+++ b/src/test/ui/asm-out-assign-imm.stderr
@@ -9,4 +9,4 @@ LL |         asm!("mov $1, $0" : "=r"(x) : "r"(5));
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0384"
+For more information about this error, try `rustc --explain E0384`.
diff --git a/src/test/ui/associated-const-impl-wrong-lifetime.stderr b/src/test/ui/associated-const-impl-wrong-lifetime.stderr
index e0a9653423f..d800f4c727d 100644
--- a/src/test/ui/associated-const-impl-wrong-lifetime.stderr
+++ b/src/test/ui/associated-const-impl-wrong-lifetime.stderr
@@ -15,4 +15,4 @@ LL | impl<'a> Foo for &'a () {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/associated-const-impl-wrong-type.stderr b/src/test/ui/associated-const-impl-wrong-type.stderr
index 6c2f2600acc..cfccacaee28 100644
--- a/src/test/ui/associated-const-impl-wrong-type.stderr
+++ b/src/test/ui/associated-const-impl-wrong-type.stderr
@@ -9,4 +9,4 @@ LL |     const BAR: i32 = -1;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0326"
+For more information about this error, try `rustc --explain E0326`.
diff --git a/src/test/ui/associated-type-projection-from-multiple-supertraits.stderr b/src/test/ui/associated-type-projection-from-multiple-supertraits.stderr
index 3b732ed3933..7a10b6d021f 100644
--- a/src/test/ui/associated-type-projection-from-multiple-supertraits.stderr
+++ b/src/test/ui/associated-type-projection-from-multiple-supertraits.stderr
@@ -42,5 +42,5 @@ LL | fn paint<C:BoxCar>(c: C, d: C::Color) {
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0191, E0221
-If you want more information on an error, try using "rustc --explain E0191"
+Some errors occurred: E0191, E0221.
+For more information about an error, try `rustc --explain E0191`.
diff --git a/src/test/ui/associated-types-ICE-when-projecting-out-of-err.stderr b/src/test/ui/associated-types-ICE-when-projecting-out-of-err.stderr
index f69b0af71f6..7924ab74444 100644
--- a/src/test/ui/associated-types-ICE-when-projecting-out-of-err.stderr
+++ b/src/test/ui/associated-types-ICE-when-projecting-out-of-err.stderr
@@ -6,4 +6,4 @@ LL |     r = r + a;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/associated-types-in-ambiguous-context.stderr b/src/test/ui/associated-types-in-ambiguous-context.stderr
index ff5c45e797e..c45873ffd53 100644
--- a/src/test/ui/associated-types-in-ambiguous-context.stderr
+++ b/src/test/ui/associated-types-in-ambiguous-context.stderr
@@ -24,4 +24,4 @@ LL |     fn grab(&self) -> Grab::Value;
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0223"
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/attr-usage-repr.stderr b/src/test/ui/attr-usage-repr.stderr
index 03c6f599b6c..1f3b358545b 100644
--- a/src/test/ui/attr-usage-repr.stderr
+++ b/src/test/ui/attr-usage-repr.stderr
@@ -40,4 +40,4 @@ LL | enum ESimd { A, B }
 
 error: aborting due to 5 previous errors
 
-If you want more information on this error, try using "rustc --explain E0517"
+For more information about this error, try `rustc --explain E0517`.
diff --git a/src/test/ui/augmented-assignments.stderr b/src/test/ui/augmented-assignments.stderr
index e04dc2f72a3..953af813c38 100644
--- a/src/test/ui/augmented-assignments.stderr
+++ b/src/test/ui/augmented-assignments.stderr
@@ -20,5 +20,5 @@ LL |     x;  //~ value moved here
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0382, E0596
-If you want more information on an error, try using "rustc --explain E0382"
+Some errors occurred: E0382, E0596.
+For more information about an error, try `rustc --explain E0382`.
diff --git a/src/test/ui/binary-op-on-double-ref.stderr b/src/test/ui/binary-op-on-double-ref.stderr
index b6c502b90b5..07aa3bfe40d 100644
--- a/src/test/ui/binary-op-on-double-ref.stderr
+++ b/src/test/ui/binary-op-on-double-ref.stderr
@@ -9,4 +9,4 @@ LL |         x % 2 == 0
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0369"
+For more information about this error, try `rustc --explain E0369`.
diff --git a/src/test/ui/blind-item-item-shadow.stderr b/src/test/ui/blind-item-item-shadow.stderr
index f02dd6b3e98..240ea6061b9 100644
--- a/src/test/ui/blind-item-item-shadow.stderr
+++ b/src/test/ui/blind-item-item-shadow.stderr
@@ -15,4 +15,4 @@ LL | use foo::foo as other_foo;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0255"
+For more information about this error, try `rustc --explain E0255`.
diff --git a/src/test/ui/block-result/block-must-not-have-result-do.stderr b/src/test/ui/block-result/block-must-not-have-result-do.stderr
index 242906ca5cb..d864d767957 100644
--- a/src/test/ui/block-result/block-must-not-have-result-do.stderr
+++ b/src/test/ui/block-result/block-must-not-have-result-do.stderr
@@ -9,4 +9,4 @@ LL |         true //~  ERROR mismatched types
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/block-result/block-must-not-have-result-res.stderr b/src/test/ui/block-result/block-must-not-have-result-res.stderr
index ca730927c88..005a3ab9b5d 100644
--- a/src/test/ui/block-result/block-must-not-have-result-res.stderr
+++ b/src/test/ui/block-result/block-must-not-have-result-res.stderr
@@ -11,4 +11,4 @@ LL |         true //~  ERROR mismatched types
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/block-result/block-must-not-have-result-while.stderr b/src/test/ui/block-result/block-must-not-have-result-while.stderr
index 1a4852a4541..a003ae871ca 100644
--- a/src/test/ui/block-result/block-must-not-have-result-while.stderr
+++ b/src/test/ui/block-result/block-must-not-have-result-while.stderr
@@ -9,4 +9,4 @@ LL |         true //~  ERROR mismatched types
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/block-result/consider-removing-last-semi.stderr b/src/test/ui/block-result/consider-removing-last-semi.stderr
index 6fa892e10e7..a0855c31737 100644
--- a/src/test/ui/block-result/consider-removing-last-semi.stderr
+++ b/src/test/ui/block-result/consider-removing-last-semi.stderr
@@ -28,4 +28,4 @@ LL | | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/block-result/issue-11714.stderr b/src/test/ui/block-result/issue-11714.stderr
index 8fad1c4de4a..e9cd7281234 100644
--- a/src/test/ui/block-result/issue-11714.stderr
+++ b/src/test/ui/block-result/issue-11714.stderr
@@ -15,4 +15,4 @@ LL | | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/block-result/issue-13428.stderr b/src/test/ui/block-result/issue-13428.stderr
index 7f39f53d6f9..888ee5a2d19 100644
--- a/src/test/ui/block-result/issue-13428.stderr
+++ b/src/test/ui/block-result/issue-13428.stderr
@@ -31,4 +31,4 @@ LL | | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/block-result/issue-13624.stderr b/src/test/ui/block-result/issue-13624.stderr
index 0df7cf43c35..e54e22522f2 100644
--- a/src/test/ui/block-result/issue-13624.stderr
+++ b/src/test/ui/block-result/issue-13624.stderr
@@ -20,4 +20,4 @@ LL |         a::Enum::EnumStructVariant { x, y, z } => {
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/block-result/issue-20862.stderr b/src/test/ui/block-result/issue-20862.stderr
index 238edb765ac..990fb404c94 100644
--- a/src/test/ui/block-result/issue-20862.stderr
+++ b/src/test/ui/block-result/issue-20862.stderr
@@ -17,5 +17,5 @@ LL |     let x = foo(5)(2);
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0308, E0618
-If you want more information on an error, try using "rustc --explain E0308"
+Some errors occurred: E0308, E0618.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/block-result/issue-22645.stderr b/src/test/ui/block-result/issue-22645.stderr
index 03d9d03371e..c94dd708626 100644
--- a/src/test/ui/block-result/issue-22645.stderr
+++ b/src/test/ui/block-result/issue-22645.stderr
@@ -22,5 +22,5 @@ LL |   b + 3 //~ ERROR E0277
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0277, E0308
-If you want more information on an error, try using "rustc --explain E0277"
+Some errors occurred: E0277, E0308.
+For more information about an error, try `rustc --explain E0277`.
diff --git a/src/test/ui/block-result/issue-3563.stderr b/src/test/ui/block-result/issue-3563.stderr
index af0e25ab18a..c4dee857574 100644
--- a/src/test/ui/block-result/issue-3563.stderr
+++ b/src/test/ui/block-result/issue-3563.stderr
@@ -8,4 +8,4 @@ LL |         || self.b()
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/block-result/issue-5500.stderr b/src/test/ui/block-result/issue-5500.stderr
index 74379809de0..27018b5da7b 100644
--- a/src/test/ui/block-result/issue-5500.stderr
+++ b/src/test/ui/block-result/issue-5500.stderr
@@ -11,4 +11,4 @@ LL |     &panic!()
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/block-result/unexpected-return-on-unit.stderr b/src/test/ui/block-result/unexpected-return-on-unit.stderr
index 10a8814a7e5..585cfb3d0d3 100644
--- a/src/test/ui/block-result/unexpected-return-on-unit.stderr
+++ b/src/test/ui/block-result/unexpected-return-on-unit.stderr
@@ -17,4 +17,4 @@ LL | fn bar() -> usize {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/bogus-tag.stderr b/src/test/ui/bogus-tag.stderr
index 76284f3b71b..f9917b07f07 100644
--- a/src/test/ui/bogus-tag.stderr
+++ b/src/test/ui/bogus-tag.stderr
@@ -9,4 +9,4 @@ LL |       color::hsl(h, s, l) => { println!("hsl"); }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/borrowck/borrowck-box-insensitivity.stderr b/src/test/ui/borrowck/borrowck-box-insensitivity.stderr
index 7bea41b2209..5bf1fc08178 100644
--- a/src/test/ui/borrowck/borrowck-box-insensitivity.stderr
+++ b/src/test/ui/borrowck/borrowck-box-insensitivity.stderr
@@ -161,5 +161,5 @@ LL | }
 
 error: aborting due to 16 previous errors
 
-You've got a few errors: E0382, E0502, E0503, E0505
-If you want more information on an error, try using "rustc --explain E0382"
+Some errors occurred: E0382, E0502, E0503, E0505.
+For more information about an error, try `rustc --explain E0382`.
diff --git a/src/test/ui/borrowck/borrowck-closures-two-mut.stderr b/src/test/ui/borrowck/borrowck-closures-two-mut.stderr
index 7205b48399a..c739165ddbd 100644
--- a/src/test/ui/borrowck/borrowck-closures-two-mut.stderr
+++ b/src/test/ui/borrowck/borrowck-closures-two-mut.stderr
@@ -150,4 +150,4 @@ LL | }
 
 error: aborting due to 10 previous errors
 
-If you want more information on this error, try using "rustc --explain E0499"
+For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr b/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr
index 98176cce508..eb1fa53d755 100644
--- a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr
+++ b/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr
@@ -12,4 +12,4 @@ LL |     spawn(move || books.push(4));
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0373"
+For more information about this error, try `rustc --explain E0373`.
diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr b/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr
index 5de31c3ac35..1343c0a1f5b 100644
--- a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr
+++ b/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr
@@ -12,4 +12,4 @@ LL |     Box::new(move || books.push(4))
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0373"
+For more information about this error, try `rustc --explain E0373`.
diff --git a/src/test/ui/borrowck/borrowck-in-static.stderr b/src/test/ui/borrowck/borrowck-in-static.stderr
index 989322662e8..356fad07666 100644
--- a/src/test/ui/borrowck/borrowck-in-static.stderr
+++ b/src/test/ui/borrowck/borrowck-in-static.stderr
@@ -8,4 +8,4 @@ LL |     Box::new(|| x) //~ ERROR cannot move out of captured outer variable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0507"
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/borrowck-move-error-with-note.stderr b/src/test/ui/borrowck/borrowck-move-error-with-note.stderr
index acc78f4ab32..81ed058e47f 100644
--- a/src/test/ui/borrowck/borrowck-move-error-with-note.stderr
+++ b/src/test/ui/borrowck/borrowck-move-error-with-note.stderr
@@ -34,5 +34,5 @@ LL |         n => {
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0507, E0509
-If you want more information on an error, try using "rustc --explain E0507"
+Some errors occurred: E0507, E0509.
+For more information about an error, try `rustc --explain E0507`.
diff --git a/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.stderr b/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.stderr
index 49d5daa543b..c4051e5a255 100644
--- a/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.stderr
+++ b/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.stderr
@@ -15,4 +15,4 @@ LL | |                   Foo { string: b }] => {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0508"
+For more information about this error, try `rustc --explain E0508`.
diff --git a/src/test/ui/borrowck/borrowck-reinit.stderr b/src/test/ui/borrowck/borrowck-reinit.stderr
index a2fbe5ab9cd..654afa42186 100644
--- a/src/test/ui/borrowck/borrowck-reinit.stderr
+++ b/src/test/ui/borrowck/borrowck-reinit.stderr
@@ -20,4 +20,4 @@ LL |     let _ = (1,x); //~ ERROR use of moved value: `x` (Ast)
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0382"
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr b/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr
index 01899446f48..648ee1dff78 100644
--- a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr
+++ b/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr
@@ -36,5 +36,5 @@ LL |     };
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0499, E0502
-If you want more information on an error, try using "rustc --explain E0499"
+Some errors occurred: E0499, E0502.
+For more information about an error, try `rustc --explain E0499`.
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr
index 3d9fbc80038..e11702df80a 100644
--- a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr
+++ b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr
@@ -80,5 +80,5 @@ LL |     let a = vec[0]; //~ ERROR cannot move out
 
 error: aborting due to 8 previous errors
 
-You've got a few errors: E0506, E0508
-If you want more information on an error, try using "rustc --explain E0506"
+Some errors occurred: E0506, E0508.
+For more information about an error, try `rustc --explain E0506`.
diff --git a/src/test/ui/borrowck/immutable-arg.stderr b/src/test/ui/borrowck/immutable-arg.stderr
index 34de3ca19a3..b7506849b81 100644
--- a/src/test/ui/borrowck/immutable-arg.stderr
+++ b/src/test/ui/borrowck/immutable-arg.stderr
@@ -16,4 +16,4 @@ LL |     _x = 4;
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0384"
+For more information about this error, try `rustc --explain E0384`.
diff --git a/src/test/ui/borrowck/issue-41962.stderr b/src/test/ui/borrowck/issue-41962.stderr
index f0ee6b31f73..39525d787b1 100644
--- a/src/test/ui/borrowck/issue-41962.stderr
+++ b/src/test/ui/borrowck/issue-41962.stderr
@@ -54,4 +54,4 @@ LL |         if let Some(thing) = maybe {
 
 error: aborting due to 5 previous errors
 
-If you want more information on this error, try using "rustc --explain E0382"
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/borrowck/mut-borrow-in-loop.stderr b/src/test/ui/borrowck/mut-borrow-in-loop.stderr
index 9b777246861..cda59d3bc68 100644
--- a/src/test/ui/borrowck/mut-borrow-in-loop.stderr
+++ b/src/test/ui/borrowck/mut-borrow-in-loop.stderr
@@ -27,4 +27,4 @@ LL |     }
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0499"
+For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/borrowck/mut-borrow-outside-loop.stderr b/src/test/ui/borrowck/mut-borrow-outside-loop.stderr
index 583f97b6cdf..80a3ba4493c 100644
--- a/src/test/ui/borrowck/mut-borrow-outside-loop.stderr
+++ b/src/test/ui/borrowck/mut-borrow-outside-loop.stderr
@@ -21,4 +21,4 @@ LL |     }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0499"
+For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.stderr b/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.stderr
index 2fe3a45b76d..b58dbd1e4d1 100644
--- a/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.stderr
+++ b/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.stderr
@@ -46,5 +46,5 @@ LL |     fn another_bound<'x: 't>(self, x: Inv<'x>, y: Inv<'t>) {
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0195, E0276, E0308
-If you want more information on an error, try using "rustc --explain E0195"
+Some errors occurred: E0195, E0276, E0308.
+For more information about an error, try `rustc --explain E0195`.
diff --git a/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr b/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr
index d07bdab087c..f2f8ae8c08c 100644
--- a/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr
+++ b/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr
@@ -9,4 +9,4 @@ LL |         y.into_iter();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0507"
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/cast-as-bool.stderr b/src/test/ui/cast-as-bool.stderr
index 1c60bc44d90..050a18ec9d3 100644
--- a/src/test/ui/cast-as-bool.stderr
+++ b/src/test/ui/cast-as-bool.stderr
@@ -8,4 +8,4 @@ LL |     let u = 5 as bool;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0054"
+For more information about this error, try `rustc --explain E0054`.
diff --git a/src/test/ui/cast-errors-issue-43825.stderr b/src/test/ui/cast-errors-issue-43825.stderr
index 3418472feaf..6dbbadde5c6 100644
--- a/src/test/ui/cast-errors-issue-43825.stderr
+++ b/src/test/ui/cast-errors-issue-43825.stderr
@@ -6,4 +6,4 @@ LL |     let error = error; //~ ERROR cannot find value `error`
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0425"
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/cast-rfc0401-2.stderr b/src/test/ui/cast-rfc0401-2.stderr
index e0c39d84c19..f7ffa245959 100644
--- a/src/test/ui/cast-rfc0401-2.stderr
+++ b/src/test/ui/cast-rfc0401-2.stderr
@@ -8,4 +8,4 @@ LL |     let _ = 3 as bool;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0054"
+For more information about this error, try `rustc --explain E0054`.
diff --git a/src/test/ui/cast-to-unsized-trait-object-suggestion.stderr b/src/test/ui/cast-to-unsized-trait-object-suggestion.stderr
index b2497dfeb28..67c33740f19 100644
--- a/src/test/ui/cast-to-unsized-trait-object-suggestion.stderr
+++ b/src/test/ui/cast-to-unsized-trait-object-suggestion.stderr
@@ -16,4 +16,4 @@ LL |     Box::new(1) as Send; //~ ERROR cast to unsized
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0620"
+For more information about this error, try `rustc --explain E0620`.
diff --git a/src/test/ui/casts-differing-anon.stderr b/src/test/ui/casts-differing-anon.stderr
index c5fbbbc0e9e..acbff4f73c3 100644
--- a/src/test/ui/casts-differing-anon.stderr
+++ b/src/test/ui/casts-differing-anon.stderr
@@ -8,4 +8,4 @@ LL |     b_raw = f_raw as *mut _; //~ ERROR is invalid
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0606"
+For more information about this error, try `rustc --explain E0606`.
diff --git a/src/test/ui/casts-issue-46365.stderr b/src/test/ui/casts-issue-46365.stderr
index 138388f2976..08ba5e4b321 100644
--- a/src/test/ui/casts-issue-46365.stderr
+++ b/src/test/ui/casts-issue-46365.stderr
@@ -6,4 +6,4 @@ LL |     ipsum: Ipsum //~ ERROR cannot find type `Ipsum`
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0412"
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/changing-crates.stderr b/src/test/ui/changing-crates.stderr
index 436335aa917..d8de685c7d7 100644
--- a/src/test/ui/changing-crates.stderr
+++ b/src/test/ui/changing-crates.stderr
@@ -11,4 +11,4 @@ LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0460"
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/check_match/issue-35609.stderr b/src/test/ui/check_match/issue-35609.stderr
index 3768d5782e7..418573171f1 100644
--- a/src/test/ui/check_match/issue-35609.stderr
+++ b/src/test/ui/check_match/issue-35609.stderr
@@ -48,4 +48,4 @@ LL |     match Some(A) { //~ ERROR non-exhaustive
 
 error: aborting due to 8 previous errors
 
-If you want more information on this error, try using "rustc --explain E0004"
+For more information about this error, try `rustc --explain E0004`.
diff --git a/src/test/ui/closure-expected-type/expect-region-supply-region.stderr b/src/test/ui/closure-expected-type/expect-region-supply-region.stderr
index 20661cae5ca..8184616c97f 100644
--- a/src/test/ui/closure-expected-type/expect-region-supply-region.stderr
+++ b/src/test/ui/closure-expected-type/expect-region-supply-region.stderr
@@ -84,4 +84,4 @@ LL |         f = Some(x);
 
 error: aborting due to 5 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/closure_context/issue-26046-fn-mut.stderr b/src/test/ui/closure_context/issue-26046-fn-mut.stderr
index 9cc0f1bf9df..ac98d9427e4 100644
--- a/src/test/ui/closure_context/issue-26046-fn-mut.stderr
+++ b/src/test/ui/closure_context/issue-26046-fn-mut.stderr
@@ -11,4 +11,4 @@ LL |     Box::new(closure)
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0525"
+For more information about this error, try `rustc --explain E0525`.
diff --git a/src/test/ui/closure_context/issue-26046-fn-once.stderr b/src/test/ui/closure_context/issue-26046-fn-once.stderr
index 0facdaf3c70..e09fdb5fb77 100644
--- a/src/test/ui/closure_context/issue-26046-fn-once.stderr
+++ b/src/test/ui/closure_context/issue-26046-fn-once.stderr
@@ -11,4 +11,4 @@ LL |     Box::new(closure)
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0525"
+For more information about this error, try `rustc --explain E0525`.
diff --git a/src/test/ui/closure_context/issue-42065.stderr b/src/test/ui/closure_context/issue-42065.stderr
index fdbec34ca7e..5c2105c4f79 100644
--- a/src/test/ui/closure_context/issue-42065.stderr
+++ b/src/test/ui/closure_context/issue-42065.stderr
@@ -14,4 +14,4 @@ LL |         for (key, value) in dict {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0382"
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
index 6531e3b8f8b..7975966bf80 100644
--- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
+++ b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
@@ -8,4 +8,4 @@ LL | impl C { fn f() {} }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0592"
+For more information about this error, try `rustc --explain E0592`.
diff --git a/src/test/ui/codemap_tests/empty_span.stderr b/src/test/ui/codemap_tests/empty_span.stderr
index 63b19c9e0c6..1bd8d8e37fe 100644
--- a/src/test/ui/codemap_tests/empty_span.stderr
+++ b/src/test/ui/codemap_tests/empty_span.stderr
@@ -6,4 +6,4 @@ LL |     unsafe impl Send for &'static Foo { } //~ ERROR cross-crate traits with
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0321"
+For more information about this error, try `rustc --explain E0321`.
diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr b/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
index 2fdd6906a56..68818f50cd2 100644
--- a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
+++ b/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
@@ -9,4 +9,4 @@ LL |     let y = &mut x; //~ ERROR cannot borrow
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/codemap_tests/issue-11715.stderr b/src/test/ui/codemap_tests/issue-11715.stderr
index d44dac0d537..d9551d7918a 100644
--- a/src/test/ui/codemap_tests/issue-11715.stderr
+++ b/src/test/ui/codemap_tests/issue-11715.stderr
@@ -10,4 +10,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0499"
+For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/codemap_tests/issue-28308.stderr b/src/test/ui/codemap_tests/issue-28308.stderr
index 947c8142e31..53fde4a628d 100644
--- a/src/test/ui/codemap_tests/issue-28308.stderr
+++ b/src/test/ui/codemap_tests/issue-28308.stderr
@@ -8,4 +8,4 @@ LL |     assert!("foo");
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0600"
+For more information about this error, try `rustc --explain E0600`.
diff --git a/src/test/ui/codemap_tests/one_line.stderr b/src/test/ui/codemap_tests/one_line.stderr
index a31a5318b41..5a6d474ed16 100644
--- a/src/test/ui/codemap_tests/one_line.stderr
+++ b/src/test/ui/codemap_tests/one_line.stderr
@@ -9,4 +9,4 @@ LL |     v.push(v.pop().unwrap()); //~ ERROR cannot borrow
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0499"
+For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr b/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
index d11ac5463f0..db729ac34f3 100644
--- a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
+++ b/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
@@ -29,4 +29,4 @@ LL |     fn baz(&self) {}
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0592"
+For more information about this error, try `rustc --explain E0592`.
diff --git a/src/test/ui/codemap_tests/overlapping_spans.stderr b/src/test/ui/codemap_tests/overlapping_spans.stderr
index c585964a527..62a4f08e156 100644
--- a/src/test/ui/codemap_tests/overlapping_spans.stderr
+++ b/src/test/ui/codemap_tests/overlapping_spans.stderr
@@ -9,4 +9,4 @@ LL |         S {f:_s} => {} //~ ERROR cannot move out
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0509"
+For more information about this error, try `rustc --explain E0509`.
diff --git a/src/test/ui/codemap_tests/tab.stderr b/src/test/ui/codemap_tests/tab.stderr
index 0f683bd6841..c466610bcec 100644
--- a/src/test/ui/codemap_tests/tab.stderr
+++ b/src/test/ui/codemap_tests/tab.stderr
@@ -17,5 +17,5 @@ LL |     "bar            boo" //~ ERROR mismatched types
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0308, E0425
-If you want more information on an error, try using "rustc --explain E0308"
+Some errors occurred: E0308, E0425.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/codemap_tests/tab_3.stderr b/src/test/ui/codemap_tests/tab_3.stderr
index c2826359e08..d960c0b7da8 100644
--- a/src/test/ui/codemap_tests/tab_3.stderr
+++ b/src/test/ui/codemap_tests/tab_3.stderr
@@ -11,4 +11,4 @@ LL |         println!("{:?}", some_vec); //~ ERROR use of moved
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0382"
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/codemap_tests/two_files.stderr b/src/test/ui/codemap_tests/two_files.stderr
index a7fa82a0ba1..614531c9821 100644
--- a/src/test/ui/codemap_tests/two_files.stderr
+++ b/src/test/ui/codemap_tests/two_files.stderr
@@ -6,4 +6,3 @@ LL | impl Bar for Baz { } //~ ERROR expected trait, found type alias
 
 error: cannot continue compilation due to previous error
 
-If you want more information on this error, try using "rustc --explain E0404"
diff --git a/src/test/ui/codemap_tests/unicode_2.stderr b/src/test/ui/codemap_tests/unicode_2.stderr
index b75245589b0..b7f7f7fc5ce 100644
--- a/src/test/ui/codemap_tests/unicode_2.stderr
+++ b/src/test/ui/codemap_tests/unicode_2.stderr
@@ -22,4 +22,4 @@ LL |     let _ = a̐é; //~ ERROR cannot find
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0425"
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/coercion-missing-tail-expected-type.stderr b/src/test/ui/coercion-missing-tail-expected-type.stderr
index 74b6f083f38..84b6c961a25 100644
--- a/src/test/ui/coercion-missing-tail-expected-type.stderr
+++ b/src/test/ui/coercion-missing-tail-expected-type.stderr
@@ -26,4 +26,4 @@ LL | | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/coherence-error-suppression.stderr b/src/test/ui/coherence-error-suppression.stderr
index e195e9452e5..8cf3fe760f1 100644
--- a/src/test/ui/coherence-error-suppression.stderr
+++ b/src/test/ui/coherence-error-suppression.stderr
@@ -6,4 +6,4 @@ LL | impl Foo for DoesNotExist {} //~ ERROR cannot find type `DoesNotExist` in t
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0412"
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/coherence-impls-copy.stderr b/src/test/ui/coherence-impls-copy.stderr
index 029b0478952..d98492876e8 100644
--- a/src/test/ui/coherence-impls-copy.stderr
+++ b/src/test/ui/coherence-impls-copy.stderr
@@ -57,5 +57,5 @@ LL | impl Copy for &'static [NotSync] {}
 
 error: aborting due to 8 previous errors
 
-You've got a few errors: E0117, E0206
-If you want more information on an error, try using "rustc --explain E0117"
+Some errors occurred: E0117, E0206.
+For more information about an error, try `rustc --explain E0117`.
diff --git a/src/test/ui/coherence-overlap-downstream-inherent.stderr b/src/test/ui/coherence-overlap-downstream-inherent.stderr
index ec315d897ac..29df3f9c37a 100644
--- a/src/test/ui/coherence-overlap-downstream-inherent.stderr
+++ b/src/test/ui/coherence-overlap-downstream-inherent.stderr
@@ -20,4 +20,4 @@ LL | impl<X> A<i32, X> { fn f(&self) {} }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0592"
+For more information about this error, try `rustc --explain E0592`.
diff --git a/src/test/ui/coherence-overlap-downstream.stderr b/src/test/ui/coherence-overlap-downstream.stderr
index 1fac596ed30..8e14e4f9bda 100644
--- a/src/test/ui/coherence-overlap-downstream.stderr
+++ b/src/test/ui/coherence-overlap-downstream.stderr
@@ -18,4 +18,4 @@ LL | impl<X> Foo<X> for i32 {}
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0119"
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/coherence-overlap-issue-23516-inherent.stderr b/src/test/ui/coherence-overlap-issue-23516-inherent.stderr
index 6bb73e6d383..d217a4d2cdf 100644
--- a/src/test/ui/coherence-overlap-issue-23516-inherent.stderr
+++ b/src/test/ui/coherence-overlap-issue-23516-inherent.stderr
@@ -11,4 +11,4 @@ LL | impl<U:Sugar> Cake<Box<U>> { fn dummy(&self) { } }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0592"
+For more information about this error, try `rustc --explain E0592`.
diff --git a/src/test/ui/coherence-overlap-issue-23516.stderr b/src/test/ui/coherence-overlap-issue-23516.stderr
index fe4e7cf3487..ea2ecda6f0d 100644
--- a/src/test/ui/coherence-overlap-issue-23516.stderr
+++ b/src/test/ui/coherence-overlap-issue-23516.stderr
@@ -10,4 +10,4 @@ LL | impl<U:Sugar> Sweet for Box<U> { }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0119"
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/coherence-overlap-upstream-inherent.stderr b/src/test/ui/coherence-overlap-upstream-inherent.stderr
index a7a6003b06c..6c6f0dc2483 100644
--- a/src/test/ui/coherence-overlap-upstream-inherent.stderr
+++ b/src/test/ui/coherence-overlap-upstream-inherent.stderr
@@ -11,4 +11,4 @@ LL | impl A<i16> { fn dummy(&self) { } }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0592"
+For more information about this error, try `rustc --explain E0592`.
diff --git a/src/test/ui/coherence-overlap-upstream.stderr b/src/test/ui/coherence-overlap-upstream.stderr
index cc199548f06..794c830cc5b 100644
--- a/src/test/ui/coherence-overlap-upstream.stderr
+++ b/src/test/ui/coherence-overlap-upstream.stderr
@@ -10,4 +10,4 @@ LL | impl Foo for i16 {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0119"
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/command-line-diagnostics.stderr b/src/test/ui/command-line-diagnostics.stderr
index 9e9e03373e8..2a45edae325 100644
--- a/src/test/ui/command-line-diagnostics.stderr
+++ b/src/test/ui/command-line-diagnostics.stderr
@@ -8,4 +8,4 @@ LL |     x = 43;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0384"
+For more information about this error, try `rustc --explain E0384`.
diff --git a/src/test/ui/compare-method/proj-outlives-region.stderr b/src/test/ui/compare-method/proj-outlives-region.stderr
index 9abecb2e03c..5d734a25fe8 100644
--- a/src/test/ui/compare-method/proj-outlives-region.stderr
+++ b/src/test/ui/compare-method/proj-outlives-region.stderr
@@ -9,4 +9,4 @@ LL |     fn foo() where U: 'a { } //~ ERROR E0276
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0276"
+For more information about this error, try `rustc --explain E0276`.
diff --git a/src/test/ui/compare-method/region-extra-2.stderr b/src/test/ui/compare-method/region-extra-2.stderr
index 32d7024db35..4e4f0d7c7bc 100644
--- a/src/test/ui/compare-method/region-extra-2.stderr
+++ b/src/test/ui/compare-method/region-extra-2.stderr
@@ -9,4 +9,4 @@ LL |     fn renew<'b: 'a>(self) -> &'b mut [T] where 'a: 'b {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0276"
+For more information about this error, try `rustc --explain E0276`.
diff --git a/src/test/ui/compare-method/region-extra.stderr b/src/test/ui/compare-method/region-extra.stderr
index ce62cc62e22..a366fe74676 100644
--- a/src/test/ui/compare-method/region-extra.stderr
+++ b/src/test/ui/compare-method/region-extra.stderr
@@ -9,4 +9,4 @@ LL |     fn foo() where 'a: 'b { } //~ ERROR impl has stricter
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0276"
+For more information about this error, try `rustc --explain E0276`.
diff --git a/src/test/ui/compare-method/region-unrelated.stderr b/src/test/ui/compare-method/region-unrelated.stderr
index 2026dd1f1cc..6448e0fb25a 100644
--- a/src/test/ui/compare-method/region-unrelated.stderr
+++ b/src/test/ui/compare-method/region-unrelated.stderr
@@ -9,4 +9,4 @@ LL |     fn foo() where V: 'a { }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0276"
+For more information about this error, try `rustc --explain E0276`.
diff --git a/src/test/ui/compare-method/reordered-type-param.stderr b/src/test/ui/compare-method/reordered-type-param.stderr
index 8f0744fa56d..1efd5f2fb25 100644
--- a/src/test/ui/compare-method/reordered-type-param.stderr
+++ b/src/test/ui/compare-method/reordered-type-param.stderr
@@ -12,4 +12,4 @@ LL |   fn b<F:Clone,G>(&self, _x: G) -> G { panic!() } //~ ERROR method `b` has
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0053"
+For more information about this error, try `rustc --explain E0053`.
diff --git a/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr b/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr
index 53aced771cc..4530cb18718 100644
--- a/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr
+++ b/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr
@@ -9,4 +9,4 @@ LL |     fn b<F: Sync, G>(&self, _x: F) -> F { panic!() } //~ ERROR E0276
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0276"
+For more information about this error, try `rustc --explain E0276`.
diff --git a/src/test/ui/compare-method/traits-misc-mismatch-1.stderr b/src/test/ui/compare-method/traits-misc-mismatch-1.stderr
index a0c333c3a53..e99ce95b371 100644
--- a/src/test/ui/compare-method/traits-misc-mismatch-1.stderr
+++ b/src/test/ui/compare-method/traits-misc-mismatch-1.stderr
@@ -63,4 +63,4 @@ LL |     fn method<G: Getter<usize>>(&self) {}
 
 error: aborting due to 7 previous errors
 
-If you want more information on this error, try using "rustc --explain E0276"
+For more information about this error, try `rustc --explain E0276`.
diff --git a/src/test/ui/compare-method/traits-misc-mismatch-2.stderr b/src/test/ui/compare-method/traits-misc-mismatch-2.stderr
index 921b0e5d1c4..1de5b1a8a1a 100644
--- a/src/test/ui/compare-method/traits-misc-mismatch-2.stderr
+++ b/src/test/ui/compare-method/traits-misc-mismatch-2.stderr
@@ -9,4 +9,4 @@ LL |     fn zip<B, U: Iterator<B>>(self, other: U) -> ZipIterator<T, U> {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0276"
+For more information about this error, try `rustc --explain E0276`.
diff --git a/src/test/ui/const-deref-ptr.stderr b/src/test/ui/const-deref-ptr.stderr
index 8a80802c52c..61db58104d2 100644
--- a/src/test/ui/const-deref-ptr.stderr
+++ b/src/test/ui/const-deref-ptr.stderr
@@ -6,4 +6,4 @@ LL |     static C: u64 = unsafe {*(0xdeadbeef as *const u64)}; //~ ERROR E0396
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0396"
+For more information about this error, try `rustc --explain E0396`.
diff --git a/src/test/ui/const-eval-overflow-2.stderr b/src/test/ui/const-eval-overflow-2.stderr
index f376de7cc4c..9cee718c286 100644
--- a/src/test/ui/const-eval-overflow-2.stderr
+++ b/src/test/ui/const-eval-overflow-2.stderr
@@ -12,4 +12,4 @@ LL |         NEG_NEG_128 => println!("A"),
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0080"
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/const-eval-overflow-4.stderr b/src/test/ui/const-eval-overflow-4.stderr
index 14753038fef..db0a6fc8204 100644
--- a/src/test/ui/const-eval-overflow-4.stderr
+++ b/src/test/ui/const-eval-overflow-4.stderr
@@ -14,4 +14,4 @@ LL |     : [u32; (i8::MAX as i8 + 1i8) as usize]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0080"
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/const-eval-span.stderr b/src/test/ui/const-eval-span.stderr
index e3c28cafc62..afe8d1bc0b5 100644
--- a/src/test/ui/const-eval-span.stderr
+++ b/src/test/ui/const-eval-span.stderr
@@ -9,4 +9,4 @@ LL |     V = CONSTANT,
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/const-eval/conditional_array_execution.stderr b/src/test/ui/const-eval/conditional_array_execution.stderr
index 4cf12e22283..9270dafbe65 100644
--- a/src/test/ui/const-eval/conditional_array_execution.stderr
+++ b/src/test/ui/const-eval/conditional_array_execution.stderr
@@ -14,4 +14,4 @@ LL |     println!("{}", FOO); //~ E0080
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0080"
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/const-eval/index_out_of_bound.stderr b/src/test/ui/const-eval/index_out_of_bound.stderr
index 7651fb257e3..793e0a7ace8 100644
--- a/src/test/ui/const-eval/index_out_of_bound.stderr
+++ b/src/test/ui/const-eval/index_out_of_bound.stderr
@@ -6,4 +6,4 @@ LL | static FOO: i32 = [][0];
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0080"
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/const-eval/issue-43197.stderr b/src/test/ui/const-eval/issue-43197.stderr
index 3f108268747..2d51e6603b5 100644
--- a/src/test/ui/const-eval/issue-43197.stderr
+++ b/src/test/ui/const-eval/issue-43197.stderr
@@ -26,4 +26,4 @@ LL |     println!("{} {}", X, Y);
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0080"
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/const-fn-error.stderr b/src/test/ui/const-fn-error.stderr
index d57efce0dff..077c4d60e64 100644
--- a/src/test/ui/const-fn-error.stderr
+++ b/src/test/ui/const-fn-error.stderr
@@ -33,5 +33,5 @@ LL |     let a : [i32; f(X)];
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0015, E0016, E0019, E0080
-If you want more information on an error, try using "rustc --explain E0015"
+Some errors occurred: E0015, E0016, E0019, E0080.
+For more information about an error, try `rustc --explain E0015`.
diff --git a/src/test/ui/const-fn-mismatch.stderr b/src/test/ui/const-fn-mismatch.stderr
index efbf701120d..1c9728fec9e 100644
--- a/src/test/ui/const-fn-mismatch.stderr
+++ b/src/test/ui/const-fn-mismatch.stderr
@@ -6,4 +6,4 @@ LL |     const fn f() -> u32 { 22 }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0379"
+For more information about this error, try `rustc --explain E0379`.
diff --git a/src/test/ui/const-fn-not-in-trait.stderr b/src/test/ui/const-fn-not-in-trait.stderr
index 4a77862c312..5801f701ff8 100644
--- a/src/test/ui/const-fn-not-in-trait.stderr
+++ b/src/test/ui/const-fn-not-in-trait.stderr
@@ -12,4 +12,4 @@ LL |     const fn g() -> u32 { 0 }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0379"
+For more information about this error, try `rustc --explain E0379`.
diff --git a/src/test/ui/const-len-underflow-separate-spans.stderr b/src/test/ui/const-len-underflow-separate-spans.stderr
index 98f4ac9e83f..8d737dbfc08 100644
--- a/src/test/ui/const-len-underflow-separate-spans.stderr
+++ b/src/test/ui/const-len-underflow-separate-spans.stderr
@@ -20,4 +20,4 @@ LL |     let a: [i8; LEN] = unimplemented!();
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0080"
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/const-pattern-irrefutable.stderr b/src/test/ui/const-pattern-irrefutable.stderr
index 9a05d4c76c4..6d5738f3328 100644
--- a/src/test/ui/const-pattern-irrefutable.stderr
+++ b/src/test/ui/const-pattern-irrefutable.stderr
@@ -18,4 +18,4 @@ LL |     let d = 4; //~ ERROR refutable pattern in local binding: `_` not covere
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0005"
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/const-unsized.stderr b/src/test/ui/const-unsized.stderr
index 478539c88ea..0bbb5debbba 100644
--- a/src/test/ui/const-unsized.stderr
+++ b/src/test/ui/const-unsized.stderr
@@ -36,4 +36,4 @@ LL | static STATIC_BAR: str = *"bar";
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/cycle-trait-supertrait-indirect.stderr b/src/test/ui/cycle-trait-supertrait-indirect.stderr
index 388da3f860e..68c20df5f72 100644
--- a/src/test/ui/cycle-trait-supertrait-indirect.stderr
+++ b/src/test/ui/cycle-trait-supertrait-indirect.stderr
@@ -18,4 +18,4 @@ LL | trait B: C {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0391"
+For more information about this error, try `rustc --explain E0391`.
diff --git a/src/test/ui/deref-suggestion.stderr b/src/test/ui/deref-suggestion.stderr
index 620cbd9d336..a5f87928924 100644
--- a/src/test/ui/deref-suggestion.stderr
+++ b/src/test/ui/deref-suggestion.stderr
@@ -60,4 +60,4 @@ LL |     foo3(borrow!(0));
 
 error: aborting due to 5 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/derived-errors/issue-31997-1.stderr b/src/test/ui/derived-errors/issue-31997-1.stderr
index 92c025046a2..7cdcac3891f 100644
--- a/src/test/ui/derived-errors/issue-31997-1.stderr
+++ b/src/test/ui/derived-errors/issue-31997-1.stderr
@@ -6,4 +6,4 @@ LL |     let mut map = HashMap::new();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0433"
+For more information about this error, try `rustc --explain E0433`.
diff --git a/src/test/ui/did_you_mean/E0178.stderr b/src/test/ui/did_you_mean/E0178.stderr
index 293cf7444f4..29e7aeb45ca 100644
--- a/src/test/ui/did_you_mean/E0178.stderr
+++ b/src/test/ui/did_you_mean/E0178.stderr
@@ -24,4 +24,4 @@ LL |     z: fn() -> Foo + 'a, //~ ERROR expected a path
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0178"
+For more information about this error, try `rustc --explain E0178`.
diff --git a/src/test/ui/did_you_mean/bad-assoc-pat.stderr b/src/test/ui/did_you_mean/bad-assoc-pat.stderr
index 80caa86fde5..10ee175a97e 100644
--- a/src/test/ui/did_you_mean/bad-assoc-pat.stderr
+++ b/src/test/ui/did_you_mean/bad-assoc-pat.stderr
@@ -48,4 +48,4 @@ LL |         &(u8,)::AssocItem => {}
 
 error: aborting due to 8 previous errors
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/did_you_mean/bad-assoc-ty.stderr b/src/test/ui/did_you_mean/bad-assoc-ty.stderr
index b584fa16988..45dce3d8740 100644
--- a/src/test/ui/did_you_mean/bad-assoc-ty.stderr
+++ b/src/test/ui/did_you_mean/bad-assoc-ty.stderr
@@ -104,5 +104,5 @@ LL | type H = Fn(u8) -> (u8)::Output;
 
 error: aborting due to 15 previous errors
 
-You've got a few errors: E0121, E0223
-If you want more information on an error, try using "rustc --explain E0121"
+Some errors occurred: E0121, E0223.
+For more information about an error, try `rustc --explain E0121`.
diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr
index 5290b388e47..1e55b0c024f 100644
--- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr
+++ b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr
@@ -10,4 +10,4 @@ LL |     f1.foo(1usize);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr
index d1b3b2031f6..eee7f32032b 100644
--- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr
+++ b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr
@@ -13,4 +13,4 @@ LL |     f1.foo(1usize);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/did_you_mean/issue-31424.stderr b/src/test/ui/did_you_mean/issue-31424.stderr
index eb2659e1fca..a80593e05f1 100644
--- a/src/test/ui/did_you_mean/issue-31424.stderr
+++ b/src/test/ui/did_you_mean/issue-31424.stderr
@@ -17,4 +17,4 @@ LL |         (&mut self).bar(); //~ ERROR cannot borrow
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/did_you_mean/issue-34126.stderr b/src/test/ui/did_you_mean/issue-34126.stderr
index b99b1b54d53..08ece78b788 100644
--- a/src/test/ui/did_you_mean/issue-34126.stderr
+++ b/src/test/ui/did_you_mean/issue-34126.stderr
@@ -9,4 +9,4 @@ LL |         self.run(&mut self); //~ ERROR cannot borrow
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/did_you_mean/issue-34337.stderr b/src/test/ui/did_you_mean/issue-34337.stderr
index 3b73132423d..7a4a03ce5d7 100644
--- a/src/test/ui/did_you_mean/issue-34337.stderr
+++ b/src/test/ui/did_you_mean/issue-34337.stderr
@@ -9,4 +9,4 @@ LL |     get(&mut key); //~ ERROR cannot borrow
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/did_you_mean/issue-35937.stderr b/src/test/ui/did_you_mean/issue-35937.stderr
index 7894ca20881..4a29cd81425 100644
--- a/src/test/ui/did_you_mean/issue-35937.stderr
+++ b/src/test/ui/did_you_mean/issue-35937.stderr
@@ -24,5 +24,5 @@ LL |     s.x += 1; //~ ERROR cannot assign
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0594, E0596
-If you want more information on an error, try using "rustc --explain E0594"
+Some errors occurred: E0594, E0596.
+For more information about an error, try `rustc --explain E0594`.
diff --git a/src/test/ui/did_you_mean/issue-36798.stderr b/src/test/ui/did_you_mean/issue-36798.stderr
index 100f93d2e31..c0a73abdf72 100644
--- a/src/test/ui/did_you_mean/issue-36798.stderr
+++ b/src/test/ui/did_you_mean/issue-36798.stderr
@@ -6,4 +6,4 @@ LL |     f.baz; //~ ERROR no field
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0609"
+For more information about this error, try `rustc --explain E0609`.
diff --git a/src/test/ui/did_you_mean/issue-36798_unknown_field.stderr b/src/test/ui/did_you_mean/issue-36798_unknown_field.stderr
index 4bbadf3a790..4cf0df44351 100644
--- a/src/test/ui/did_you_mean/issue-36798_unknown_field.stderr
+++ b/src/test/ui/did_you_mean/issue-36798_unknown_field.stderr
@@ -8,4 +8,4 @@ LL |     f.zz; //~ ERROR no field
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0609"
+For more information about this error, try `rustc --explain E0609`.
diff --git a/src/test/ui/did_you_mean/issue-37139.stderr b/src/test/ui/did_you_mean/issue-37139.stderr
index 9d918964ce6..7cf3326f9d6 100644
--- a/src/test/ui/did_you_mean/issue-37139.stderr
+++ b/src/test/ui/did_you_mean/issue-37139.stderr
@@ -9,4 +9,4 @@ LL |             test(&mut x); //~ ERROR cannot borrow immutable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr b/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr
index 5a9fbafb8eb..e3c75599a41 100644
--- a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr
+++ b/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr
@@ -12,4 +12,4 @@ LL | use Foo1; //~ ERROR unresolved
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0432"
+For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/did_you_mean/issue-38147-1.stderr b/src/test/ui/did_you_mean/issue-38147-1.stderr
index ca842b39646..4ebb5683405 100644
--- a/src/test/ui/did_you_mean/issue-38147-1.stderr
+++ b/src/test/ui/did_you_mean/issue-38147-1.stderr
@@ -8,4 +8,4 @@ LL |         self.s.push('x'); //~ ERROR cannot borrow data mutably
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0389"
+For more information about this error, try `rustc --explain E0389`.
diff --git a/src/test/ui/did_you_mean/issue-38147-2.stderr b/src/test/ui/did_you_mean/issue-38147-2.stderr
index 606f1dd5223..31433cf83c3 100644
--- a/src/test/ui/did_you_mean/issue-38147-2.stderr
+++ b/src/test/ui/did_you_mean/issue-38147-2.stderr
@@ -9,4 +9,4 @@ LL |         self.s.push('x');
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/did_you_mean/issue-38147-3.stderr b/src/test/ui/did_you_mean/issue-38147-3.stderr
index cf075204e8b..8bb23acdc40 100644
--- a/src/test/ui/did_you_mean/issue-38147-3.stderr
+++ b/src/test/ui/did_you_mean/issue-38147-3.stderr
@@ -9,4 +9,4 @@ LL |         self.s.push('x');
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/did_you_mean/issue-38147-4.stderr b/src/test/ui/did_you_mean/issue-38147-4.stderr
index a10acf1460d..e78cea14a7b 100644
--- a/src/test/ui/did_you_mean/issue-38147-4.stderr
+++ b/src/test/ui/did_you_mean/issue-38147-4.stderr
@@ -8,4 +8,4 @@ LL |     f.s.push('x'); //~ ERROR cannot borrow data mutably
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0389"
+For more information about this error, try `rustc --explain E0389`.
diff --git a/src/test/ui/did_you_mean/issue-39544.stderr b/src/test/ui/did_you_mean/issue-39544.stderr
index a05b70b2eb8..dfa9cb880e5 100644
--- a/src/test/ui/did_you_mean/issue-39544.stderr
+++ b/src/test/ui/did_you_mean/issue-39544.stderr
@@ -98,5 +98,5 @@ LL |     *x.0 = 1;
 
 error: aborting due to 12 previous errors
 
-You've got a few errors: E0594, E0596
-If you want more information on an error, try using "rustc --explain E0594"
+Some errors occurred: E0594, E0596.
+For more information about an error, try `rustc --explain E0594`.
diff --git a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr b/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr
index c08ee4247c7..3f955da86ba 100644
--- a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr
+++ b/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr
@@ -53,4 +53,4 @@ LL |     fn bar(&self){}
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/did_you_mean/issue-40006.stderr b/src/test/ui/did_you_mean/issue-40006.stderr
index e576393500f..a3433939573 100644
--- a/src/test/ui/did_you_mean/issue-40006.stderr
+++ b/src/test/ui/did_you_mean/issue-40006.stderr
@@ -66,4 +66,4 @@ LL | impl X { //~ ERROR cannot be made into an object
 
 error: aborting due to 9 previous errors
 
-If you want more information on this error, try using "rustc --explain E0038"
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/did_you_mean/issue-40823.stderr b/src/test/ui/did_you_mean/issue-40823.stderr
index 3aece9908a9..20e95513ec2 100644
--- a/src/test/ui/did_you_mean/issue-40823.stderr
+++ b/src/test/ui/did_you_mean/issue-40823.stderr
@@ -6,4 +6,4 @@ LL |     buf.iter_mut(); //~ ERROR cannot borrow immutable borrowed content
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr b/src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr
index 64c20ff8e07..c4b282bde52 100644
--- a/src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr
+++ b/src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr
@@ -28,5 +28,5 @@ LL |     let egregious_field_misaccess = demo.egregiously_nonexistent_field;
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0560, E0609
-If you want more information on an error, try using "rustc --explain E0560"
+Some errors occurred: E0560, E0609.
+For more information about an error, try `rustc --explain E0560`.
diff --git a/src/test/ui/did_you_mean/issue-42764.stderr b/src/test/ui/did_you_mean/issue-42764.stderr
index 390b214e62e..f1da920872d 100644
--- a/src/test/ui/did_you_mean/issue-42764.stderr
+++ b/src/test/ui/did_you_mean/issue-42764.stderr
@@ -15,4 +15,4 @@ LL |     this_function_expects_a_double_option(DoubleOption::AlternativeSome(n))
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr b/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr
index 1f653c90886..779ae31ca30 100644
--- a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr
+++ b/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr
@@ -30,5 +30,5 @@ LL |     if let Example(_) = y { //~ ERROR expected tuple struct/variant, found
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0423, E0532
-If you want more information on an error, try using "rustc --explain E0423"
+Some errors occurred: E0423, E0532.
+For more information about an error, try `rustc --explain E0423`.
diff --git a/src/test/ui/did_you_mean/recursion_limit.stderr b/src/test/ui/did_you_mean/recursion_limit.stderr
index 8b34c533d8b..691c7ccd9fd 100644
--- a/src/test/ui/did_you_mean/recursion_limit.stderr
+++ b/src/test/ui/did_you_mean/recursion_limit.stderr
@@ -23,4 +23,4 @@ LL | fn is_send<T:Send>() { }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0275"
+For more information about this error, try `rustc --explain E0275`.
diff --git a/src/test/ui/did_you_mean/recursion_limit_deref.stderr b/src/test/ui/did_you_mean/recursion_limit_deref.stderr
index a4048fbfb26..2c803961557 100644
--- a/src/test/ui/did_you_mean/recursion_limit_deref.stderr
+++ b/src/test/ui/did_you_mean/recursion_limit_deref.stderr
@@ -21,5 +21,5 @@ LL |     let x: &Bottom = &t; //~ ERROR mismatched types
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0055, E0308
-If you want more information on an error, try using "rustc --explain E0055"
+Some errors occurred: E0055, E0308.
+For more information about an error, try `rustc --explain E0055`.
diff --git a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr b/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
index fcfa80e1c9d..6dd21648931 100644
--- a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
+++ b/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
@@ -20,5 +20,5 @@ LL |     let _: &Copy + 'static; //~ ERROR expected a path
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0038, E0178
-If you want more information on an error, try using "rustc --explain E0038"
+Some errors occurred: E0038, E0178.
+For more information about an error, try `rustc --explain E0038`.
diff --git a/src/test/ui/discrim-overflow-2.stderr b/src/test/ui/discrim-overflow-2.stderr
index 6162766b587..bd610bc7163 100644
--- a/src/test/ui/discrim-overflow-2.stderr
+++ b/src/test/ui/discrim-overflow-2.stderr
@@ -64,4 +64,4 @@ LL |         OhNo, //~ ERROR enum discriminant overflowed [E0370]
 
 error: aborting due to 8 previous errors
 
-If you want more information on this error, try using "rustc --explain E0370"
+For more information about this error, try `rustc --explain E0370`.
diff --git a/src/test/ui/discrim-overflow.stderr b/src/test/ui/discrim-overflow.stderr
index a713aea1b21..ef784679ce0 100644
--- a/src/test/ui/discrim-overflow.stderr
+++ b/src/test/ui/discrim-overflow.stderr
@@ -64,4 +64,4 @@ LL |         OhNo, //~ ERROR enum discriminant overflowed [E0370]
 
 error: aborting due to 8 previous errors
 
-If you want more information on this error, try using "rustc --explain E0370"
+For more information about this error, try `rustc --explain E0370`.
diff --git a/src/test/ui/double-import.stderr b/src/test/ui/double-import.stderr
index ceddff4047b..df6463a7e28 100644
--- a/src/test/ui/double-import.stderr
+++ b/src/test/ui/double-import.stderr
@@ -14,4 +14,4 @@ LL | use sub2::foo as other_foo; //~ ERROR the name `foo` is defined multiple ti
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0252"
+For more information about this error, try `rustc --explain E0252`.
diff --git a/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr b/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr
index 454ee6afe24..668fbf9521b 100644
--- a/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr
+++ b/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr
@@ -44,4 +44,4 @@ LL | }
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr b/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr
index d5b4e85ce5e..f4ea7f1bc50 100644
--- a/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr
+++ b/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr
@@ -22,4 +22,4 @@ LL | | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0569"
+For more information about this error, try `rustc --explain E0569`.
diff --git a/src/test/ui/dropck/dropck-eyepatch-reorder.stderr b/src/test/ui/dropck/dropck-eyepatch-reorder.stderr
index 6fac358e21a..e6ce53402f4 100644
--- a/src/test/ui/dropck/dropck-eyepatch-reorder.stderr
+++ b/src/test/ui/dropck/dropck-eyepatch-reorder.stderr
@@ -44,4 +44,4 @@ LL | }
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/dropck/dropck-eyepatch.stderr b/src/test/ui/dropck/dropck-eyepatch.stderr
index d8cc5bf2373..5e0a4a74421 100644
--- a/src/test/ui/dropck/dropck-eyepatch.stderr
+++ b/src/test/ui/dropck/dropck-eyepatch.stderr
@@ -44,4 +44,4 @@ LL | }
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/e0119/complex-impl.stderr b/src/test/ui/e0119/complex-impl.stderr
index b268c755404..0c331cf5e75 100644
--- a/src/test/ui/e0119/complex-impl.stderr
+++ b/src/test/ui/e0119/complex-impl.stderr
@@ -16,5 +16,5 @@ LL | impl<R> External for (Q, R) {} //~ ERROR must be used
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0119, E0210
-If you want more information on an error, try using "rustc --explain E0119"
+Some errors occurred: E0119, E0210.
+For more information about an error, try `rustc --explain E0119`.
diff --git a/src/test/ui/e0119/conflict-with-std.stderr b/src/test/ui/e0119/conflict-with-std.stderr
index ff17643f121..e8b2c84c0df 100644
--- a/src/test/ui/e0119/conflict-with-std.stderr
+++ b/src/test/ui/e0119/conflict-with-std.stderr
@@ -29,4 +29,4 @@ LL | impl TryFrom<X> for X { //~ ERROR conflicting implementations
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0119"
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/e0119/issue-23563.stderr b/src/test/ui/e0119/issue-23563.stderr
index 9ad86625344..0630b76882e 100644
--- a/src/test/ui/e0119/issue-23563.stderr
+++ b/src/test/ui/e0119/issue-23563.stderr
@@ -10,4 +10,4 @@ LL | impl<'a, T> LolFrom<&'a [T]> for LocalType<T> { //~ ERROR conflicting imple
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0119"
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/e0119/issue-27403.stderr b/src/test/ui/e0119/issue-27403.stderr
index 4f4a9e97d6b..9dea60a72b5 100644
--- a/src/test/ui/e0119/issue-27403.stderr
+++ b/src/test/ui/e0119/issue-27403.stderr
@@ -10,4 +10,4 @@ LL | impl<S> Into<S> for GenX<S> { //~ ERROR conflicting implementations
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0119"
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/e0119/issue-28981.stderr b/src/test/ui/e0119/issue-28981.stderr
index b1ec1111ede..16da24550bc 100644
--- a/src/test/ui/e0119/issue-28981.stderr
+++ b/src/test/ui/e0119/issue-28981.stderr
@@ -16,5 +16,5 @@ LL | impl<Foo> Deref for Foo { } //~ ERROR must be used
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0119, E0210
-If you want more information on an error, try using "rustc --explain E0119"
+Some errors occurred: E0119, E0210.
+For more information about an error, try `rustc --explain E0119`.
diff --git a/src/test/ui/e0119/so-37347311.stderr b/src/test/ui/e0119/so-37347311.stderr
index 8be27adc4a2..6c14b200ee5 100644
--- a/src/test/ui/e0119/so-37347311.stderr
+++ b/src/test/ui/e0119/so-37347311.stderr
@@ -9,4 +9,4 @@ LL | impl<S: Storage> From<S::Error> for MyError<S> { //~ ERROR conflicting impl
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0119"
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/empty-struct-unit-expr.stderr b/src/test/ui/empty-struct-unit-expr.stderr
index e64f383f91b..fff696fc80f 100644
--- a/src/test/ui/empty-struct-unit-expr.stderr
+++ b/src/test/ui/empty-struct-unit-expr.stderr
@@ -38,4 +38,4 @@ LL |     let xe4 = XE::XEmpty4;
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0618"
+For more information about this error, try `rustc --explain E0618`.
diff --git a/src/test/ui/enum-and-module-in-same-scope.stderr b/src/test/ui/enum-and-module-in-same-scope.stderr
index 86f7ee5bb0e..230872abe0b 100644
--- a/src/test/ui/enum-and-module-in-same-scope.stderr
+++ b/src/test/ui/enum-and-module-in-same-scope.stderr
@@ -11,4 +11,4 @@ LL | mod Foo { //~ ERROR the name `Foo` is defined multiple times
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0428"
+For more information about this error, try `rustc --explain E0428`.
diff --git a/src/test/ui/error-codes/E0004-2.stderr b/src/test/ui/error-codes/E0004-2.stderr
index c3412e73599..6a4392df35d 100644
--- a/src/test/ui/error-codes/E0004-2.stderr
+++ b/src/test/ui/error-codes/E0004-2.stderr
@@ -12,4 +12,4 @@ LL |     match x { } //~ ERROR E0004
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0004"
+For more information about this error, try `rustc --explain E0004`.
diff --git a/src/test/ui/error-codes/E0004.stderr b/src/test/ui/error-codes/E0004.stderr
index 56351f80f9d..cf364a88689 100644
--- a/src/test/ui/error-codes/E0004.stderr
+++ b/src/test/ui/error-codes/E0004.stderr
@@ -6,4 +6,4 @@ LL |     match x { //~ ERROR E0004
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0004"
+For more information about this error, try `rustc --explain E0004`.
diff --git a/src/test/ui/error-codes/E0005.stderr b/src/test/ui/error-codes/E0005.stderr
index d02817a6675..b321a69805e 100644
--- a/src/test/ui/error-codes/E0005.stderr
+++ b/src/test/ui/error-codes/E0005.stderr
@@ -6,4 +6,4 @@ LL |     let Some(y) = x; //~ ERROR E0005
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0005"
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/error-codes/E0007.stderr b/src/test/ui/error-codes/E0007.stderr
index c5cf140bab5..f662365b8f1 100644
--- a/src/test/ui/error-codes/E0007.stderr
+++ b/src/test/ui/error-codes/E0007.stderr
@@ -12,5 +12,5 @@ LL |         op_string @ Some(s) => {},
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0007, E0303
-If you want more information on an error, try using "rustc --explain E0007"
+Some errors occurred: E0007, E0303.
+For more information about an error, try `rustc --explain E0007`.
diff --git a/src/test/ui/error-codes/E0008.stderr b/src/test/ui/error-codes/E0008.stderr
index cdf6eff0fab..e9af3166ed5 100644
--- a/src/test/ui/error-codes/E0008.stderr
+++ b/src/test/ui/error-codes/E0008.stderr
@@ -6,4 +6,4 @@ LL |         Some(s) if s.len() == 0 => {},
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0008"
+For more information about this error, try `rustc --explain E0008`.
diff --git a/src/test/ui/error-codes/E0009.stderr b/src/test/ui/error-codes/E0009.stderr
index ac6c2ace1f8..8b3071420dd 100644
--- a/src/test/ui/error-codes/E0009.stderr
+++ b/src/test/ui/error-codes/E0009.stderr
@@ -8,4 +8,4 @@ LL |         Some((y, ref z)) => {},
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0009"
+For more information about this error, try `rustc --explain E0009`.
diff --git a/src/test/ui/error-codes/E0010-teach.stderr b/src/test/ui/error-codes/E0010-teach.stderr
index 0d97a56b1b4..fa5c767caf2 100644
--- a/src/test/ui/error-codes/E0010-teach.stderr
+++ b/src/test/ui/error-codes/E0010-teach.stderr
@@ -8,4 +8,4 @@ LL | const CON : Box<i32> = box 0; //~ ERROR E0010
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0010"
+For more information about this error, try `rustc --explain E0010`.
diff --git a/src/test/ui/error-codes/E0010.stderr b/src/test/ui/error-codes/E0010.stderr
index 0d8b0800b08..83c1b409a51 100644
--- a/src/test/ui/error-codes/E0010.stderr
+++ b/src/test/ui/error-codes/E0010.stderr
@@ -6,4 +6,4 @@ LL | const CON : Box<i32> = box 0; //~ ERROR E0010
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0010"
+For more information about this error, try `rustc --explain E0010`.
diff --git a/src/test/ui/error-codes/E0017.stderr b/src/test/ui/error-codes/E0017.stderr
index 540d76a6d45..411b9f31397 100644
--- a/src/test/ui/error-codes/E0017.stderr
+++ b/src/test/ui/error-codes/E0017.stderr
@@ -24,5 +24,5 @@ LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0017, E0596
-If you want more information on an error, try using "rustc --explain E0017"
+Some errors occurred: E0017, E0596.
+For more information about an error, try `rustc --explain E0017`.
diff --git a/src/test/ui/error-codes/E0023.stderr b/src/test/ui/error-codes/E0023.stderr
index 2f69db3e7ef..26f7baeb1a4 100644
--- a/src/test/ui/error-codes/E0023.stderr
+++ b/src/test/ui/error-codes/E0023.stderr
@@ -18,4 +18,4 @@ LL |         Fruit::Pear(1, 2) => {}, //~ ERROR E0023
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0023"
+For more information about this error, try `rustc --explain E0023`.
diff --git a/src/test/ui/error-codes/E0025.stderr b/src/test/ui/error-codes/E0025.stderr
index 2e32ccab0dd..f60372559a3 100644
--- a/src/test/ui/error-codes/E0025.stderr
+++ b/src/test/ui/error-codes/E0025.stderr
@@ -8,4 +8,4 @@ LL |     let Foo { a: x, a: y, b: 0 } = x;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0025"
+For more information about this error, try `rustc --explain E0025`.
diff --git a/src/test/ui/error-codes/E0026-teach.stderr b/src/test/ui/error-codes/E0026-teach.stderr
index e7ab3fbf307..63d072fe03d 100644
--- a/src/test/ui/error-codes/E0026-teach.stderr
+++ b/src/test/ui/error-codes/E0026-teach.stderr
@@ -10,4 +10,4 @@ LL |         Thing { x, y, z } => {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0026"
+For more information about this error, try `rustc --explain E0026`.
diff --git a/src/test/ui/error-codes/E0026.stderr b/src/test/ui/error-codes/E0026.stderr
index 9415da2a819..af851951127 100644
--- a/src/test/ui/error-codes/E0026.stderr
+++ b/src/test/ui/error-codes/E0026.stderr
@@ -6,4 +6,4 @@ LL |         Thing { x, y, z } => {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0026"
+For more information about this error, try `rustc --explain E0026`.
diff --git a/src/test/ui/error-codes/E0027-teach.stderr b/src/test/ui/error-codes/E0027-teach.stderr
index d9c6a865dad..1c5333d76a8 100644
--- a/src/test/ui/error-codes/E0027-teach.stderr
+++ b/src/test/ui/error-codes/E0027-teach.stderr
@@ -8,4 +8,4 @@ LL |         Dog { age: x } => {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0027"
+For more information about this error, try `rustc --explain E0027`.
diff --git a/src/test/ui/error-codes/E0027.stderr b/src/test/ui/error-codes/E0027.stderr
index 6959324ccde..208b263e0f8 100644
--- a/src/test/ui/error-codes/E0027.stderr
+++ b/src/test/ui/error-codes/E0027.stderr
@@ -6,4 +6,4 @@ LL |         Dog { age: x } => {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0027"
+For more information about this error, try `rustc --explain E0027`.
diff --git a/src/test/ui/error-codes/E0029-teach.stderr b/src/test/ui/error-codes/E0029-teach.stderr
index d4e9a1c3040..25d95108f96 100644
--- a/src/test/ui/error-codes/E0029-teach.stderr
+++ b/src/test/ui/error-codes/E0029-teach.stderr
@@ -18,5 +18,5 @@ LL |         "hello" ... "world" => {}
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0029, E0658
-If you want more information on an error, try using "rustc --explain E0029"
+Some errors occurred: E0029, E0658.
+For more information about an error, try `rustc --explain E0029`.
diff --git a/src/test/ui/error-codes/E0029.stderr b/src/test/ui/error-codes/E0029.stderr
index ab1fa321dbd..53c228c6e38 100644
--- a/src/test/ui/error-codes/E0029.stderr
+++ b/src/test/ui/error-codes/E0029.stderr
@@ -17,5 +17,5 @@ LL |         "hello" ... "world" => {}
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0029, E0658
-If you want more information on an error, try using "rustc --explain E0029"
+Some errors occurred: E0029, E0658.
+For more information about an error, try `rustc --explain E0029`.
diff --git a/src/test/ui/error-codes/E0030-teach.stderr b/src/test/ui/error-codes/E0030-teach.stderr
index e23bf89be29..8b262d5b296 100644
--- a/src/test/ui/error-codes/E0030-teach.stderr
+++ b/src/test/ui/error-codes/E0030-teach.stderr
@@ -8,4 +8,4 @@ LL |         1000 ... 5 => {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0030"
+For more information about this error, try `rustc --explain E0030`.
diff --git a/src/test/ui/error-codes/E0030.stderr b/src/test/ui/error-codes/E0030.stderr
index 9d4352888cb..0949cfb50b6 100644
--- a/src/test/ui/error-codes/E0030.stderr
+++ b/src/test/ui/error-codes/E0030.stderr
@@ -6,4 +6,4 @@ LL |         1000 ... 5 => {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0030"
+For more information about this error, try `rustc --explain E0030`.
diff --git a/src/test/ui/error-codes/E0033-teach.stderr b/src/test/ui/error-codes/E0033-teach.stderr
index 9f2a9595b39..c74485781c1 100644
--- a/src/test/ui/error-codes/E0033-teach.stderr
+++ b/src/test/ui/error-codes/E0033-teach.stderr
@@ -24,5 +24,5 @@ LL |     let &invalid = trait_obj;
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0033, E0038, E0423
-If you want more information on an error, try using "rustc --explain E0033"
+Some errors occurred: E0033, E0038, E0423.
+For more information about an error, try `rustc --explain E0033`.
diff --git a/src/test/ui/error-codes/E0033.stderr b/src/test/ui/error-codes/E0033.stderr
index a0d73c074f8..a1e72d6f669 100644
--- a/src/test/ui/error-codes/E0033.stderr
+++ b/src/test/ui/error-codes/E0033.stderr
@@ -20,5 +20,5 @@ LL |     let &invalid = trait_obj;
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0033, E0038, E0423
-If you want more information on an error, try using "rustc --explain E0033"
+Some errors occurred: E0033, E0038, E0423.
+For more information about an error, try `rustc --explain E0033`.
diff --git a/src/test/ui/error-codes/E0034.stderr b/src/test/ui/error-codes/E0034.stderr
index f457dfded7c..cec0f2d2a80 100644
--- a/src/test/ui/error-codes/E0034.stderr
+++ b/src/test/ui/error-codes/E0034.stderr
@@ -17,4 +17,4 @@ LL |     fn foo() {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0034"
+For more information about this error, try `rustc --explain E0034`.
diff --git a/src/test/ui/error-codes/E0038.stderr b/src/test/ui/error-codes/E0038.stderr
index b3f3ea57a34..bc76323f183 100644
--- a/src/test/ui/error-codes/E0038.stderr
+++ b/src/test/ui/error-codes/E0038.stderr
@@ -8,4 +8,4 @@ LL | fn call_foo(x: Box<Trait>) {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0038"
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/error-codes/E0040.stderr b/src/test/ui/error-codes/E0040.stderr
index a2f6174e918..01636ae98b8 100644
--- a/src/test/ui/error-codes/E0040.stderr
+++ b/src/test/ui/error-codes/E0040.stderr
@@ -6,4 +6,4 @@ LL |     x.drop();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0040"
+For more information about this error, try `rustc --explain E0040`.
diff --git a/src/test/ui/error-codes/E0044.stderr b/src/test/ui/error-codes/E0044.stderr
index b823f3717b3..b981f525517 100644
--- a/src/test/ui/error-codes/E0044.stderr
+++ b/src/test/ui/error-codes/E0044.stderr
@@ -12,4 +12,4 @@ LL | extern { fn some_func<T>(x: T); } //~ ERROR E0044
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0044"
+For more information about this error, try `rustc --explain E0044`.
diff --git a/src/test/ui/error-codes/E0045.stderr b/src/test/ui/error-codes/E0045.stderr
index e79965aeff7..35a592a6986 100644
--- a/src/test/ui/error-codes/E0045.stderr
+++ b/src/test/ui/error-codes/E0045.stderr
@@ -6,4 +6,4 @@ LL | extern "Rust" { fn foo(x: u8, ...); }   //~ ERROR E0045
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0045"
+For more information about this error, try `rustc --explain E0045`.
diff --git a/src/test/ui/error-codes/E0049.stderr b/src/test/ui/error-codes/E0049.stderr
index cdc936df270..b7eaad57043 100644
--- a/src/test/ui/error-codes/E0049.stderr
+++ b/src/test/ui/error-codes/E0049.stderr
@@ -9,4 +9,4 @@ LL |     fn foo(x: bool) -> Self { Bar } //~ ERROR E0049
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0049"
+For more information about this error, try `rustc --explain E0049`.
diff --git a/src/test/ui/error-codes/E0050.stderr b/src/test/ui/error-codes/E0050.stderr
index d5d1677f43f..bff3b7b16b9 100644
--- a/src/test/ui/error-codes/E0050.stderr
+++ b/src/test/ui/error-codes/E0050.stderr
@@ -27,4 +27,4 @@ LL |     fn less(&self, x: u8, y: u8, z: u8) { } //~ ERROR E0050
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0050"
+For more information about this error, try `rustc --explain E0050`.
diff --git a/src/test/ui/error-codes/E0054.stderr b/src/test/ui/error-codes/E0054.stderr
index ed82704e661..d5cf18460fd 100644
--- a/src/test/ui/error-codes/E0054.stderr
+++ b/src/test/ui/error-codes/E0054.stderr
@@ -8,4 +8,4 @@ LL |     let x_is_nonzero = x as bool; //~ ERROR E0054
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0054"
+For more information about this error, try `rustc --explain E0054`.
diff --git a/src/test/ui/error-codes/E0055.stderr b/src/test/ui/error-codes/E0055.stderr
index 3d13b144106..9653f4eaeef 100644
--- a/src/test/ui/error-codes/E0055.stderr
+++ b/src/test/ui/error-codes/E0055.stderr
@@ -8,4 +8,4 @@ LL |     ref_foo.foo();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0055"
+For more information about this error, try `rustc --explain E0055`.
diff --git a/src/test/ui/error-codes/E0057.stderr b/src/test/ui/error-codes/E0057.stderr
index 0d6cd77de07..fb3e710b8cf 100644
--- a/src/test/ui/error-codes/E0057.stderr
+++ b/src/test/ui/error-codes/E0057.stderr
@@ -12,4 +12,4 @@ LL |     let c = f(2, 3); //~ ERROR E0057
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0057"
+For more information about this error, try `rustc --explain E0057`.
diff --git a/src/test/ui/error-codes/E0059.stderr b/src/test/ui/error-codes/E0059.stderr
index 5e2907eed69..abe8b729c93 100644
--- a/src/test/ui/error-codes/E0059.stderr
+++ b/src/test/ui/error-codes/E0059.stderr
@@ -6,4 +6,4 @@ LL | fn foo<F: Fn<i32>>(f: F) -> F::Output { f(3) } //~ ERROR E0059
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0059"
+For more information about this error, try `rustc --explain E0059`.
diff --git a/src/test/ui/error-codes/E0060.stderr b/src/test/ui/error-codes/E0060.stderr
index 0493015cc76..c6aac6e41c6 100644
--- a/src/test/ui/error-codes/E0060.stderr
+++ b/src/test/ui/error-codes/E0060.stderr
@@ -9,4 +9,4 @@ LL |     unsafe { printf(); }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0060"
+For more information about this error, try `rustc --explain E0060`.
diff --git a/src/test/ui/error-codes/E0061.stderr b/src/test/ui/error-codes/E0061.stderr
index 6ddd4be9d8e..d5842a18bc8 100644
--- a/src/test/ui/error-codes/E0061.stderr
+++ b/src/test/ui/error-codes/E0061.stderr
@@ -18,4 +18,4 @@ LL |     f2();
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0061"
+For more information about this error, try `rustc --explain E0061`.
diff --git a/src/test/ui/error-codes/E0062.stderr b/src/test/ui/error-codes/E0062.stderr
index a24c5e05914..c5c38c6f5ff 100644
--- a/src/test/ui/error-codes/E0062.stderr
+++ b/src/test/ui/error-codes/E0062.stderr
@@ -8,4 +8,4 @@ LL |         x: 0,
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0062"
+For more information about this error, try `rustc --explain E0062`.
diff --git a/src/test/ui/error-codes/E0063.stderr b/src/test/ui/error-codes/E0063.stderr
index 7f33223a7ea..1ed54b4e7ba 100644
--- a/src/test/ui/error-codes/E0063.stderr
+++ b/src/test/ui/error-codes/E0063.stderr
@@ -24,4 +24,4 @@ LL |     let z = TruncatedPluralFoo{x:1};
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0063"
+For more information about this error, try `rustc --explain E0063`.
diff --git a/src/test/ui/error-codes/E0067.stderr b/src/test/ui/error-codes/E0067.stderr
index b964b9dffc1..76f06c7c463 100644
--- a/src/test/ui/error-codes/E0067.stderr
+++ b/src/test/ui/error-codes/E0067.stderr
@@ -14,5 +14,5 @@ LL |     LinkedList::new() += 1; //~ ERROR E0368
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0067, E0368
-If you want more information on an error, try using "rustc --explain E0067"
+Some errors occurred: E0067, E0368.
+For more information about an error, try `rustc --explain E0067`.
diff --git a/src/test/ui/error-codes/E0069.stderr b/src/test/ui/error-codes/E0069.stderr
index 8a5b5984c33..0ba1ed45663 100644
--- a/src/test/ui/error-codes/E0069.stderr
+++ b/src/test/ui/error-codes/E0069.stderr
@@ -6,4 +6,4 @@ LL |     return;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0069"
+For more information about this error, try `rustc --explain E0069`.
diff --git a/src/test/ui/error-codes/E0070.stderr b/src/test/ui/error-codes/E0070.stderr
index 33da9030c41..892e6943112 100644
--- a/src/test/ui/error-codes/E0070.stderr
+++ b/src/test/ui/error-codes/E0070.stderr
@@ -27,5 +27,5 @@ LL |     some_other_func() = 4; //~ ERROR E0070
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0070, E0308
-If you want more information on an error, try using "rustc --explain E0070"
+Some errors occurred: E0070, E0308.
+For more information about an error, try `rustc --explain E0070`.
diff --git a/src/test/ui/error-codes/E0071.stderr b/src/test/ui/error-codes/E0071.stderr
index b28dcf90c82..637338672e0 100644
--- a/src/test/ui/error-codes/E0071.stderr
+++ b/src/test/ui/error-codes/E0071.stderr
@@ -6,4 +6,4 @@ LL |     let u = FooAlias { value: 0 };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0071"
+For more information about this error, try `rustc --explain E0071`.
diff --git a/src/test/ui/error-codes/E0075.stderr b/src/test/ui/error-codes/E0075.stderr
index 4fd5b65f4a9..d29d5d78803 100644
--- a/src/test/ui/error-codes/E0075.stderr
+++ b/src/test/ui/error-codes/E0075.stderr
@@ -6,4 +6,4 @@ LL | struct Bad; //~ ERROR E0075
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0075"
+For more information about this error, try `rustc --explain E0075`.
diff --git a/src/test/ui/error-codes/E0076.stderr b/src/test/ui/error-codes/E0076.stderr
index 3cee6f4527c..ae349403810 100644
--- a/src/test/ui/error-codes/E0076.stderr
+++ b/src/test/ui/error-codes/E0076.stderr
@@ -6,4 +6,4 @@ LL | struct Bad(u16, u32, u32);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0076"
+For more information about this error, try `rustc --explain E0076`.
diff --git a/src/test/ui/error-codes/E0077.stderr b/src/test/ui/error-codes/E0077.stderr
index 822efe9628b..42a169f5a20 100644
--- a/src/test/ui/error-codes/E0077.stderr
+++ b/src/test/ui/error-codes/E0077.stderr
@@ -6,4 +6,4 @@ LL | struct Bad(String); //~ ERROR E0077
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0077"
+For more information about this error, try `rustc --explain E0077`.
diff --git a/src/test/ui/error-codes/E0080.stderr b/src/test/ui/error-codes/E0080.stderr
index 6db53acd6b9..500e0e83a55 100644
--- a/src/test/ui/error-codes/E0080.stderr
+++ b/src/test/ui/error-codes/E0080.stderr
@@ -34,4 +34,4 @@ LL |     Y = (1 / 0) //~ ERROR E0080
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0080"
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/error-codes/E0081.stderr b/src/test/ui/error-codes/E0081.stderr
index e1133c1fc58..36150d7c526 100644
--- a/src/test/ui/error-codes/E0081.stderr
+++ b/src/test/ui/error-codes/E0081.stderr
@@ -8,4 +8,4 @@ LL |     X = 3,
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0081"
+For more information about this error, try `rustc --explain E0081`.
diff --git a/src/test/ui/error-codes/E0084.stderr b/src/test/ui/error-codes/E0084.stderr
index 5ebe03090a0..d0bc519c996 100644
--- a/src/test/ui/error-codes/E0084.stderr
+++ b/src/test/ui/error-codes/E0084.stderr
@@ -8,4 +8,4 @@ LL | enum Foo {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0084"
+For more information about this error, try `rustc --explain E0084`.
diff --git a/src/test/ui/error-codes/E0087.stderr b/src/test/ui/error-codes/E0087.stderr
index b1ff92d8c27..cd1e99e7b41 100644
--- a/src/test/ui/error-codes/E0087.stderr
+++ b/src/test/ui/error-codes/E0087.stderr
@@ -12,4 +12,4 @@ LL |     bar::<f64, u64>(); //~ ERROR expected at most 1 type parameter, found 2
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0087"
+For more information about this error, try `rustc --explain E0087`.
diff --git a/src/test/ui/error-codes/E0088.stderr b/src/test/ui/error-codes/E0088.stderr
index 5497eb028d8..4bf2760994e 100644
--- a/src/test/ui/error-codes/E0088.stderr
+++ b/src/test/ui/error-codes/E0088.stderr
@@ -12,4 +12,4 @@ LL |     g::<'static, 'static>(); //~ ERROR E0088
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0088"
+For more information about this error, try `rustc --explain E0088`.
diff --git a/src/test/ui/error-codes/E0089.stderr b/src/test/ui/error-codes/E0089.stderr
index 3a399087943..0b95033fb36 100644
--- a/src/test/ui/error-codes/E0089.stderr
+++ b/src/test/ui/error-codes/E0089.stderr
@@ -6,4 +6,4 @@ LL |     foo::<f64>(); //~ ERROR expected 2 type parameters, found 1 type parame
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0089"
+For more information about this error, try `rustc --explain E0089`.
diff --git a/src/test/ui/error-codes/E0090.stderr b/src/test/ui/error-codes/E0090.stderr
index 82e8eaf69ea..f119d5fa467 100644
--- a/src/test/ui/error-codes/E0090.stderr
+++ b/src/test/ui/error-codes/E0090.stderr
@@ -6,4 +6,4 @@ LL |     foo::<'static>(); //~ ERROR expected 2 lifetime parameters, found 1 lif
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0090"
+For more information about this error, try `rustc --explain E0090`.
diff --git a/src/test/ui/error-codes/E0091.stderr b/src/test/ui/error-codes/E0091.stderr
index 003e9e7efcd..2116f8f6476 100644
--- a/src/test/ui/error-codes/E0091.stderr
+++ b/src/test/ui/error-codes/E0091.stderr
@@ -12,4 +12,4 @@ LL | type Foo2<A, B> = Box<A>; //~ ERROR E0091
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0091"
+For more information about this error, try `rustc --explain E0091`.
diff --git a/src/test/ui/error-codes/E0092.stderr b/src/test/ui/error-codes/E0092.stderr
index 8b53a029c35..50d6d63b99c 100644
--- a/src/test/ui/error-codes/E0092.stderr
+++ b/src/test/ui/error-codes/E0092.stderr
@@ -6,4 +6,4 @@ LL |     fn atomic_foo(); //~ ERROR E0092
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0092"
+For more information about this error, try `rustc --explain E0092`.
diff --git a/src/test/ui/error-codes/E0093.stderr b/src/test/ui/error-codes/E0093.stderr
index 4e201650837..f261b83a0b8 100644
--- a/src/test/ui/error-codes/E0093.stderr
+++ b/src/test/ui/error-codes/E0093.stderr
@@ -6,4 +6,4 @@ LL |     fn foo();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0093"
+For more information about this error, try `rustc --explain E0093`.
diff --git a/src/test/ui/error-codes/E0094.stderr b/src/test/ui/error-codes/E0094.stderr
index 7a2dfaae279..322802fc44f 100644
--- a/src/test/ui/error-codes/E0094.stderr
+++ b/src/test/ui/error-codes/E0094.stderr
@@ -6,4 +6,4 @@ LL |     fn size_of<T, U>() -> usize; //~ ERROR E0094
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0094"
+For more information about this error, try `rustc --explain E0094`.
diff --git a/src/test/ui/error-codes/E0106.stderr b/src/test/ui/error-codes/E0106.stderr
index 645414ca1ea..9862dca3fde 100644
--- a/src/test/ui/error-codes/E0106.stderr
+++ b/src/test/ui/error-codes/E0106.stderr
@@ -30,4 +30,4 @@ LL |     buzz: Buzz,
 
 error: aborting due to 5 previous errors
 
-If you want more information on this error, try using "rustc --explain E0106"
+For more information about this error, try `rustc --explain E0106`.
diff --git a/src/test/ui/error-codes/E0107.stderr b/src/test/ui/error-codes/E0107.stderr
index a695a593429..76bb2667643 100644
--- a/src/test/ui/error-codes/E0107.stderr
+++ b/src/test/ui/error-codes/E0107.stderr
@@ -18,4 +18,4 @@ LL |     foo2: Foo<'a, 'b, 'c>,
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0107"
+For more information about this error, try `rustc --explain E0107`.
diff --git a/src/test/ui/error-codes/E0109.stderr b/src/test/ui/error-codes/E0109.stderr
index 89f3154fb48..6473517bfad 100644
--- a/src/test/ui/error-codes/E0109.stderr
+++ b/src/test/ui/error-codes/E0109.stderr
@@ -6,4 +6,4 @@ LL | type X = u32<i32>; //~ ERROR E0109
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0109"
+For more information about this error, try `rustc --explain E0109`.
diff --git a/src/test/ui/error-codes/E0110.stderr b/src/test/ui/error-codes/E0110.stderr
index 3f4d525b6e5..10e06ee6d02 100644
--- a/src/test/ui/error-codes/E0110.stderr
+++ b/src/test/ui/error-codes/E0110.stderr
@@ -6,4 +6,4 @@ LL | type X = u32<'static>; //~ ERROR E0110
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0110"
+For more information about this error, try `rustc --explain E0110`.
diff --git a/src/test/ui/error-codes/E0116.stderr b/src/test/ui/error-codes/E0116.stderr
index 88954b906c4..7c2f35a3305 100644
--- a/src/test/ui/error-codes/E0116.stderr
+++ b/src/test/ui/error-codes/E0116.stderr
@@ -8,4 +8,4 @@ LL | impl Vec<u8> {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0116"
+For more information about this error, try `rustc --explain E0116`.
diff --git a/src/test/ui/error-codes/E0117.stderr b/src/test/ui/error-codes/E0117.stderr
index 240aa4240cc..16c1a1fae7f 100644
--- a/src/test/ui/error-codes/E0117.stderr
+++ b/src/test/ui/error-codes/E0117.stderr
@@ -15,5 +15,5 @@ LL | impl Drop for u32 {} //~ ERROR E0117
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0117, E0120
-If you want more information on an error, try using "rustc --explain E0117"
+Some errors occurred: E0117, E0120.
+For more information about an error, try `rustc --explain E0117`.
diff --git a/src/test/ui/error-codes/E0118.stderr b/src/test/ui/error-codes/E0118.stderr
index bb811ab6345..896213e3487 100644
--- a/src/test/ui/error-codes/E0118.stderr
+++ b/src/test/ui/error-codes/E0118.stderr
@@ -8,4 +8,4 @@ LL | impl (u8, u8) { //~ ERROR E0118
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0118"
+For more information about this error, try `rustc --explain E0118`.
diff --git a/src/test/ui/error-codes/E0119.stderr b/src/test/ui/error-codes/E0119.stderr
index 55ca8c5a779..f1e942d4cf5 100644
--- a/src/test/ui/error-codes/E0119.stderr
+++ b/src/test/ui/error-codes/E0119.stderr
@@ -9,4 +9,4 @@ LL | impl MyTrait for Foo { //~ ERROR E0119
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0119"
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/error-codes/E0120.stderr b/src/test/ui/error-codes/E0120.stderr
index cd69b8d67bf..6237500c7ae 100644
--- a/src/test/ui/error-codes/E0120.stderr
+++ b/src/test/ui/error-codes/E0120.stderr
@@ -6,4 +6,4 @@ LL | impl Drop for MyTrait {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0120"
+For more information about this error, try `rustc --explain E0120`.
diff --git a/src/test/ui/error-codes/E0121.stderr b/src/test/ui/error-codes/E0121.stderr
index ca9557cdcdc..019e637aa8c 100644
--- a/src/test/ui/error-codes/E0121.stderr
+++ b/src/test/ui/error-codes/E0121.stderr
@@ -12,4 +12,4 @@ LL | static BAR: _ = "test"; //~ ERROR E0121
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0121"
+For more information about this error, try `rustc --explain E0121`.
diff --git a/src/test/ui/error-codes/E0124.stderr b/src/test/ui/error-codes/E0124.stderr
index 1f4b4ce0efa..c95162c9d21 100644
--- a/src/test/ui/error-codes/E0124.stderr
+++ b/src/test/ui/error-codes/E0124.stderr
@@ -8,4 +8,4 @@ LL |     field1: i32,
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0124"
+For more information about this error, try `rustc --explain E0124`.
diff --git a/src/test/ui/error-codes/E0128.stderr b/src/test/ui/error-codes/E0128.stderr
index 632b1196723..81da580f0d5 100644
--- a/src/test/ui/error-codes/E0128.stderr
+++ b/src/test/ui/error-codes/E0128.stderr
@@ -6,4 +6,4 @@ LL | struct Foo<T=U, U=()> { //~ ERROR E0128
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0128"
+For more information about this error, try `rustc --explain E0128`.
diff --git a/src/test/ui/error-codes/E0130.stderr b/src/test/ui/error-codes/E0130.stderr
index 3e00909109b..3b54b1b8669 100644
--- a/src/test/ui/error-codes/E0130.stderr
+++ b/src/test/ui/error-codes/E0130.stderr
@@ -6,4 +6,4 @@ LL |     fn foo((a, b): (u32, u32));
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0130"
+For more information about this error, try `rustc --explain E0130`.
diff --git a/src/test/ui/error-codes/E0131.stderr b/src/test/ui/error-codes/E0131.stderr
index b9caca22aeb..3774e21c214 100644
--- a/src/test/ui/error-codes/E0131.stderr
+++ b/src/test/ui/error-codes/E0131.stderr
@@ -6,4 +6,4 @@ LL | fn main<T>() {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0131"
+For more information about this error, try `rustc --explain E0131`.
diff --git a/src/test/ui/error-codes/E0132.stderr b/src/test/ui/error-codes/E0132.stderr
index ce22a99e66c..80d1c29d50f 100644
--- a/src/test/ui/error-codes/E0132.stderr
+++ b/src/test/ui/error-codes/E0132.stderr
@@ -6,4 +6,4 @@ LL | fn f< T >() {} //~ ERROR E0132
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0132"
+For more information about this error, try `rustc --explain E0132`.
diff --git a/src/test/ui/error-codes/E0133.stderr b/src/test/ui/error-codes/E0133.stderr
index d703ce6203e..dc57a627444 100644
--- a/src/test/ui/error-codes/E0133.stderr
+++ b/src/test/ui/error-codes/E0133.stderr
@@ -6,4 +6,4 @@ LL |     f();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0133"
+For more information about this error, try `rustc --explain E0133`.
diff --git a/src/test/ui/error-codes/E0137.stderr b/src/test/ui/error-codes/E0137.stderr
index 4a5b4f6da86..ab2f9ba5bea 100644
--- a/src/test/ui/error-codes/E0137.stderr
+++ b/src/test/ui/error-codes/E0137.stderr
@@ -9,4 +9,4 @@ LL | fn f() {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0137"
+For more information about this error, try `rustc --explain E0137`.
diff --git a/src/test/ui/error-codes/E0138.stderr b/src/test/ui/error-codes/E0138.stderr
index 40b476afb9a..e713b11b37f 100644
--- a/src/test/ui/error-codes/E0138.stderr
+++ b/src/test/ui/error-codes/E0138.stderr
@@ -9,4 +9,4 @@ LL | fn f(argc: isize, argv: *const *const u8) -> isize { 0 }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0138"
+For more information about this error, try `rustc --explain E0138`.
diff --git a/src/test/ui/error-codes/E0152.stderr b/src/test/ui/error-codes/E0152.stderr
index 99a9b85f41e..f67022bd6d3 100644
--- a/src/test/ui/error-codes/E0152.stderr
+++ b/src/test/ui/error-codes/E0152.stderr
@@ -8,4 +8,4 @@ LL | struct Foo; //~ ERROR E0152
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0152"
+For more information about this error, try `rustc --explain E0152`.
diff --git a/src/test/ui/error-codes/E0161.stderr b/src/test/ui/error-codes/E0161.stderr
index fb8f3e0e168..0135e495c16 100644
--- a/src/test/ui/error-codes/E0161.stderr
+++ b/src/test/ui/error-codes/E0161.stderr
@@ -12,5 +12,5 @@ LL |     let _x: Box<str> = box *"hello"; //~ ERROR E0161
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0161, E0507
-If you want more information on an error, try using "rustc --explain E0161"
+Some errors occurred: E0161, E0507.
+For more information about an error, try `rustc --explain E0161`.
diff --git a/src/test/ui/error-codes/E0162.stderr b/src/test/ui/error-codes/E0162.stderr
index e9a7b18fcdd..91f402dad59 100644
--- a/src/test/ui/error-codes/E0162.stderr
+++ b/src/test/ui/error-codes/E0162.stderr
@@ -6,4 +6,4 @@ LL |     if let Irrefutable(x) = irr { //~ ERROR E0162
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0162"
+For more information about this error, try `rustc --explain E0162`.
diff --git a/src/test/ui/error-codes/E0164.stderr b/src/test/ui/error-codes/E0164.stderr
index ec91d9b52a9..6eabace9b14 100644
--- a/src/test/ui/error-codes/E0164.stderr
+++ b/src/test/ui/error-codes/E0164.stderr
@@ -6,4 +6,4 @@ LL |         Foo::B(i) => i, //~ ERROR E0164
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0164"
+For more information about this error, try `rustc --explain E0164`.
diff --git a/src/test/ui/error-codes/E0165.stderr b/src/test/ui/error-codes/E0165.stderr
index ac6a88483ec..66be95e38d2 100644
--- a/src/test/ui/error-codes/E0165.stderr
+++ b/src/test/ui/error-codes/E0165.stderr
@@ -6,4 +6,4 @@ LL |     while let Irrefutable(x) = irr { //~ ERROR E0165
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0165"
+For more information about this error, try `rustc --explain E0165`.
diff --git a/src/test/ui/error-codes/E0184.stderr b/src/test/ui/error-codes/E0184.stderr
index bd67ed11064..eb6160bc005 100644
--- a/src/test/ui/error-codes/E0184.stderr
+++ b/src/test/ui/error-codes/E0184.stderr
@@ -6,4 +6,4 @@ LL | #[derive(Copy)] //~ ERROR E0184
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0184"
+For more information about this error, try `rustc --explain E0184`.
diff --git a/src/test/ui/error-codes/E0185.stderr b/src/test/ui/error-codes/E0185.stderr
index 12ecf25811e..e5c92abc521 100644
--- a/src/test/ui/error-codes/E0185.stderr
+++ b/src/test/ui/error-codes/E0185.stderr
@@ -9,4 +9,4 @@ LL |     fn foo(&self) {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0185"
+For more information about this error, try `rustc --explain E0185`.
diff --git a/src/test/ui/error-codes/E0186.stderr b/src/test/ui/error-codes/E0186.stderr
index 015c6e5d0bc..0556ef700ac 100644
--- a/src/test/ui/error-codes/E0186.stderr
+++ b/src/test/ui/error-codes/E0186.stderr
@@ -9,4 +9,4 @@ LL |     fn foo() {} //~ ERROR E0186
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0186"
+For more information about this error, try `rustc --explain E0186`.
diff --git a/src/test/ui/error-codes/E0191.stderr b/src/test/ui/error-codes/E0191.stderr
index 14ae4469f12..08b0a845814 100644
--- a/src/test/ui/error-codes/E0191.stderr
+++ b/src/test/ui/error-codes/E0191.stderr
@@ -6,4 +6,4 @@ LL | type Foo = Trait; //~ ERROR E0191
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0191"
+For more information about this error, try `rustc --explain E0191`.
diff --git a/src/test/ui/error-codes/E0192.stderr b/src/test/ui/error-codes/E0192.stderr
index 1b2d6eb0285..fd8976271a5 100644
--- a/src/test/ui/error-codes/E0192.stderr
+++ b/src/test/ui/error-codes/E0192.stderr
@@ -6,4 +6,4 @@ LL | impl !Trait for Foo { } //~ ERROR E0192
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0192"
+For more information about this error, try `rustc --explain E0192`.
diff --git a/src/test/ui/error-codes/E0194.stderr b/src/test/ui/error-codes/E0194.stderr
index 9447b90355e..6869f3c96f7 100644
--- a/src/test/ui/error-codes/E0194.stderr
+++ b/src/test/ui/error-codes/E0194.stderr
@@ -9,4 +9,4 @@ LL |     fn do_something_else<T: Clone>(&self, bar: T);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0194"
+For more information about this error, try `rustc --explain E0194`.
diff --git a/src/test/ui/error-codes/E0195.stderr b/src/test/ui/error-codes/E0195.stderr
index 735aa4283ec..f2cf661830d 100644
--- a/src/test/ui/error-codes/E0195.stderr
+++ b/src/test/ui/error-codes/E0195.stderr
@@ -9,4 +9,4 @@ LL |     fn bar<'a,'b>(x: &'a str, y: &'b str) { //~ ERROR E0195
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0195"
+For more information about this error, try `rustc --explain E0195`.
diff --git a/src/test/ui/error-codes/E0197.stderr b/src/test/ui/error-codes/E0197.stderr
index 250101929ee..a18599e4f47 100644
--- a/src/test/ui/error-codes/E0197.stderr
+++ b/src/test/ui/error-codes/E0197.stderr
@@ -6,4 +6,4 @@ LL | unsafe impl Foo { } //~ ERROR E0197
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0197"
+For more information about this error, try `rustc --explain E0197`.
diff --git a/src/test/ui/error-codes/E0198.stderr b/src/test/ui/error-codes/E0198.stderr
index 12120658d61..41ea0565ccc 100644
--- a/src/test/ui/error-codes/E0198.stderr
+++ b/src/test/ui/error-codes/E0198.stderr
@@ -6,4 +6,4 @@ LL | unsafe impl !Send for Foo { } //~ ERROR E0198
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0198"
+For more information about this error, try `rustc --explain E0198`.
diff --git a/src/test/ui/error-codes/E0199.stderr b/src/test/ui/error-codes/E0199.stderr
index 826d13a7a0e..b3cfd0d21dd 100644
--- a/src/test/ui/error-codes/E0199.stderr
+++ b/src/test/ui/error-codes/E0199.stderr
@@ -6,4 +6,4 @@ LL | unsafe impl Bar for Foo { } //~ ERROR implementing the trait `Bar` is not u
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0199"
+For more information about this error, try `rustc --explain E0199`.
diff --git a/src/test/ui/error-codes/E0200.stderr b/src/test/ui/error-codes/E0200.stderr
index 30731712045..07f848b501e 100644
--- a/src/test/ui/error-codes/E0200.stderr
+++ b/src/test/ui/error-codes/E0200.stderr
@@ -6,4 +6,4 @@ LL | impl Bar for Foo { } //~ ERROR E0200
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0200"
+For more information about this error, try `rustc --explain E0200`.
diff --git a/src/test/ui/error-codes/E0201.stderr b/src/test/ui/error-codes/E0201.stderr
index 730453c416e..2b9e51f76fd 100644
--- a/src/test/ui/error-codes/E0201.stderr
+++ b/src/test/ui/error-codes/E0201.stderr
@@ -25,4 +25,4 @@ LL |     type Quux = u32; //~ ERROR E0201
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0201"
+For more information about this error, try `rustc --explain E0201`.
diff --git a/src/test/ui/error-codes/E0206.stderr b/src/test/ui/error-codes/E0206.stderr
index 0cd22a454e1..d28bb876d4d 100644
--- a/src/test/ui/error-codes/E0206.stderr
+++ b/src/test/ui/error-codes/E0206.stderr
@@ -21,5 +21,5 @@ LL | impl Copy for Foo { }
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0117, E0206
-If you want more information on an error, try using "rustc --explain E0117"
+Some errors occurred: E0117, E0206.
+For more information about an error, try `rustc --explain E0117`.
diff --git a/src/test/ui/error-codes/E0207.stderr b/src/test/ui/error-codes/E0207.stderr
index e1f8a68583f..6ecab44878d 100644
--- a/src/test/ui/error-codes/E0207.stderr
+++ b/src/test/ui/error-codes/E0207.stderr
@@ -6,4 +6,4 @@ LL | impl<T: Default> Foo { //~ ERROR E0207
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0207"
+For more information about this error, try `rustc --explain E0207`.
diff --git a/src/test/ui/error-codes/E0214.stderr b/src/test/ui/error-codes/E0214.stderr
index 5fd3278dc88..c88e2d2077a 100644
--- a/src/test/ui/error-codes/E0214.stderr
+++ b/src/test/ui/error-codes/E0214.stderr
@@ -6,4 +6,4 @@ LL |     let v: Vec(&str) = vec!["foo"];
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0214"
+For more information about this error, try `rustc --explain E0214`.
diff --git a/src/test/ui/error-codes/E0220.stderr b/src/test/ui/error-codes/E0220.stderr
index 7a4f730c725..c8a587f2b53 100644
--- a/src/test/ui/error-codes/E0220.stderr
+++ b/src/test/ui/error-codes/E0220.stderr
@@ -12,5 +12,5 @@ LL | type Foo = Trait<F=i32>; //~ ERROR E0220
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0191, E0220
-If you want more information on an error, try using "rustc --explain E0191"
+Some errors occurred: E0191, E0220.
+For more information about an error, try `rustc --explain E0191`.
diff --git a/src/test/ui/error-codes/E0221.stderr b/src/test/ui/error-codes/E0221.stderr
index 07ce53e3b58..fc9232e85ab 100644
--- a/src/test/ui/error-codes/E0221.stderr
+++ b/src/test/ui/error-codes/E0221.stderr
@@ -27,4 +27,4 @@ LL |         let _: Self::Err;
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0221"
+For more information about this error, try `rustc --explain E0221`.
diff --git a/src/test/ui/error-codes/E0223.stderr b/src/test/ui/error-codes/E0223.stderr
index 9df8c8975e5..f65e744c625 100644
--- a/src/test/ui/error-codes/E0223.stderr
+++ b/src/test/ui/error-codes/E0223.stderr
@@ -8,4 +8,4 @@ LL |     let foo: MyTrait::X;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0223"
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/error-codes/E0225.stderr b/src/test/ui/error-codes/E0225.stderr
index 8894791a2db..6b9489c74c8 100644
--- a/src/test/ui/error-codes/E0225.stderr
+++ b/src/test/ui/error-codes/E0225.stderr
@@ -6,4 +6,4 @@ LL |     let _: Box<std::io::Read + std::io::Write>;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0225"
+For more information about this error, try `rustc --explain E0225`.
diff --git a/src/test/ui/error-codes/E0229.stderr b/src/test/ui/error-codes/E0229.stderr
index 202007a6c7c..218faf2dfdd 100644
--- a/src/test/ui/error-codes/E0229.stderr
+++ b/src/test/ui/error-codes/E0229.stderr
@@ -6,4 +6,4 @@ LL | fn baz<I>(x: &<I as Foo<A=Bar>>::A) {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0229"
+For more information about this error, try `rustc --explain E0229`.
diff --git a/src/test/ui/error-codes/E0232.stderr b/src/test/ui/error-codes/E0232.stderr
index 84f5e45bff7..cb6cc44a735 100644
--- a/src/test/ui/error-codes/E0232.stderr
+++ b/src/test/ui/error-codes/E0232.stderr
@@ -8,4 +8,4 @@ LL | #[rustc_on_unimplemented]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0232"
+For more information about this error, try `rustc --explain E0232`.
diff --git a/src/test/ui/error-codes/E0243.stderr b/src/test/ui/error-codes/E0243.stderr
index 26c19707fa8..0477d1b844a 100644
--- a/src/test/ui/error-codes/E0243.stderr
+++ b/src/test/ui/error-codes/E0243.stderr
@@ -6,4 +6,4 @@ LL | struct Bar { x: Foo }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0243"
+For more information about this error, try `rustc --explain E0243`.
diff --git a/src/test/ui/error-codes/E0244.stderr b/src/test/ui/error-codes/E0244.stderr
index 078c8e59261..e3239703962 100644
--- a/src/test/ui/error-codes/E0244.stderr
+++ b/src/test/ui/error-codes/E0244.stderr
@@ -6,4 +6,4 @@ LL | struct Bar<S, T> { x: Foo<S, T> }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0244"
+For more information about this error, try `rustc --explain E0244`.
diff --git a/src/test/ui/error-codes/E0252.stderr b/src/test/ui/error-codes/E0252.stderr
index 8186c4590f0..a4271bf3a4d 100644
--- a/src/test/ui/error-codes/E0252.stderr
+++ b/src/test/ui/error-codes/E0252.stderr
@@ -14,4 +14,4 @@ LL | use bar::baz as other_baz; //~ ERROR E0252
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0252"
+For more information about this error, try `rustc --explain E0252`.
diff --git a/src/test/ui/error-codes/E0253.stderr b/src/test/ui/error-codes/E0253.stderr
index 74e17e2aa95..9ab6c30eaa0 100644
--- a/src/test/ui/error-codes/E0253.stderr
+++ b/src/test/ui/error-codes/E0253.stderr
@@ -6,4 +6,4 @@ LL | use foo::MyTrait::do_something;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0253"
+For more information about this error, try `rustc --explain E0253`.
diff --git a/src/test/ui/error-codes/E0254.stderr b/src/test/ui/error-codes/E0254.stderr
index f1e1b56a790..a52215df0bb 100644
--- a/src/test/ui/error-codes/E0254.stderr
+++ b/src/test/ui/error-codes/E0254.stderr
@@ -15,4 +15,4 @@ LL | use foo::alloc as other_alloc;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0254"
+For more information about this error, try `rustc --explain E0254`.
diff --git a/src/test/ui/error-codes/E0255.stderr b/src/test/ui/error-codes/E0255.stderr
index 4d4053b1fb6..a077a43c152 100644
--- a/src/test/ui/error-codes/E0255.stderr
+++ b/src/test/ui/error-codes/E0255.stderr
@@ -15,4 +15,4 @@ LL | use bar::foo as other_foo;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0255"
+For more information about this error, try `rustc --explain E0255`.
diff --git a/src/test/ui/error-codes/E0259.stderr b/src/test/ui/error-codes/E0259.stderr
index 2cdd9aa6683..24a73544a35 100644
--- a/src/test/ui/error-codes/E0259.stderr
+++ b/src/test/ui/error-codes/E0259.stderr
@@ -14,4 +14,4 @@ LL | extern crate libc as alloc;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0259"
+For more information about this error, try `rustc --explain E0259`.
diff --git a/src/test/ui/error-codes/E0260.stderr b/src/test/ui/error-codes/E0260.stderr
index a249c80ea2c..437794432b0 100644
--- a/src/test/ui/error-codes/E0260.stderr
+++ b/src/test/ui/error-codes/E0260.stderr
@@ -15,4 +15,4 @@ LL | extern crate alloc as other_alloc;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0260"
+For more information about this error, try `rustc --explain E0260`.
diff --git a/src/test/ui/error-codes/E0261.stderr b/src/test/ui/error-codes/E0261.stderr
index a12878ab896..e9140ec2c74 100644
--- a/src/test/ui/error-codes/E0261.stderr
+++ b/src/test/ui/error-codes/E0261.stderr
@@ -12,4 +12,4 @@ LL |     x: &'a str, //~ ERROR E0261
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0261"
+For more information about this error, try `rustc --explain E0261`.
diff --git a/src/test/ui/error-codes/E0262.stderr b/src/test/ui/error-codes/E0262.stderr
index 8e9327b29f7..1e5b5db692d 100644
--- a/src/test/ui/error-codes/E0262.stderr
+++ b/src/test/ui/error-codes/E0262.stderr
@@ -6,4 +6,4 @@ LL | fn foo<'static>(x: &'static str) { } //~ ERROR E0262
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0262"
+For more information about this error, try `rustc --explain E0262`.
diff --git a/src/test/ui/error-codes/E0263.stderr b/src/test/ui/error-codes/E0263.stderr
index 9cd41bed984..1b52deea88d 100644
--- a/src/test/ui/error-codes/E0263.stderr
+++ b/src/test/ui/error-codes/E0263.stderr
@@ -8,4 +8,4 @@ LL | fn foo<'a, 'b, 'a>(x: &'a str, y: &'b str) {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0263"
+For more information about this error, try `rustc --explain E0263`.
diff --git a/src/test/ui/error-codes/E0264.stderr b/src/test/ui/error-codes/E0264.stderr
index aad8002fc46..69863d7bb83 100644
--- a/src/test/ui/error-codes/E0264.stderr
+++ b/src/test/ui/error-codes/E0264.stderr
@@ -6,4 +6,4 @@ LL |     fn cake(); //~ ERROR E0264
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0264"
+For more information about this error, try `rustc --explain E0264`.
diff --git a/src/test/ui/error-codes/E0267.stderr b/src/test/ui/error-codes/E0267.stderr
index fbd7364d966..b72109f0644 100644
--- a/src/test/ui/error-codes/E0267.stderr
+++ b/src/test/ui/error-codes/E0267.stderr
@@ -6,4 +6,4 @@ LL |     let w = || { break; }; //~ ERROR E0267
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0267"
+For more information about this error, try `rustc --explain E0267`.
diff --git a/src/test/ui/error-codes/E0268.stderr b/src/test/ui/error-codes/E0268.stderr
index 377ec21c1dd..e1b5b52085b 100644
--- a/src/test/ui/error-codes/E0268.stderr
+++ b/src/test/ui/error-codes/E0268.stderr
@@ -6,4 +6,4 @@ LL |     break; //~ ERROR E0268
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0268"
+For more information about this error, try `rustc --explain E0268`.
diff --git a/src/test/ui/error-codes/E0271.stderr b/src/test/ui/error-codes/E0271.stderr
index 1a99afd6a9b..04c7d244376 100644
--- a/src/test/ui/error-codes/E0271.stderr
+++ b/src/test/ui/error-codes/E0271.stderr
@@ -14,4 +14,4 @@ LL | fn foo<T>(t: T) where T: Trait<AssociatedType=u32> {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0271"
+For more information about this error, try `rustc --explain E0271`.
diff --git a/src/test/ui/error-codes/E0275.stderr b/src/test/ui/error-codes/E0275.stderr
index 11ec85a5d09..d5bcc94fb65 100644
--- a/src/test/ui/error-codes/E0275.stderr
+++ b/src/test/ui/error-codes/E0275.stderr
@@ -77,4 +77,4 @@ LL | trait Foo {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0275"
+For more information about this error, try `rustc --explain E0275`.
diff --git a/src/test/ui/error-codes/E0276.stderr b/src/test/ui/error-codes/E0276.stderr
index 849e2aafd5a..4823adc250a 100644
--- a/src/test/ui/error-codes/E0276.stderr
+++ b/src/test/ui/error-codes/E0276.stderr
@@ -9,4 +9,4 @@ LL |     fn foo<T>(x: T) where T: Copy {} //~ ERROR E0276
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0276"
+For more information about this error, try `rustc --explain E0276`.
diff --git a/src/test/ui/error-codes/E0277-2.stderr b/src/test/ui/error-codes/E0277-2.stderr
index 987bb94bb95..bbe04cfc6e1 100644
--- a/src/test/ui/error-codes/E0277-2.stderr
+++ b/src/test/ui/error-codes/E0277-2.stderr
@@ -16,4 +16,4 @@ LL | fn is_send<T: Send>() { }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/error-codes/E0277.stderr b/src/test/ui/error-codes/E0277.stderr
index 7541e161670..477128d7d9f 100644
--- a/src/test/ui/error-codes/E0277.stderr
+++ b/src/test/ui/error-codes/E0277.stderr
@@ -22,4 +22,4 @@ LL | fn some_func<T: Foo>(foo: T) {
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/error-codes/E0282.stderr b/src/test/ui/error-codes/E0282.stderr
index da5a53a7359..f1319f41395 100644
--- a/src/test/ui/error-codes/E0282.stderr
+++ b/src/test/ui/error-codes/E0282.stderr
@@ -9,4 +9,4 @@ LL |     let x = "hello".chars().rev().collect(); //~ ERROR E0282
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/error-codes/E0283.stderr b/src/test/ui/error-codes/E0283.stderr
index 9de488cc7aa..3f63881b61e 100644
--- a/src/test/ui/error-codes/E0283.stderr
+++ b/src/test/ui/error-codes/E0283.stderr
@@ -12,4 +12,4 @@ LL |     fn create() -> u32;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0283"
+For more information about this error, try `rustc --explain E0283`.
diff --git a/src/test/ui/error-codes/E0296.stderr b/src/test/ui/error-codes/E0296.stderr
index a35b634cc04..71db4b614a7 100644
--- a/src/test/ui/error-codes/E0296.stderr
+++ b/src/test/ui/error-codes/E0296.stderr
@@ -6,4 +6,4 @@ LL | #![recursion_limit] //~ ERROR E0296
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0296"
+For more information about this error, try `rustc --explain E0296`.
diff --git a/src/test/ui/error-codes/E0297.stderr b/src/test/ui/error-codes/E0297.stderr
index 67d5139d386..d510fa99cae 100644
--- a/src/test/ui/error-codes/E0297.stderr
+++ b/src/test/ui/error-codes/E0297.stderr
@@ -6,4 +6,4 @@ LL |     for Some(x) in xs {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0005"
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/error-codes/E0301.stderr b/src/test/ui/error-codes/E0301.stderr
index 04ad3c97246..7d5100c516e 100644
--- a/src/test/ui/error-codes/E0301.stderr
+++ b/src/test/ui/error-codes/E0301.stderr
@@ -6,4 +6,4 @@ LL |         option if option.take().is_none() => {}, //~ ERROR E0301
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0301"
+For more information about this error, try `rustc --explain E0301`.
diff --git a/src/test/ui/error-codes/E0302.stderr b/src/test/ui/error-codes/E0302.stderr
index a11b85850a9..f55dd523f13 100644
--- a/src/test/ui/error-codes/E0302.stderr
+++ b/src/test/ui/error-codes/E0302.stderr
@@ -6,4 +6,4 @@ LL |         option if { option = None; false } => { }, //~ ERROR E0302
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0302"
+For more information about this error, try `rustc --explain E0302`.
diff --git a/src/test/ui/error-codes/E0303.stderr b/src/test/ui/error-codes/E0303.stderr
index c0a92ff55d1..b9da037df0e 100644
--- a/src/test/ui/error-codes/E0303.stderr
+++ b/src/test/ui/error-codes/E0303.stderr
@@ -15,5 +15,5 @@ LL |         ref op_string_ref @ Some(s) => {},
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0009, E0303
-If you want more information on an error, try using "rustc --explain E0009"
+Some errors occurred: E0009, E0303.
+For more information about an error, try `rustc --explain E0009`.
diff --git a/src/test/ui/error-codes/E0308-4.stderr b/src/test/ui/error-codes/E0308-4.stderr
index 057791b467f..31875349bac 100644
--- a/src/test/ui/error-codes/E0308-4.stderr
+++ b/src/test/ui/error-codes/E0308-4.stderr
@@ -6,4 +6,4 @@ LL |         0u8...3i8 => (), //~ ERROR E0308
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/error-codes/E0308.stderr b/src/test/ui/error-codes/E0308.stderr
index 04e5f9da599..490a8e0ff0f 100644
--- a/src/test/ui/error-codes/E0308.stderr
+++ b/src/test/ui/error-codes/E0308.stderr
@@ -9,4 +9,4 @@ LL |     fn size_of<T>(); //~ ERROR E0308
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/error-codes/E0365.stderr b/src/test/ui/error-codes/E0365.stderr
index ce646eb96be..efa21aa2e22 100644
--- a/src/test/ui/error-codes/E0365.stderr
+++ b/src/test/ui/error-codes/E0365.stderr
@@ -8,4 +8,4 @@ LL | pub use foo as foo2;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0365"
+For more information about this error, try `rustc --explain E0365`.
diff --git a/src/test/ui/error-codes/E0370.stderr b/src/test/ui/error-codes/E0370.stderr
index 60e077e063e..f85d2cf5d0b 100644
--- a/src/test/ui/error-codes/E0370.stderr
+++ b/src/test/ui/error-codes/E0370.stderr
@@ -8,4 +8,4 @@ LL |     Y, //~ ERROR E0370
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0370"
+For more information about this error, try `rustc --explain E0370`.
diff --git a/src/test/ui/error-codes/E0374.stderr b/src/test/ui/error-codes/E0374.stderr
index 3441f71dcd1..002e2b003af 100644
--- a/src/test/ui/error-codes/E0374.stderr
+++ b/src/test/ui/error-codes/E0374.stderr
@@ -7,4 +7,4 @@ LL | |     where T: CoerceUnsized<U> {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0374"
+For more information about this error, try `rustc --explain E0374`.
diff --git a/src/test/ui/error-codes/E0375.stderr b/src/test/ui/error-codes/E0375.stderr
index 7e5ddda61d0..3ffd25084b8 100644
--- a/src/test/ui/error-codes/E0375.stderr
+++ b/src/test/ui/error-codes/E0375.stderr
@@ -9,4 +9,4 @@ LL | impl<T, U> CoerceUnsized<Foo<U, T>> for Foo<T, U> {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0375"
+For more information about this error, try `rustc --explain E0375`.
diff --git a/src/test/ui/error-codes/E0376.stderr b/src/test/ui/error-codes/E0376.stderr
index 13c2e443113..c850d13e633 100644
--- a/src/test/ui/error-codes/E0376.stderr
+++ b/src/test/ui/error-codes/E0376.stderr
@@ -6,4 +6,4 @@ LL | impl<T, U> CoerceUnsized<U> for Foo<T> {} //~ ERROR E0376
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0376"
+For more information about this error, try `rustc --explain E0376`.
diff --git a/src/test/ui/error-codes/E0388.stderr b/src/test/ui/error-codes/E0388.stderr
index 7c327970b94..d2263cd4034 100644
--- a/src/test/ui/error-codes/E0388.stderr
+++ b/src/test/ui/error-codes/E0388.stderr
@@ -24,5 +24,5 @@ LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0017, E0596
-If you want more information on an error, try using "rustc --explain E0017"
+Some errors occurred: E0017, E0596.
+For more information about an error, try `rustc --explain E0017`.
diff --git a/src/test/ui/error-codes/E0389.stderr b/src/test/ui/error-codes/E0389.stderr
index a24491770c8..29e1ea9dd16 100644
--- a/src/test/ui/error-codes/E0389.stderr
+++ b/src/test/ui/error-codes/E0389.stderr
@@ -6,4 +6,4 @@ LL |     fancy_ref.num = 6; //~ ERROR E0389
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0389"
+For more information about this error, try `rustc --explain E0389`.
diff --git a/src/test/ui/error-codes/E0390.stderr b/src/test/ui/error-codes/E0390.stderr
index 70b62f5771e..fda2c2e2fe0 100644
--- a/src/test/ui/error-codes/E0390.stderr
+++ b/src/test/ui/error-codes/E0390.stderr
@@ -12,4 +12,4 @@ LL | impl *mut Foo {} //~ ERROR E0390
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0390"
+For more information about this error, try `rustc --explain E0390`.
diff --git a/src/test/ui/error-codes/E0392.stderr b/src/test/ui/error-codes/E0392.stderr
index 9ee85aa4de3..cfa9c49b2ee 100644
--- a/src/test/ui/error-codes/E0392.stderr
+++ b/src/test/ui/error-codes/E0392.stderr
@@ -8,4 +8,4 @@ LL | enum Foo<T> { Bar } //~ ERROR E0392
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0392"
+For more information about this error, try `rustc --explain E0392`.
diff --git a/src/test/ui/error-codes/E0393.stderr b/src/test/ui/error-codes/E0393.stderr
index f6e77cbb800..c0e282308c1 100644
--- a/src/test/ui/error-codes/E0393.stderr
+++ b/src/test/ui/error-codes/E0393.stderr
@@ -8,4 +8,4 @@ LL | fn together_we_will_rule_the_galaxy(son: &A) {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0393"
+For more information about this error, try `rustc --explain E0393`.
diff --git a/src/test/ui/error-codes/E0394.stderr b/src/test/ui/error-codes/E0394.stderr
index 74cb5ed0376..6c89957de07 100644
--- a/src/test/ui/error-codes/E0394.stderr
+++ b/src/test/ui/error-codes/E0394.stderr
@@ -8,4 +8,4 @@ LL | static B: u32 = A;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0394"
+For more information about this error, try `rustc --explain E0394`.
diff --git a/src/test/ui/error-codes/E0395.stderr b/src/test/ui/error-codes/E0395.stderr
index 5f3d962877a..ee90df79870 100644
--- a/src/test/ui/error-codes/E0395.stderr
+++ b/src/test/ui/error-codes/E0395.stderr
@@ -6,4 +6,4 @@ LL | static BAZ: bool = { (&FOO as *const i32) == (&BAR as *const i32) }; //~ ER
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0395"
+For more information about this error, try `rustc --explain E0395`.
diff --git a/src/test/ui/error-codes/E0396.stderr b/src/test/ui/error-codes/E0396.stderr
index fe20b984216..87dfd50dc97 100644
--- a/src/test/ui/error-codes/E0396.stderr
+++ b/src/test/ui/error-codes/E0396.stderr
@@ -6,4 +6,4 @@ LL | const VALUE: u8 = unsafe { *REG_ADDR }; //~ ERROR E0396
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0396"
+For more information about this error, try `rustc --explain E0396`.
diff --git a/src/test/ui/error-codes/E0401.stderr b/src/test/ui/error-codes/E0401.stderr
index c306ff4a04f..42c79602cf3 100644
--- a/src/test/ui/error-codes/E0401.stderr
+++ b/src/test/ui/error-codes/E0401.stderr
@@ -32,4 +32,4 @@ LL |         fn helper(sel: &Self) -> u8 { //~ ERROR E0401
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0401"
+For more information about this error, try `rustc --explain E0401`.
diff --git a/src/test/ui/error-codes/E0403.stderr b/src/test/ui/error-codes/E0403.stderr
index a83d6b67473..f9ccc31654a 100644
--- a/src/test/ui/error-codes/E0403.stderr
+++ b/src/test/ui/error-codes/E0403.stderr
@@ -8,4 +8,4 @@ LL | fn foo<T, T>(s: T, u: T) {} //~ ERROR E0403
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0403"
+For more information about this error, try `rustc --explain E0403`.
diff --git a/src/test/ui/error-codes/E0404.stderr b/src/test/ui/error-codes/E0404.stderr
index ac1d2a00cf4..9f705da5861 100644
--- a/src/test/ui/error-codes/E0404.stderr
+++ b/src/test/ui/error-codes/E0404.stderr
@@ -12,4 +12,3 @@ LL | fn baz<T: Foo>(_: T) {} //~ ERROR E0404
 
 error: cannot continue compilation due to previous error
 
-If you want more information on this error, try using "rustc --explain E0404"
diff --git a/src/test/ui/error-codes/E0405.stderr b/src/test/ui/error-codes/E0405.stderr
index 0019e16d7f3..b5901dd9c84 100644
--- a/src/test/ui/error-codes/E0405.stderr
+++ b/src/test/ui/error-codes/E0405.stderr
@@ -6,4 +6,3 @@ LL | impl SomeTrait for Foo {} //~ ERROR E0405
 
 error: cannot continue compilation due to previous error
 
-If you want more information on this error, try using "rustc --explain E0405"
diff --git a/src/test/ui/error-codes/E0407.stderr b/src/test/ui/error-codes/E0407.stderr
index 2e2bc3aeb55..1be04a992c2 100644
--- a/src/test/ui/error-codes/E0407.stderr
+++ b/src/test/ui/error-codes/E0407.stderr
@@ -6,4 +6,4 @@ LL |     fn b() {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0407"
+For more information about this error, try `rustc --explain E0407`.
diff --git a/src/test/ui/error-codes/E0408.stderr b/src/test/ui/error-codes/E0408.stderr
index 1f928275bd5..46845de1aad 100644
--- a/src/test/ui/error-codes/E0408.stderr
+++ b/src/test/ui/error-codes/E0408.stderr
@@ -8,4 +8,4 @@ LL |         Some(y) | None => {} //~  ERROR variable `y` is not bound in all pa
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0408"
+For more information about this error, try `rustc --explain E0408`.
diff --git a/src/test/ui/error-codes/E0411.stderr b/src/test/ui/error-codes/E0411.stderr
index b0336d7d668..a5f2e3a7b93 100644
--- a/src/test/ui/error-codes/E0411.stderr
+++ b/src/test/ui/error-codes/E0411.stderr
@@ -6,4 +6,4 @@ LL |     <Self>::foo; //~ ERROR E0411
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0411"
+For more information about this error, try `rustc --explain E0411`.
diff --git a/src/test/ui/error-codes/E0412.stderr b/src/test/ui/error-codes/E0412.stderr
index 4444af73a7e..61115c8b292 100644
--- a/src/test/ui/error-codes/E0412.stderr
+++ b/src/test/ui/error-codes/E0412.stderr
@@ -6,4 +6,4 @@ LL | impl Something {} //~ ERROR E0412
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0412"
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/error-codes/E0415.stderr b/src/test/ui/error-codes/E0415.stderr
index 82c6284e433..3f036f3a534 100644
--- a/src/test/ui/error-codes/E0415.stderr
+++ b/src/test/ui/error-codes/E0415.stderr
@@ -6,4 +6,4 @@ LL | fn foo(f: i32, f: i32) {} //~ ERROR E0415
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0415"
+For more information about this error, try `rustc --explain E0415`.
diff --git a/src/test/ui/error-codes/E0416.stderr b/src/test/ui/error-codes/E0416.stderr
index 35daf20a223..8815bb2ad84 100644
--- a/src/test/ui/error-codes/E0416.stderr
+++ b/src/test/ui/error-codes/E0416.stderr
@@ -6,4 +6,4 @@ LL |         (x, x) => {} //~ ERROR E0416
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0416"
+For more information about this error, try `rustc --explain E0416`.
diff --git a/src/test/ui/error-codes/E0423.stderr b/src/test/ui/error-codes/E0423.stderr
index 112754e75b8..ef24295332d 100644
--- a/src/test/ui/error-codes/E0423.stderr
+++ b/src/test/ui/error-codes/E0423.stderr
@@ -6,4 +6,4 @@ LL |     let f = Foo(); //~ ERROR E0423
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0423"
+For more information about this error, try `rustc --explain E0423`.
diff --git a/src/test/ui/error-codes/E0424.stderr b/src/test/ui/error-codes/E0424.stderr
index 5f2d5673067..2c4f7f7c62b 100644
--- a/src/test/ui/error-codes/E0424.stderr
+++ b/src/test/ui/error-codes/E0424.stderr
@@ -6,4 +6,4 @@ LL |         self.bar(); //~ ERROR E0424
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0424"
+For more information about this error, try `rustc --explain E0424`.
diff --git a/src/test/ui/error-codes/E0425.stderr b/src/test/ui/error-codes/E0425.stderr
index 9d27e4f5944..72756baf8ef 100644
--- a/src/test/ui/error-codes/E0425.stderr
+++ b/src/test/ui/error-codes/E0425.stderr
@@ -6,4 +6,4 @@ LL |         elf; //~ ERROR E0425
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0425"
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/error-codes/E0426.stderr b/src/test/ui/error-codes/E0426.stderr
index 5e0bc69b1eb..29249ab3919 100644
--- a/src/test/ui/error-codes/E0426.stderr
+++ b/src/test/ui/error-codes/E0426.stderr
@@ -6,4 +6,4 @@ LL |         break 'a;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0426"
+For more information about this error, try `rustc --explain E0426`.
diff --git a/src/test/ui/error-codes/E0428.stderr b/src/test/ui/error-codes/E0428.stderr
index 20f734af081..ebfe866625d 100644
--- a/src/test/ui/error-codes/E0428.stderr
+++ b/src/test/ui/error-codes/E0428.stderr
@@ -10,4 +10,4 @@ LL | struct Bar; //~ ERROR E0428
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0428"
+For more information about this error, try `rustc --explain E0428`.
diff --git a/src/test/ui/error-codes/E0429.stderr b/src/test/ui/error-codes/E0429.stderr
index a72c77360b5..d36155fb466 100644
--- a/src/test/ui/error-codes/E0429.stderr
+++ b/src/test/ui/error-codes/E0429.stderr
@@ -6,4 +6,4 @@ LL | use std::fmt::self; //~ ERROR E0429
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0429"
+For more information about this error, try `rustc --explain E0429`.
diff --git a/src/test/ui/error-codes/E0430.stderr b/src/test/ui/error-codes/E0430.stderr
index b6448ec18c3..c50ed4ea5de 100644
--- a/src/test/ui/error-codes/E0430.stderr
+++ b/src/test/ui/error-codes/E0430.stderr
@@ -22,5 +22,5 @@ LL | use std::fmt::{self, self as other_fmt}; //~ ERROR E0430
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0252, E0430
-If you want more information on an error, try using "rustc --explain E0252"
+Some errors occurred: E0252, E0430.
+For more information about an error, try `rustc --explain E0252`.
diff --git a/src/test/ui/error-codes/E0431.stderr b/src/test/ui/error-codes/E0431.stderr
index 364ba0aa957..75b8486aa5c 100644
--- a/src/test/ui/error-codes/E0431.stderr
+++ b/src/test/ui/error-codes/E0431.stderr
@@ -6,4 +6,4 @@ LL | use {self}; //~ ERROR E0431
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0431"
+For more information about this error, try `rustc --explain E0431`.
diff --git a/src/test/ui/error-codes/E0432.stderr b/src/test/ui/error-codes/E0432.stderr
index 747b337d363..291bb450755 100644
--- a/src/test/ui/error-codes/E0432.stderr
+++ b/src/test/ui/error-codes/E0432.stderr
@@ -6,4 +6,4 @@ LL | use something::Foo; //~ ERROR E0432
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0432"
+For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/error-codes/E0433.stderr b/src/test/ui/error-codes/E0433.stderr
index 7635d9738ad..f8cf5f6f92f 100644
--- a/src/test/ui/error-codes/E0433.stderr
+++ b/src/test/ui/error-codes/E0433.stderr
@@ -6,4 +6,4 @@ LL |     let map = HashMap::new(); //~ ERROR E0433
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0433"
+For more information about this error, try `rustc --explain E0433`.
diff --git a/src/test/ui/error-codes/E0434.stderr b/src/test/ui/error-codes/E0434.stderr
index b13c0cf7971..bbbc7d16e3b 100644
--- a/src/test/ui/error-codes/E0434.stderr
+++ b/src/test/ui/error-codes/E0434.stderr
@@ -8,4 +8,4 @@ LL |         y //~ ERROR E0434
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0434"
+For more information about this error, try `rustc --explain E0434`.
diff --git a/src/test/ui/error-codes/E0435.stderr b/src/test/ui/error-codes/E0435.stderr
index 5ca79e72c2b..517fddfa1ac 100644
--- a/src/test/ui/error-codes/E0435.stderr
+++ b/src/test/ui/error-codes/E0435.stderr
@@ -6,4 +6,4 @@ LL |     let _: [u8; foo]; //~ ERROR E0435
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0435"
+For more information about this error, try `rustc --explain E0435`.
diff --git a/src/test/ui/error-codes/E0437.stderr b/src/test/ui/error-codes/E0437.stderr
index 408924b0439..790e306f121 100644
--- a/src/test/ui/error-codes/E0437.stderr
+++ b/src/test/ui/error-codes/E0437.stderr
@@ -6,4 +6,4 @@ LL |     type Bar = bool; //~ ERROR E0437
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0437"
+For more information about this error, try `rustc --explain E0437`.
diff --git a/src/test/ui/error-codes/E0438.stderr b/src/test/ui/error-codes/E0438.stderr
index b636236e41a..5f311e9bca9 100644
--- a/src/test/ui/error-codes/E0438.stderr
+++ b/src/test/ui/error-codes/E0438.stderr
@@ -6,4 +6,4 @@ LL |     const BAR: bool = true; //~ ERROR E0438
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0438"
+For more information about this error, try `rustc --explain E0438`.
diff --git a/src/test/ui/error-codes/E0439.stderr b/src/test/ui/error-codes/E0439.stderr
index 27a09043125..1400633001a 100644
--- a/src/test/ui/error-codes/E0439.stderr
+++ b/src/test/ui/error-codes/E0439.stderr
@@ -6,4 +6,4 @@ LL |     fn simd_shuffle<A,B>(a: A, b: A, c: [u32; 8]) -> B; //~ ERROR E0439
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0439"
+For more information about this error, try `rustc --explain E0439`.
diff --git a/src/test/ui/error-codes/E0440.stderr b/src/test/ui/error-codes/E0440.stderr
index c9ac1b8261b..acaa948a331 100644
--- a/src/test/ui/error-codes/E0440.stderr
+++ b/src/test/ui/error-codes/E0440.stderr
@@ -6,4 +6,4 @@ LL |     fn x86_mm_movemask_pd<T>(x: f64x2) -> i32; //~ ERROR E0440
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0440"
+For more information about this error, try `rustc --explain E0440`.
diff --git a/src/test/ui/error-codes/E0441.stderr b/src/test/ui/error-codes/E0441.stderr
index 1cb4193bd34..8a01176dbbe 100644
--- a/src/test/ui/error-codes/E0441.stderr
+++ b/src/test/ui/error-codes/E0441.stderr
@@ -6,4 +6,4 @@ LL |     fn x86_mm_adds_ep16(x: i16x8, y: i16x8) -> i16x8; //~ ERROR E0441
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0441"
+For more information about this error, try `rustc --explain E0441`.
diff --git a/src/test/ui/error-codes/E0442.stderr b/src/test/ui/error-codes/E0442.stderr
index 2119ea11a66..01881e1b5c3 100644
--- a/src/test/ui/error-codes/E0442.stderr
+++ b/src/test/ui/error-codes/E0442.stderr
@@ -18,4 +18,4 @@ LL |     fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2;
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0442"
+For more information about this error, try `rustc --explain E0442`.
diff --git a/src/test/ui/error-codes/E0443.stderr b/src/test/ui/error-codes/E0443.stderr
index 8a08bd9762e..b57c9423fce 100644
--- a/src/test/ui/error-codes/E0443.stderr
+++ b/src/test/ui/error-codes/E0443.stderr
@@ -6,4 +6,4 @@ LL |     fn x86_mm_adds_epi16(x: i16x8, y: i16x8) -> i64x8; //~ ERROR E0443
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0443"
+For more information about this error, try `rustc --explain E0443`.
diff --git a/src/test/ui/error-codes/E0444.stderr b/src/test/ui/error-codes/E0444.stderr
index 7e20e47b165..338c9dac75e 100644
--- a/src/test/ui/error-codes/E0444.stderr
+++ b/src/test/ui/error-codes/E0444.stderr
@@ -6,4 +6,4 @@ LL |     fn x86_mm_movemask_pd(x: f64x2, y: f64x2, z: f64x2) -> i32; //~ ERROR E
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0444"
+For more information about this error, try `rustc --explain E0444`.
diff --git a/src/test/ui/error-codes/E0445.stderr b/src/test/ui/error-codes/E0445.stderr
index 6e0616277f4..552de83a65e 100644
--- a/src/test/ui/error-codes/E0445.stderr
+++ b/src/test/ui/error-codes/E0445.stderr
@@ -18,4 +18,4 @@ LL | pub fn foo<T: Foo> (t: T) {}
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0445"
+For more information about this error, try `rustc --explain E0445`.
diff --git a/src/test/ui/error-codes/E0446.stderr b/src/test/ui/error-codes/E0446.stderr
index 067fdb47da9..bb5ae494d6c 100644
--- a/src/test/ui/error-codes/E0446.stderr
+++ b/src/test/ui/error-codes/E0446.stderr
@@ -8,4 +8,4 @@ LL | |     }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0446"
+For more information about this error, try `rustc --explain E0446`.
diff --git a/src/test/ui/error-codes/E0449.stderr b/src/test/ui/error-codes/E0449.stderr
index 68ec6379d71..480d8c40022 100644
--- a/src/test/ui/error-codes/E0449.stderr
+++ b/src/test/ui/error-codes/E0449.stderr
@@ -20,4 +20,4 @@ LL |     pub fn foo() {} //~ ERROR E0449
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0449"
+For more information about this error, try `rustc --explain E0449`.
diff --git a/src/test/ui/error-codes/E0451.stderr b/src/test/ui/error-codes/E0451.stderr
index 003a93811bd..4d54e17d507 100644
--- a/src/test/ui/error-codes/E0451.stderr
+++ b/src/test/ui/error-codes/E0451.stderr
@@ -12,4 +12,4 @@ LL |     let f = Bar::Foo{ a: 0, b: 0 }; //~ ERROR E0451
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0451"
+For more information about this error, try `rustc --explain E0451`.
diff --git a/src/test/ui/error-codes/E0452.stderr b/src/test/ui/error-codes/E0452.stderr
index 6e4b47e9631..a915ca1d674 100644
--- a/src/test/ui/error-codes/E0452.stderr
+++ b/src/test/ui/error-codes/E0452.stderr
@@ -6,4 +6,4 @@ LL | #![allow(foo = "")] //~ ERROR E0452
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0452"
+For more information about this error, try `rustc --explain E0452`.
diff --git a/src/test/ui/error-codes/E0453.stderr b/src/test/ui/error-codes/E0453.stderr
index 646b98b8473..59e1a1cfdfc 100644
--- a/src/test/ui/error-codes/E0453.stderr
+++ b/src/test/ui/error-codes/E0453.stderr
@@ -9,4 +9,4 @@ LL | #[allow(non_snake_case)]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0453"
+For more information about this error, try `rustc --explain E0453`.
diff --git a/src/test/ui/error-codes/E0454.stderr b/src/test/ui/error-codes/E0454.stderr
index 11f1958bf96..44dde538666 100644
--- a/src/test/ui/error-codes/E0454.stderr
+++ b/src/test/ui/error-codes/E0454.stderr
@@ -6,4 +6,4 @@ LL | #[link(name = "")] extern {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0454"
+For more information about this error, try `rustc --explain E0454`.
diff --git a/src/test/ui/error-codes/E0458.stderr b/src/test/ui/error-codes/E0458.stderr
index 4bcafa47d35..5304e7c2d27 100644
--- a/src/test/ui/error-codes/E0458.stderr
+++ b/src/test/ui/error-codes/E0458.stderr
@@ -12,5 +12,5 @@ LL | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0458, E0459
-If you want more information on an error, try using "rustc --explain E0458"
+Some errors occurred: E0458, E0459.
+For more information about an error, try `rustc --explain E0458`.
diff --git a/src/test/ui/error-codes/E0459.stderr b/src/test/ui/error-codes/E0459.stderr
index c443e78ab3a..8f31e7b4b13 100644
--- a/src/test/ui/error-codes/E0459.stderr
+++ b/src/test/ui/error-codes/E0459.stderr
@@ -6,4 +6,4 @@ LL | #[link(kind = "dylib")] extern {} //~ ERROR E0459
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0459"
+For more information about this error, try `rustc --explain E0459`.
diff --git a/src/test/ui/error-codes/E0463.stderr b/src/test/ui/error-codes/E0463.stderr
index 41575b70d15..26403827e4a 100644
--- a/src/test/ui/error-codes/E0463.stderr
+++ b/src/test/ui/error-codes/E0463.stderr
@@ -6,4 +6,4 @@ LL | #![plugin(cookie_monster)]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0463"
+For more information about this error, try `rustc --explain E0463`.
diff --git a/src/test/ui/error-codes/E0478.stderr b/src/test/ui/error-codes/E0478.stderr
index bbc243a3757..44d8151303f 100644
--- a/src/test/ui/error-codes/E0478.stderr
+++ b/src/test/ui/error-codes/E0478.stderr
@@ -17,4 +17,4 @@ LL | struct Prince<'kiss, 'SnowWhite> {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0478"
+For more information about this error, try `rustc --explain E0478`.
diff --git a/src/test/ui/error-codes/E0492.stderr b/src/test/ui/error-codes/E0492.stderr
index 359c63bb8ff..157a1929690 100644
--- a/src/test/ui/error-codes/E0492.stderr
+++ b/src/test/ui/error-codes/E0492.stderr
@@ -6,4 +6,4 @@ LL | static B: &'static AtomicUsize = &A; //~ ERROR E0492
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0492"
+For more information about this error, try `rustc --explain E0492`.
diff --git a/src/test/ui/error-codes/E0494.stderr b/src/test/ui/error-codes/E0494.stderr
index 82dd74c012b..65e6b1fe670 100644
--- a/src/test/ui/error-codes/E0494.stderr
+++ b/src/test/ui/error-codes/E0494.stderr
@@ -6,4 +6,4 @@ LL | static A : &'static u32 = &S.a; //~ ERROR E0494
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0494"
+For more information about this error, try `rustc --explain E0494`.
diff --git a/src/test/ui/error-codes/E0496.stderr b/src/test/ui/error-codes/E0496.stderr
index 945c2391d03..198daa512bd 100644
--- a/src/test/ui/error-codes/E0496.stderr
+++ b/src/test/ui/error-codes/E0496.stderr
@@ -8,4 +8,4 @@ LL |     fn f<'a>(x: &'a i32) { //~ ERROR E0496
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0496"
+For more information about this error, try `rustc --explain E0496`.
diff --git a/src/test/ui/error-codes/E0499.stderr b/src/test/ui/error-codes/E0499.stderr
index 5332df0c235..dcb477ab1cb 100644
--- a/src/test/ui/error-codes/E0499.stderr
+++ b/src/test/ui/error-codes/E0499.stderr
@@ -10,4 +10,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0499"
+For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/error-codes/E0502.stderr b/src/test/ui/error-codes/E0502.stderr
index 07430990f0a..d377fa883dd 100644
--- a/src/test/ui/error-codes/E0502.stderr
+++ b/src/test/ui/error-codes/E0502.stderr
@@ -10,4 +10,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0502"
+For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/error-codes/E0503.stderr b/src/test/ui/error-codes/E0503.stderr
index ac6634cb64f..0342ebc4193 100644
--- a/src/test/ui/error-codes/E0503.stderr
+++ b/src/test/ui/error-codes/E0503.stderr
@@ -8,4 +8,4 @@ LL |     let _sum = value + 1; //~ ERROR E0503
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0503"
+For more information about this error, try `rustc --explain E0503`.
diff --git a/src/test/ui/error-codes/E0504.stderr b/src/test/ui/error-codes/E0504.stderr
index 9f3bd79dcfe..cd1d3ec5ba4 100644
--- a/src/test/ui/error-codes/E0504.stderr
+++ b/src/test/ui/error-codes/E0504.stderr
@@ -9,4 +9,4 @@ LL |         println!("child function: {}", fancy_num.num); //~ ERROR E0504
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0504"
+For more information about this error, try `rustc --explain E0504`.
diff --git a/src/test/ui/error-codes/E0505.stderr b/src/test/ui/error-codes/E0505.stderr
index 71392857d0a..64558ba8c7c 100644
--- a/src/test/ui/error-codes/E0505.stderr
+++ b/src/test/ui/error-codes/E0505.stderr
@@ -8,4 +8,4 @@ LL |         eat(x); //~ ERROR E0505
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0505"
+For more information about this error, try `rustc --explain E0505`.
diff --git a/src/test/ui/error-codes/E0507.stderr b/src/test/ui/error-codes/E0507.stderr
index de94648ec0b..3d9d8a5145d 100644
--- a/src/test/ui/error-codes/E0507.stderr
+++ b/src/test/ui/error-codes/E0507.stderr
@@ -6,4 +6,4 @@ LL |     x.borrow().nothing_is_true(); //~ ERROR E0507
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0507"
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/error-codes/E0509.stderr b/src/test/ui/error-codes/E0509.stderr
index 3bc2a4450a1..3952081a265 100644
--- a/src/test/ui/error-codes/E0509.stderr
+++ b/src/test/ui/error-codes/E0509.stderr
@@ -9,4 +9,4 @@ LL |     let fancy_field = drop_struct.fancy; //~ ERROR E0509
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0509"
+For more information about this error, try `rustc --explain E0509`.
diff --git a/src/test/ui/error-codes/E0511.stderr b/src/test/ui/error-codes/E0511.stderr
index 0273735562d..1b8d125cf1a 100644
--- a/src/test/ui/error-codes/E0511.stderr
+++ b/src/test/ui/error-codes/E0511.stderr
@@ -6,4 +6,4 @@ LL |     unsafe { simd_add(0, 1); } //~ ERROR E0511
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0511"
+For more information about this error, try `rustc --explain E0511`.
diff --git a/src/test/ui/error-codes/E0512.stderr b/src/test/ui/error-codes/E0512.stderr
index bcce48c0cd5..c91f6ad8f0a 100644
--- a/src/test/ui/error-codes/E0512.stderr
+++ b/src/test/ui/error-codes/E0512.stderr
@@ -9,4 +9,4 @@ LL |     unsafe { takes_u8(::std::mem::transmute(0u16)); } //~ ERROR E0512
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0512"
+For more information about this error, try `rustc --explain E0512`.
diff --git a/src/test/ui/error-codes/E0516.stderr b/src/test/ui/error-codes/E0516.stderr
index bae85cabced..d298e288859 100644
--- a/src/test/ui/error-codes/E0516.stderr
+++ b/src/test/ui/error-codes/E0516.stderr
@@ -6,4 +6,4 @@ LL |     let x: typeof(92) = 92; //~ ERROR E0516
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0516"
+For more information about this error, try `rustc --explain E0516`.
diff --git a/src/test/ui/error-codes/E0517.stderr b/src/test/ui/error-codes/E0517.stderr
index fbaeb6fabbb..4779fd08c68 100644
--- a/src/test/ui/error-codes/E0517.stderr
+++ b/src/test/ui/error-codes/E0517.stderr
@@ -33,4 +33,4 @@ LL | | }
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0517"
+For more information about this error, try `rustc --explain E0517`.
diff --git a/src/test/ui/error-codes/E0518.stderr b/src/test/ui/error-codes/E0518.stderr
index 3d199c7fa7f..d8feec99140 100644
--- a/src/test/ui/error-codes/E0518.stderr
+++ b/src/test/ui/error-codes/E0518.stderr
@@ -17,4 +17,4 @@ LL | | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0518"
+For more information about this error, try `rustc --explain E0518`.
diff --git a/src/test/ui/error-codes/E0520.stderr b/src/test/ui/error-codes/E0520.stderr
index a79f11f63e7..67ec1d42715 100644
--- a/src/test/ui/error-codes/E0520.stderr
+++ b/src/test/ui/error-codes/E0520.stderr
@@ -13,4 +13,4 @@ LL |       default fn fly(&self) {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0520"
+For more information about this error, try `rustc --explain E0520`.
diff --git a/src/test/ui/error-codes/E0522.stderr b/src/test/ui/error-codes/E0522.stderr
index c67e7bea34d..5a6331bca0b 100644
--- a/src/test/ui/error-codes/E0522.stderr
+++ b/src/test/ui/error-codes/E0522.stderr
@@ -8,5 +8,5 @@ LL | #[lang = "cookie"]
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0522, E0601
-If you want more information on an error, try using "rustc --explain E0522"
+Some errors occurred: E0522, E0601.
+For more information about an error, try `rustc --explain E0522`.
diff --git a/src/test/ui/error-codes/E0527.stderr b/src/test/ui/error-codes/E0527.stderr
index d9f99224057..2060f1e69e0 100644
--- a/src/test/ui/error-codes/E0527.stderr
+++ b/src/test/ui/error-codes/E0527.stderr
@@ -6,4 +6,4 @@ LL |         &[a, b] => {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0527"
+For more information about this error, try `rustc --explain E0527`.
diff --git a/src/test/ui/error-codes/E0528.stderr b/src/test/ui/error-codes/E0528.stderr
index 824fae59588..ca9f8f45457 100644
--- a/src/test/ui/error-codes/E0528.stderr
+++ b/src/test/ui/error-codes/E0528.stderr
@@ -6,4 +6,4 @@ LL |         &[a, b, c, rest..] => {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0528"
+For more information about this error, try `rustc --explain E0528`.
diff --git a/src/test/ui/error-codes/E0529.stderr b/src/test/ui/error-codes/E0529.stderr
index 5031f717c82..fcada000790 100644
--- a/src/test/ui/error-codes/E0529.stderr
+++ b/src/test/ui/error-codes/E0529.stderr
@@ -6,4 +6,4 @@ LL |         [a, b] => {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0529"
+For more information about this error, try `rustc --explain E0529`.
diff --git a/src/test/ui/error-codes/E0530.stderr b/src/test/ui/error-codes/E0530.stderr
index 2a76eb14087..e157ca9042c 100644
--- a/src/test/ui/error-codes/E0530.stderr
+++ b/src/test/ui/error-codes/E0530.stderr
@@ -9,4 +9,4 @@ LL |         TEST => {} //~ ERROR E0530
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0530"
+For more information about this error, try `rustc --explain E0530`.
diff --git a/src/test/ui/error-codes/E0532.stderr b/src/test/ui/error-codes/E0532.stderr
index 04102f4dbef..faccd10ec6d 100644
--- a/src/test/ui/error-codes/E0532.stderr
+++ b/src/test/ui/error-codes/E0532.stderr
@@ -6,4 +6,4 @@ LL |         StructConst1(_) => { },
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0532"
+For more information about this error, try `rustc --explain E0532`.
diff --git a/src/test/ui/error-codes/E0534.stderr b/src/test/ui/error-codes/E0534.stderr
index 7f56f6b11f1..30890882cc3 100644
--- a/src/test/ui/error-codes/E0534.stderr
+++ b/src/test/ui/error-codes/E0534.stderr
@@ -6,4 +6,4 @@ LL | #[inline()] //~ ERROR E0534
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0534"
+For more information about this error, try `rustc --explain E0534`.
diff --git a/src/test/ui/error-codes/E0558.stderr b/src/test/ui/error-codes/E0558.stderr
index cf2ee9a1160..0cb8af99294 100644
--- a/src/test/ui/error-codes/E0558.stderr
+++ b/src/test/ui/error-codes/E0558.stderr
@@ -6,4 +6,4 @@ LL | #[export_name]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0558"
+For more information about this error, try `rustc --explain E0558`.
diff --git a/src/test/ui/error-codes/E0559.stderr b/src/test/ui/error-codes/E0559.stderr
index 5e0382de5c9..cb9059ee538 100644
--- a/src/test/ui/error-codes/E0559.stderr
+++ b/src/test/ui/error-codes/E0559.stderr
@@ -8,4 +8,4 @@ LL |     let s = Field::Fool { joke: 0 };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0559"
+For more information about this error, try `rustc --explain E0559`.
diff --git a/src/test/ui/error-codes/E0560.stderr b/src/test/ui/error-codes/E0560.stderr
index 1b4e62425f0..66fb04111db 100644
--- a/src/test/ui/error-codes/E0560.stderr
+++ b/src/test/ui/error-codes/E0560.stderr
@@ -8,4 +8,4 @@ LL |     let s = Simba { mother: 1, father: 0 };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0560"
+For more information about this error, try `rustc --explain E0560`.
diff --git a/src/test/ui/error-codes/E0565-1.stderr b/src/test/ui/error-codes/E0565-1.stderr
index f393aa56f9c..745e79ba2ec 100644
--- a/src/test/ui/error-codes/E0565-1.stderr
+++ b/src/test/ui/error-codes/E0565-1.stderr
@@ -6,4 +6,4 @@ LL | #[deprecated("since")] //~ ERROR E0565
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0565"
+For more information about this error, try `rustc --explain E0565`.
diff --git a/src/test/ui/error-codes/E0565.stderr b/src/test/ui/error-codes/E0565.stderr
index c0c1b7b2743..1d0f34be39b 100644
--- a/src/test/ui/error-codes/E0565.stderr
+++ b/src/test/ui/error-codes/E0565.stderr
@@ -6,4 +6,4 @@ LL | #[repr("C")] //~ ERROR E0565
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0565"
+For more information about this error, try `rustc --explain E0565`.
diff --git a/src/test/ui/error-codes/E0572.stderr b/src/test/ui/error-codes/E0572.stderr
index 199476248a4..b2896c3892d 100644
--- a/src/test/ui/error-codes/E0572.stderr
+++ b/src/test/ui/error-codes/E0572.stderr
@@ -6,4 +6,4 @@ LL | const FOO: u32 = return 0; //~ ERROR E0572
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0572"
+For more information about this error, try `rustc --explain E0572`.
diff --git a/src/test/ui/error-codes/E0582.stderr b/src/test/ui/error-codes/E0582.stderr
index 1bb3049a3f7..c92e0b9f137 100644
--- a/src/test/ui/error-codes/E0582.stderr
+++ b/src/test/ui/error-codes/E0582.stderr
@@ -12,4 +12,4 @@ LL |     where F: for<'a> Iterator<Item=&'a i32>
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0582"
+For more information about this error, try `rustc --explain E0582`.
diff --git a/src/test/ui/error-codes/E0585.stderr b/src/test/ui/error-codes/E0585.stderr
index 063acd2e653..ef0825939c3 100644
--- a/src/test/ui/error-codes/E0585.stderr
+++ b/src/test/ui/error-codes/E0585.stderr
@@ -8,4 +8,4 @@ LL |     /// Hello! I'm useless...
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0585"
+For more information about this error, try `rustc --explain E0585`.
diff --git a/src/test/ui/error-codes/E0586.stderr b/src/test/ui/error-codes/E0586.stderr
index 35292724498..bd72fbee160 100644
--- a/src/test/ui/error-codes/E0586.stderr
+++ b/src/test/ui/error-codes/E0586.stderr
@@ -8,4 +8,4 @@ LL |     let x = &tmp[1..=]; //~ ERROR E0586
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0586"
+For more information about this error, try `rustc --explain E0586`.
diff --git a/src/test/ui/error-codes/E0597.stderr b/src/test/ui/error-codes/E0597.stderr
index 41035493bfc..5897cc13c94 100644
--- a/src/test/ui/error-codes/E0597.stderr
+++ b/src/test/ui/error-codes/E0597.stderr
@@ -11,4 +11,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/error-codes/E0599.stderr b/src/test/ui/error-codes/E0599.stderr
index a9bb3e50295..d118939d17a 100644
--- a/src/test/ui/error-codes/E0599.stderr
+++ b/src/test/ui/error-codes/E0599.stderr
@@ -9,4 +9,4 @@ LL |     || if let Foo::NotEvenReal() = Foo {}; //~ ERROR E0599
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/error-codes/E0600.stderr b/src/test/ui/error-codes/E0600.stderr
index add05ac3062..500feb39f5e 100644
--- a/src/test/ui/error-codes/E0600.stderr
+++ b/src/test/ui/error-codes/E0600.stderr
@@ -6,4 +6,4 @@ LL |     !"a"; //~ ERROR E0600
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0600"
+For more information about this error, try `rustc --explain E0600`.
diff --git a/src/test/ui/error-codes/E0602.stderr b/src/test/ui/error-codes/E0602.stderr
index fb1144b616d..86360041026 100644
--- a/src/test/ui/error-codes/E0602.stderr
+++ b/src/test/ui/error-codes/E0602.stderr
@@ -4,4 +4,4 @@ error[E0602]: unknown lint: `bogus`
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0602"
+For more information about this error, try `rustc --explain E0602`.
diff --git a/src/test/ui/error-codes/E0603.stderr b/src/test/ui/error-codes/E0603.stderr
index db451cbc0fc..3447f337829 100644
--- a/src/test/ui/error-codes/E0603.stderr
+++ b/src/test/ui/error-codes/E0603.stderr
@@ -6,4 +6,4 @@ LL |     SomeModule::PRIVATE; //~ ERROR E0603
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0603"
+For more information about this error, try `rustc --explain E0603`.
diff --git a/src/test/ui/error-codes/E0604.stderr b/src/test/ui/error-codes/E0604.stderr
index 875f326df37..6aa176d1313 100644
--- a/src/test/ui/error-codes/E0604.stderr
+++ b/src/test/ui/error-codes/E0604.stderr
@@ -6,4 +6,4 @@ LL |     1u32 as char; //~ ERROR E0604
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0604"
+For more information about this error, try `rustc --explain E0604`.
diff --git a/src/test/ui/error-codes/E0605.stderr b/src/test/ui/error-codes/E0605.stderr
index 4e1f47cebb7..e66e1c12d8f 100644
--- a/src/test/ui/error-codes/E0605.stderr
+++ b/src/test/ui/error-codes/E0605.stderr
@@ -16,4 +16,4 @@ LL |     v as &u8; //~ ERROR E0605
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0605"
+For more information about this error, try `rustc --explain E0605`.
diff --git a/src/test/ui/error-codes/E0606.stderr b/src/test/ui/error-codes/E0606.stderr
index 3c90e2d4beb..bd5bc908f72 100644
--- a/src/test/ui/error-codes/E0606.stderr
+++ b/src/test/ui/error-codes/E0606.stderr
@@ -12,4 +12,4 @@ LL |     &0u8 as u8; //~ ERROR E0606
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0606"
+For more information about this error, try `rustc --explain E0606`.
diff --git a/src/test/ui/error-codes/E0607.stderr b/src/test/ui/error-codes/E0607.stderr
index 62d2c2163bf..d109908bc74 100644
--- a/src/test/ui/error-codes/E0607.stderr
+++ b/src/test/ui/error-codes/E0607.stderr
@@ -6,4 +6,4 @@ LL |     v as *const [u8]; //~ ERROR E0607
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0607"
+For more information about this error, try `rustc --explain E0607`.
diff --git a/src/test/ui/error-codes/E0608.stderr b/src/test/ui/error-codes/E0608.stderr
index 43227b4f0a3..d5955d1b070 100644
--- a/src/test/ui/error-codes/E0608.stderr
+++ b/src/test/ui/error-codes/E0608.stderr
@@ -6,4 +6,4 @@ LL |     0u8[2]; //~ ERROR E0608
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0608"
+For more information about this error, try `rustc --explain E0608`.
diff --git a/src/test/ui/error-codes/E0609.stderr b/src/test/ui/error-codes/E0609.stderr
index 70deb168168..24581889ae9 100644
--- a/src/test/ui/error-codes/E0609.stderr
+++ b/src/test/ui/error-codes/E0609.stderr
@@ -14,4 +14,4 @@ LL |     y.1; //~ ERROR E0609
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0609"
+For more information about this error, try `rustc --explain E0609`.
diff --git a/src/test/ui/error-codes/E0610.stderr b/src/test/ui/error-codes/E0610.stderr
index d6b14642546..3f1cda3b447 100644
--- a/src/test/ui/error-codes/E0610.stderr
+++ b/src/test/ui/error-codes/E0610.stderr
@@ -6,4 +6,4 @@ LL |     let _ = x.foo; //~ ERROR E0610
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0610"
+For more information about this error, try `rustc --explain E0610`.
diff --git a/src/test/ui/error-codes/E0611.stderr b/src/test/ui/error-codes/E0611.stderr
index 90194afe4ff..c4b86e76c14 100644
--- a/src/test/ui/error-codes/E0611.stderr
+++ b/src/test/ui/error-codes/E0611.stderr
@@ -6,4 +6,4 @@ LL |    y.0; //~ ERROR E0611
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0611"
+For more information about this error, try `rustc --explain E0611`.
diff --git a/src/test/ui/error-codes/E0612.stderr b/src/test/ui/error-codes/E0612.stderr
index 5c27635097f..18013697a83 100644
--- a/src/test/ui/error-codes/E0612.stderr
+++ b/src/test/ui/error-codes/E0612.stderr
@@ -6,4 +6,4 @@ LL |    y.1; //~ ERROR E0612
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0612"
+For more information about this error, try `rustc --explain E0612`.
diff --git a/src/test/ui/error-codes/E0614.stderr b/src/test/ui/error-codes/E0614.stderr
index b68887ef36b..571d6e76776 100644
--- a/src/test/ui/error-codes/E0614.stderr
+++ b/src/test/ui/error-codes/E0614.stderr
@@ -6,4 +6,4 @@ LL |     *y; //~ ERROR E0614
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0614"
+For more information about this error, try `rustc --explain E0614`.
diff --git a/src/test/ui/error-codes/E0615.stderr b/src/test/ui/error-codes/E0615.stderr
index 39e63825d6a..88317a34ee3 100644
--- a/src/test/ui/error-codes/E0615.stderr
+++ b/src/test/ui/error-codes/E0615.stderr
@@ -8,4 +8,4 @@ LL |     f.method; //~ ERROR E0615
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0615"
+For more information about this error, try `rustc --explain E0615`.
diff --git a/src/test/ui/error-codes/E0616.stderr b/src/test/ui/error-codes/E0616.stderr
index 38065f048ad..26525863c0d 100644
--- a/src/test/ui/error-codes/E0616.stderr
+++ b/src/test/ui/error-codes/E0616.stderr
@@ -6,4 +6,4 @@ LL |     f.x; //~ ERROR E0616
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0616"
+For more information about this error, try `rustc --explain E0616`.
diff --git a/src/test/ui/error-codes/E0617.stderr b/src/test/ui/error-codes/E0617.stderr
index 11b1bf32ee0..114220532c3 100644
--- a/src/test/ui/error-codes/E0617.stderr
+++ b/src/test/ui/error-codes/E0617.stderr
@@ -40,4 +40,4 @@ LL |         printf(::std::ptr::null(), printf as unsafe extern "C" fn(*const i8
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0617"
+For more information about this error, try `rustc --explain E0617`.
diff --git a/src/test/ui/error-codes/E0618.stderr b/src/test/ui/error-codes/E0618.stderr
index 41ef37dca54..ef7ace44d59 100644
--- a/src/test/ui/error-codes/E0618.stderr
+++ b/src/test/ui/error-codes/E0618.stderr
@@ -21,4 +21,4 @@ LL |     x();
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0618"
+For more information about this error, try `rustc --explain E0618`.
diff --git a/src/test/ui/error-codes/E0620.stderr b/src/test/ui/error-codes/E0620.stderr
index 310dddc26f0..f7450a33138 100644
--- a/src/test/ui/error-codes/E0620.stderr
+++ b/src/test/ui/error-codes/E0620.stderr
@@ -12,4 +12,4 @@ LL |     let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0620"
+For more information about this error, try `rustc --explain E0620`.
diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
index fa11d7c77c0..58f0ede6308 100644
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
+++ b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
@@ -27,4 +27,4 @@ LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0495"
+For more information about this error, try `rustc --explain E0495`.
diff --git a/src/test/ui/error-codes/E0622.stderr b/src/test/ui/error-codes/E0622.stderr
index da4d43f6041..ef13084dea0 100644
--- a/src/test/ui/error-codes/E0622.stderr
+++ b/src/test/ui/error-codes/E0622.stderr
@@ -6,4 +6,4 @@ LL |     pub static breakpoint : unsafe extern "rust-intrinsic" fn();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0622"
+For more information about this error, try `rustc --explain E0622`.
diff --git a/src/test/ui/error-codes/E0624.stderr b/src/test/ui/error-codes/E0624.stderr
index 39061f9ec77..ac911b9b7c0 100644
--- a/src/test/ui/error-codes/E0624.stderr
+++ b/src/test/ui/error-codes/E0624.stderr
@@ -6,4 +6,4 @@ LL |     foo.method(); //~ ERROR method `method` is private [E0624]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0624"
+For more information about this error, try `rustc --explain E0624`.
diff --git a/src/test/ui/error-codes/E0637.stderr b/src/test/ui/error-codes/E0637.stderr
index d44a60760a7..b8c926efb45 100644
--- a/src/test/ui/error-codes/E0637.stderr
+++ b/src/test/ui/error-codes/E0637.stderr
@@ -18,4 +18,4 @@ LL | impl<'a: '_> Bar<'a> { //~ ERROR invalid lifetime bound name: `'_`
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0637"
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/error-codes/E0657.stderr b/src/test/ui/error-codes/E0657.stderr
index 34952dc73c2..f0529142023 100644
--- a/src/test/ui/error-codes/E0657.stderr
+++ b/src/test/ui/error-codes/E0657.stderr
@@ -12,4 +12,4 @@ LL |         -> Box<for<'a> Id<impl Lt<'a>>>
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0657"
+For more information about this error, try `rustc --explain E0657`.
diff --git a/src/test/ui/error-codes/E0658.stderr b/src/test/ui/error-codes/E0658.stderr
index b3425b59f31..5be05600ee5 100644
--- a/src/test/ui/error-codes/E0658.stderr
+++ b/src/test/ui/error-codes/E0658.stderr
@@ -8,4 +8,4 @@ LL |     let _ = ::std::u128::MAX; //~ ERROR E0658
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/error-codes/E0659.stderr b/src/test/ui/error-codes/E0659.stderr
index 31a381a6edd..06176085b38 100644
--- a/src/test/ui/error-codes/E0659.stderr
+++ b/src/test/ui/error-codes/E0659.stderr
@@ -18,4 +18,4 @@ LL |     pub use earth::*;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0659"
+For more information about this error, try `rustc --explain E0659`.
diff --git a/src/test/ui/error-festival.stderr b/src/test/ui/error-festival.stderr
index 231864e9655..345691352b4 100644
--- a/src/test/ui/error-festival.stderr
+++ b/src/test/ui/error-festival.stderr
@@ -72,5 +72,5 @@ LL |     v as *const [u8];
 
 error: aborting due to 10 previous errors
 
-You've got a few errors: E0054, E0368, E0425, E0599, E0600, E0603, E0604, E0605, E0606...
-If you want more information on an error, try using "rustc --explain E0054"
+Some errors occurred: E0054, E0368, E0425, E0599, E0600, E0603, E0604, E0605, E0606...
+For more information about an error, try `rustc --explain E0054`.
diff --git a/src/test/ui/fat-ptr-cast.stderr b/src/test/ui/fat-ptr-cast.stderr
index 383b5eb4601..cf1dcfcb8ad 100644
--- a/src/test/ui/fat-ptr-cast.stderr
+++ b/src/test/ui/fat-ptr-cast.stderr
@@ -66,5 +66,5 @@ LL |     let mut fail: *const str = 0 as *const str; //~ ERROR casting
 
 error: aborting due to 9 previous errors
 
-You've got a few errors: E0605, E0606, E0607
-If you want more information on an error, try using "rustc --explain E0605"
+Some errors occurred: E0605, E0606, E0607.
+For more information about an error, try `rustc --explain E0605`.
diff --git a/src/test/ui/feature-gate-abi-msp430-interrupt.stderr b/src/test/ui/feature-gate-abi-msp430-interrupt.stderr
index ca55e95b914..26babb8c3ff 100644
--- a/src/test/ui/feature-gate-abi-msp430-interrupt.stderr
+++ b/src/test/ui/feature-gate-abi-msp430-interrupt.stderr
@@ -8,4 +8,4 @@ LL | extern "msp430-interrupt" fn foo() {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-abi.stderr b/src/test/ui/feature-gate-abi.stderr
index c2d70cf8ec2..0f9309bfb0c 100644
--- a/src/test/ui/feature-gate-abi.stderr
+++ b/src/test/ui/feature-gate-abi.stderr
@@ -448,4 +448,4 @@ LL | extern "thiscall" {} //~ ERROR thiscall is experimental and subject to chan
 
 error: aborting due to 56 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-abi_unadjusted.stderr b/src/test/ui/feature-gate-abi_unadjusted.stderr
index 2382b931244..467102d1847 100644
--- a/src/test/ui/feature-gate-abi_unadjusted.stderr
+++ b/src/test/ui/feature-gate-abi_unadjusted.stderr
@@ -10,4 +10,4 @@ LL | | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-advanced-slice-features.stderr b/src/test/ui/feature-gate-advanced-slice-features.stderr
index b589a01df17..9d9e7554976 100644
--- a/src/test/ui/feature-gate-advanced-slice-features.stderr
+++ b/src/test/ui/feature-gate-advanced-slice-features.stderr
@@ -16,4 +16,4 @@ LL |         [ 1, xs.., 5 ] => {}    //~ ERROR multiple-element slice matches
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-allocator_internals.stderr b/src/test/ui/feature-gate-allocator_internals.stderr
index 53aa45e8672..a9667e8011a 100644
--- a/src/test/ui/feature-gate-allocator_internals.stderr
+++ b/src/test/ui/feature-gate-allocator_internals.stderr
@@ -8,4 +8,4 @@ LL | #![default_lib_allocator] //~ ERROR: attribute is an experimental feature
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-allow-internal-unsafe-nested-macro.stderr b/src/test/ui/feature-gate-allow-internal-unsafe-nested-macro.stderr
index eab713ed79f..97e41411854 100644
--- a/src/test/ui/feature-gate-allow-internal-unsafe-nested-macro.stderr
+++ b/src/test/ui/feature-gate-allow-internal-unsafe-nested-macro.stderr
@@ -11,4 +11,4 @@ LL | bar!();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-allow-internal-unstable-nested-macro.stderr b/src/test/ui/feature-gate-allow-internal-unstable-nested-macro.stderr
index e2d48999be4..2ecaaae89d1 100644
--- a/src/test/ui/feature-gate-allow-internal-unstable-nested-macro.stderr
+++ b/src/test/ui/feature-gate-allow-internal-unstable-nested-macro.stderr
@@ -11,4 +11,4 @@ LL | bar!();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-allow-internal-unstable-struct.stderr b/src/test/ui/feature-gate-allow-internal-unstable-struct.stderr
index 115927c04cd..4ff5162b0c0 100644
--- a/src/test/ui/feature-gate-allow-internal-unstable-struct.stderr
+++ b/src/test/ui/feature-gate-allow-internal-unstable-struct.stderr
@@ -8,4 +8,4 @@ LL | #[allow_internal_unstable] //~ ERROR allow_internal_unstable side-steps
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-allow-internal-unstable.stderr b/src/test/ui/feature-gate-allow-internal-unstable.stderr
index e46fce67aa9..b691eed60d3 100644
--- a/src/test/ui/feature-gate-allow-internal-unstable.stderr
+++ b/src/test/ui/feature-gate-allow-internal-unstable.stderr
@@ -8,4 +8,4 @@ LL | #[allow_internal_unstable] //~ ERROR allow_internal_unstable side-steps
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-allow_fail.stderr b/src/test/ui/feature-gate-allow_fail.stderr
index d73791fa780..3f8ad32437d 100644
--- a/src/test/ui/feature-gate-allow_fail.stderr
+++ b/src/test/ui/feature-gate-allow_fail.stderr
@@ -8,4 +8,4 @@ LL | #[allow_fail] //~ ERROR allow_fail attribute is currently unstable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-arbitrary-self-types.stderr b/src/test/ui/feature-gate-arbitrary-self-types.stderr
index b59c047e064..ea259aa22ad 100644
--- a/src/test/ui/feature-gate-arbitrary-self-types.stderr
+++ b/src/test/ui/feature-gate-arbitrary-self-types.stderr
@@ -27,4 +27,4 @@ LL |     fn bar(self: Box<Rc<Self>>) {} //~ ERROR arbitrary `self` types are uns
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-arbitrary_self_types-raw-pointer.stderr b/src/test/ui/feature-gate-arbitrary_self_types-raw-pointer.stderr
index 4748ebdad21..5ed9a0f4ed0 100644
--- a/src/test/ui/feature-gate-arbitrary_self_types-raw-pointer.stderr
+++ b/src/test/ui/feature-gate-arbitrary_self_types-raw-pointer.stderr
@@ -27,4 +27,4 @@ LL |     fn bar(self: *const Self) {}
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-asm.stderr b/src/test/ui/feature-gate-asm.stderr
index 68fe0a71d5a..3fab7c0ece5 100644
--- a/src/test/ui/feature-gate-asm.stderr
+++ b/src/test/ui/feature-gate-asm.stderr
@@ -8,4 +8,4 @@ LL |         asm!(""); //~ ERROR inline assembly is not stable enough
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-asm2.stderr b/src/test/ui/feature-gate-asm2.stderr
index 4d83ac6100e..a0e881a3b99 100644
--- a/src/test/ui/feature-gate-asm2.stderr
+++ b/src/test/ui/feature-gate-asm2.stderr
@@ -8,4 +8,4 @@ LL |         println!("{}", asm!("")); //~ ERROR inline assembly is not stable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-assoc-type-defaults.stderr b/src/test/ui/feature-gate-assoc-type-defaults.stderr
index 62a956d4aad..86431842a83 100644
--- a/src/test/ui/feature-gate-assoc-type-defaults.stderr
+++ b/src/test/ui/feature-gate-assoc-type-defaults.stderr
@@ -8,4 +8,4 @@ LL |     type Bar = u8; //~ ERROR associated type defaults are unstable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-box-expr.stderr b/src/test/ui/feature-gate-box-expr.stderr
index db025be0ab2..72f2f08b5b8 100644
--- a/src/test/ui/feature-gate-box-expr.stderr
+++ b/src/test/ui/feature-gate-box-expr.stderr
@@ -8,4 +8,4 @@ LL |     let x = box 'c'; //~ ERROR box expression syntax is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-box_patterns.stderr b/src/test/ui/feature-gate-box_patterns.stderr
index 4e521f2519c..a8edb842cfc 100644
--- a/src/test/ui/feature-gate-box_patterns.stderr
+++ b/src/test/ui/feature-gate-box_patterns.stderr
@@ -8,4 +8,4 @@ LL |     let box x = Box::new('c'); //~ ERROR box pattern syntax is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-box_syntax.stderr b/src/test/ui/feature-gate-box_syntax.stderr
index 8835b2cb14c..7058512417b 100644
--- a/src/test/ui/feature-gate-box_syntax.stderr
+++ b/src/test/ui/feature-gate-box_syntax.stderr
@@ -8,4 +8,4 @@ LL |     let x = box 3;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-catch_expr.stderr b/src/test/ui/feature-gate-catch_expr.stderr
index 6d8b7f104d9..4ab71460c0d 100644
--- a/src/test/ui/feature-gate-catch_expr.stderr
+++ b/src/test/ui/feature-gate-catch_expr.stderr
@@ -12,4 +12,4 @@ LL | |     };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-cfg-target-feature.stderr b/src/test/ui/feature-gate-cfg-target-feature.stderr
index e990c38de19..bf9e596e71a 100644
--- a/src/test/ui/feature-gate-cfg-target-feature.stderr
+++ b/src/test/ui/feature-gate-cfg-target-feature.stderr
@@ -32,4 +32,4 @@ LL |     cfg!(target_feature = "x");
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-cfg-target-has-atomic.stderr b/src/test/ui/feature-gate-cfg-target-has-atomic.stderr
index 505f6b39724..f3975b7ce8b 100644
--- a/src/test/ui/feature-gate-cfg-target-has-atomic.stderr
+++ b/src/test/ui/feature-gate-cfg-target-has-atomic.stderr
@@ -120,4 +120,4 @@ LL |     cfg!(target_has_atomic = "ptr");
 
 error: aborting due to 15 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-cfg-target-thread-local.stderr b/src/test/ui/feature-gate-cfg-target-thread-local.stderr
index a6af55b1b26..3467d4e482d 100644
--- a/src/test/ui/feature-gate-cfg-target-thread-local.stderr
+++ b/src/test/ui/feature-gate-cfg-target-thread-local.stderr
@@ -8,4 +8,4 @@ LL |     #[cfg_attr(target_thread_local, thread_local)]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-cfg-target-vendor.stderr b/src/test/ui/feature-gate-cfg-target-vendor.stderr
index f19a2b7997a..a625c7e4b24 100644
--- a/src/test/ui/feature-gate-cfg-target-vendor.stderr
+++ b/src/test/ui/feature-gate-cfg-target-vendor.stderr
@@ -32,4 +32,4 @@ LL |     cfg!(target_vendor = "x");
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-clone-closures.stderr b/src/test/ui/feature-gate-clone-closures.stderr
index 2b594f7faf3..7038a76380d 100644
--- a/src/test/ui/feature-gate-clone-closures.stderr
+++ b/src/test/ui/feature-gate-clone-closures.stderr
@@ -8,4 +8,4 @@ LL |     let hello = hello.clone(); //~ ERROR no method named `clone` found for
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/feature-gate-compiler-builtins.stderr b/src/test/ui/feature-gate-compiler-builtins.stderr
index 3f8ef665d7a..5330d83c284 100644
--- a/src/test/ui/feature-gate-compiler-builtins.stderr
+++ b/src/test/ui/feature-gate-compiler-builtins.stderr
@@ -8,4 +8,4 @@ LL | #![compiler_builtins] //~ ERROR the `#[compiler_builtins]` attribute is
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-concat_idents.stderr b/src/test/ui/feature-gate-concat_idents.stderr
index 05e2e33e191..2f1e3fe6a7d 100644
--- a/src/test/ui/feature-gate-concat_idents.stderr
+++ b/src/test/ui/feature-gate-concat_idents.stderr
@@ -16,4 +16,4 @@ LL |     let b = concat_idents!(X, Y_2); //~ ERROR `concat_idents` is not stable
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-concat_idents2.stderr b/src/test/ui/feature-gate-concat_idents2.stderr
index 548e7dbdcca..9312a6f5b36 100644
--- a/src/test/ui/feature-gate-concat_idents2.stderr
+++ b/src/test/ui/feature-gate-concat_idents2.stderr
@@ -8,4 +8,4 @@ LL |     concat_idents!(a, b); //~ ERROR `concat_idents` is not stable enough
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-concat_idents3.stderr b/src/test/ui/feature-gate-concat_idents3.stderr
index 2f5411fa7a5..1a86032d8a3 100644
--- a/src/test/ui/feature-gate-concat_idents3.stderr
+++ b/src/test/ui/feature-gate-concat_idents3.stderr
@@ -16,4 +16,4 @@ LL |     assert_eq!(20, concat_idents!(X, Y_2)); //~ ERROR `concat_idents` is no
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-conservative_impl_trait.stderr b/src/test/ui/feature-gate-conservative_impl_trait.stderr
index 68cd1344680..5400226450b 100644
--- a/src/test/ui/feature-gate-conservative_impl_trait.stderr
+++ b/src/test/ui/feature-gate-conservative_impl_trait.stderr
@@ -8,4 +8,4 @@ LL | fn foo() -> impl Fn() { || {} }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-const_fn.stderr b/src/test/ui/feature-gate-const_fn.stderr
index 09d377c0ace..d7c00a3e0cb 100644
--- a/src/test/ui/feature-gate-const_fn.stderr
+++ b/src/test/ui/feature-gate-const_fn.stderr
@@ -58,5 +58,5 @@ LL |     const fn foo() -> u32 { 0 } //~ ERROR const fn is unstable
 
 error: aborting due to 8 previous errors
 
-You've got a few errors: E0379, E0658
-If you want more information on an error, try using "rustc --explain E0379"
+Some errors occurred: E0379, E0658.
+For more information about an error, try `rustc --explain E0379`.
diff --git a/src/test/ui/feature-gate-copy-closures.stderr b/src/test/ui/feature-gate-copy-closures.stderr
index b06ada02238..e72680b69ea 100644
--- a/src/test/ui/feature-gate-copy-closures.stderr
+++ b/src/test/ui/feature-gate-copy-closures.stderr
@@ -10,4 +10,4 @@ LL |     let c = hello; //~ ERROR use of moved value: `hello` [E0382]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0382"
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/feature-gate-crate_in_paths.stderr b/src/test/ui/feature-gate-crate_in_paths.stderr
index 21ae346e9c8..1d0eed53198 100644
--- a/src/test/ui/feature-gate-crate_in_paths.stderr
+++ b/src/test/ui/feature-gate-crate_in_paths.stderr
@@ -8,4 +8,4 @@ LL |     let _ = ::crate::S; //~ ERROR `crate` in paths is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-crate_visibility_modifier.stderr b/src/test/ui/feature-gate-crate_visibility_modifier.stderr
index e5e7c8c7420..d0ee40504fb 100644
--- a/src/test/ui/feature-gate-crate_visibility_modifier.stderr
+++ b/src/test/ui/feature-gate-crate_visibility_modifier.stderr
@@ -8,4 +8,4 @@ LL | crate struct Bender { //~ ERROR `crate` visibility modifier is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-custom_attribute.stderr b/src/test/ui/feature-gate-custom_attribute.stderr
index dd428e89ea2..36f5898f1c7 100644
--- a/src/test/ui/feature-gate-custom_attribute.stderr
+++ b/src/test/ui/feature-gate-custom_attribute.stderr
@@ -104,4 +104,4 @@ LL | #[fake_doc(r"doc")] //~ ERROR attribute `fake_doc` is currently unknown
 
 error: aborting due to 13 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-custom_attribute2.stderr b/src/test/ui/feature-gate-custom_attribute2.stderr
index 29cde7042f6..90be45a33ea 100644
--- a/src/test/ui/feature-gate-custom_attribute2.stderr
+++ b/src/test/ui/feature-gate-custom_attribute2.stderr
@@ -136,4 +136,4 @@ LL |     where Q: for <#[lt_hof] 'i> Fn(&'i [u32]) -> &'i u32
 
 error: aborting due to 17 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-custom_derive.stderr b/src/test/ui/feature-gate-custom_derive.stderr
index 18c8a081b23..e633a5a9c99 100644
--- a/src/test/ui/feature-gate-custom_derive.stderr
+++ b/src/test/ui/feature-gate-custom_derive.stderr
@@ -8,4 +8,4 @@ LL | #[derive_Clone]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-decl_macro.stderr b/src/test/ui/feature-gate-decl_macro.stderr
index 6438e81610e..56c0dea0236 100644
--- a/src/test/ui/feature-gate-decl_macro.stderr
+++ b/src/test/ui/feature-gate-decl_macro.stderr
@@ -8,4 +8,4 @@ LL | macro m() {} //~ ERROR `macro` is experimental (see issue #39412)
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-doc_cfg.stderr b/src/test/ui/feature-gate-doc_cfg.stderr
index 0eaaab03eb5..5839e1dd611 100644
--- a/src/test/ui/feature-gate-doc_cfg.stderr
+++ b/src/test/ui/feature-gate-doc_cfg.stderr
@@ -8,4 +8,4 @@ LL | #[doc(cfg(unix))] //~ ERROR: #[doc(cfg(...))] is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-doc_masked.stderr b/src/test/ui/feature-gate-doc_masked.stderr
index f8885587115..043397efde2 100644
--- a/src/test/ui/feature-gate-doc_masked.stderr
+++ b/src/test/ui/feature-gate-doc_masked.stderr
@@ -8,4 +8,4 @@ LL | #[doc(masked)] //~ ERROR: #[doc(masked)] is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-doc_spotlight.stderr b/src/test/ui/feature-gate-doc_spotlight.stderr
index ed69f7edf0b..98e7f38a441 100644
--- a/src/test/ui/feature-gate-doc_spotlight.stderr
+++ b/src/test/ui/feature-gate-doc_spotlight.stderr
@@ -8,4 +8,4 @@ LL | #[doc(spotlight)] //~ ERROR: #[doc(spotlight)] is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-dotdoteq_in_patterns.stderr b/src/test/ui/feature-gate-dotdoteq_in_patterns.stderr
index ef88d3307d2..67f15be9d08 100644
--- a/src/test/ui/feature-gate-dotdoteq_in_patterns.stderr
+++ b/src/test/ui/feature-gate-dotdoteq_in_patterns.stderr
@@ -8,4 +8,4 @@ LL |         0 ..= 3 => {} //~ ERROR `..=` syntax in patterns is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-dropck-ugeh.stderr b/src/test/ui/feature-gate-dropck-ugeh.stderr
index c200de76615..33bb5f2d989 100644
--- a/src/test/ui/feature-gate-dropck-ugeh.stderr
+++ b/src/test/ui/feature-gate-dropck-ugeh.stderr
@@ -8,4 +8,4 @@ LL |     #[unsafe_destructor_blind_to_params] // This is the UGEH attribute
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-dyn-trait.stderr b/src/test/ui/feature-gate-dyn-trait.stderr
index d8db0bd5536..6e6bdf1cbf0 100644
--- a/src/test/ui/feature-gate-dyn-trait.stderr
+++ b/src/test/ui/feature-gate-dyn-trait.stderr
@@ -8,4 +8,4 @@ LL | type A = Box<dyn Trait>; //~ ERROR `dyn Trait` syntax is unstable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-exclusive-range-pattern.stderr b/src/test/ui/feature-gate-exclusive-range-pattern.stderr
index 5a5ecb698a4..27fd49edcc6 100644
--- a/src/test/ui/feature-gate-exclusive-range-pattern.stderr
+++ b/src/test/ui/feature-gate-exclusive-range-pattern.stderr
@@ -8,4 +8,4 @@ LL |         0 .. 3 => {} //~ ERROR exclusive range pattern syntax is experiment
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-extern_absolute_paths.stderr b/src/test/ui/feature-gate-extern_absolute_paths.stderr
index 730cfb9747b..7a996abc767 100644
--- a/src/test/ui/feature-gate-extern_absolute_paths.stderr
+++ b/src/test/ui/feature-gate-extern_absolute_paths.stderr
@@ -12,5 +12,5 @@ LL |     let _: u8 = ::core::default::Default(); //~ ERROR failed to resolve
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0432, E0433
-If you want more information on an error, try using "rustc --explain E0432"
+Some errors occurred: E0432, E0433.
+For more information about an error, try `rustc --explain E0432`.
diff --git a/src/test/ui/feature-gate-extern_in_paths.stderr b/src/test/ui/feature-gate-extern_in_paths.stderr
index 11387e81de2..535ed94565c 100644
--- a/src/test/ui/feature-gate-extern_in_paths.stderr
+++ b/src/test/ui/feature-gate-extern_in_paths.stderr
@@ -8,4 +8,4 @@ LL |     let _ = extern::std::vec::Vec::new(); //~ ERROR `extern` in paths is ex
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-extern_types.stderr b/src/test/ui/feature-gate-extern_types.stderr
index 6dabd6ab4a4..47c74bda177 100644
--- a/src/test/ui/feature-gate-extern_types.stderr
+++ b/src/test/ui/feature-gate-extern_types.stderr
@@ -8,4 +8,4 @@ LL |     type T; //~ ERROR extern types are experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-external_doc.stderr b/src/test/ui/feature-gate-external_doc.stderr
index 0582548b5ba..272380f2336 100644
--- a/src/test/ui/feature-gate-external_doc.stderr
+++ b/src/test/ui/feature-gate-external_doc.stderr
@@ -8,4 +8,4 @@ LL | #[doc(include="asdf.md")] //~ ERROR: #[doc(include = "...")] is experimenta
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-fundamental.stderr b/src/test/ui/feature-gate-fundamental.stderr
index 2e91f1abbbd..ac8430d7c1c 100644
--- a/src/test/ui/feature-gate-fundamental.stderr
+++ b/src/test/ui/feature-gate-fundamental.stderr
@@ -8,4 +8,4 @@ LL | #[fundamental] //~ ERROR the `#[fundamental]` attribute is an experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-generators.stderr b/src/test/ui/feature-gate-generators.stderr
index ec7aad53b76..91749894eb6 100644
--- a/src/test/ui/feature-gate-generators.stderr
+++ b/src/test/ui/feature-gate-generators.stderr
@@ -8,4 +8,4 @@ LL |     yield true; //~ ERROR yield syntax is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-generic_associated_types.stderr b/src/test/ui/feature-gate-generic_associated_types.stderr
index f545da0be96..5f23def88eb 100644
--- a/src/test/ui/feature-gate-generic_associated_types.stderr
+++ b/src/test/ui/feature-gate-generic_associated_types.stderr
@@ -32,4 +32,4 @@ LL |     type Pointer2<u32> = Box<u32>;
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-generic_param_attrs.stderr b/src/test/ui/feature-gate-generic_param_attrs.stderr
index 2d05d96549c..7b449242c32 100644
--- a/src/test/ui/feature-gate-generic_param_attrs.stderr
+++ b/src/test/ui/feature-gate-generic_param_attrs.stderr
@@ -136,4 +136,4 @@ LL |     where Q: for <#[rustc_lt_hof] 'i> Fn(&'i [u32]) -> &'i u32
 
 error: aborting due to 17 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-global_allocator.stderr b/src/test/ui/feature-gate-global_allocator.stderr
index 400af3a33bd..5a3fd67d27b 100644
--- a/src/test/ui/feature-gate-global_allocator.stderr
+++ b/src/test/ui/feature-gate-global_allocator.stderr
@@ -8,4 +8,4 @@ LL | #[global_allocator] //~ ERROR: attribute is an experimental feature
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-global_asm.stderr b/src/test/ui/feature-gate-global_asm.stderr
index b506a8e60d7..2219d49a263 100644
--- a/src/test/ui/feature-gate-global_asm.stderr
+++ b/src/test/ui/feature-gate-global_asm.stderr
@@ -8,4 +8,4 @@ LL | global_asm!(""); //~ ERROR `global_asm!` is not stable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-i128_type.stderr b/src/test/ui/feature-gate-i128_type.stderr
index 31802ff350a..eb3b29f4f55 100644
--- a/src/test/ui/feature-gate-i128_type.stderr
+++ b/src/test/ui/feature-gate-i128_type.stderr
@@ -16,4 +16,4 @@ LL |     0u128; //~ ERROR 128-bit integers are not stable
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-i128_type2.stderr b/src/test/ui/feature-gate-i128_type2.stderr
index e3a7cf06cdf..2348e7fe2c5 100644
--- a/src/test/ui/feature-gate-i128_type2.stderr
+++ b/src/test/ui/feature-gate-i128_type2.stderr
@@ -44,5 +44,5 @@ LL | | }
 
 error: aborting due to 6 previous errors
 
-You've got a few errors: E0601, E0658
-If you want more information on an error, try using "rustc --explain E0601"
+Some errors occurred: E0601, E0658.
+For more information about an error, try `rustc --explain E0601`.
diff --git a/src/test/ui/feature-gate-if_while_or_patterns.stderr b/src/test/ui/feature-gate-if_while_or_patterns.stderr
index 6096804190e..909046812d3 100644
--- a/src/test/ui/feature-gate-if_while_or_patterns.stderr
+++ b/src/test/ui/feature-gate-if_while_or_patterns.stderr
@@ -20,4 +20,4 @@ LL | |     }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-in_band_lifetimes.stderr b/src/test/ui/feature-gate-in_band_lifetimes.stderr
index 2b72d13ae5e..cc0855306e1 100644
--- a/src/test/ui/feature-gate-in_band_lifetimes.stderr
+++ b/src/test/ui/feature-gate-in_band_lifetimes.stderr
@@ -102,4 +102,4 @@ LL |     fn borrowed_lifetime(&'b self) -> &'b u8 { &*self.0 }
 
 error: aborting due to 17 previous errors
 
-If you want more information on this error, try using "rustc --explain E0261"
+For more information about this error, try `rustc --explain E0261`.
diff --git a/src/test/ui/feature-gate-intrinsics.stderr b/src/test/ui/feature-gate-intrinsics.stderr
index bd8774a0941..e583569cb99 100644
--- a/src/test/ui/feature-gate-intrinsics.stderr
+++ b/src/test/ui/feature-gate-intrinsics.stderr
@@ -19,4 +19,4 @@ LL | | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-lang-items.stderr b/src/test/ui/feature-gate-lang-items.stderr
index 3c7000447d9..ef3e7947280 100644
--- a/src/test/ui/feature-gate-lang-items.stderr
+++ b/src/test/ui/feature-gate-lang-items.stderr
@@ -8,4 +8,4 @@ LL | #[lang="foo"]   //~ ERROR language items are subject to change
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-link_args.stderr b/src/test/ui/feature-gate-link_args.stderr
index dbf5086d02a..86a2818b344 100644
--- a/src/test/ui/feature-gate-link_args.stderr
+++ b/src/test/ui/feature-gate-link_args.stderr
@@ -24,4 +24,4 @@ LL | #![link_args = "-l unexpected_use_as_inner_attr_on_mod"]
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-link_cfg.stderr b/src/test/ui/feature-gate-link_cfg.stderr
index 91c3a7a21a2..1da8c3e922d 100644
--- a/src/test/ui/feature-gate-link_cfg.stderr
+++ b/src/test/ui/feature-gate-link_cfg.stderr
@@ -8,4 +8,4 @@ LL | #[link(name = "foo", cfg(foo))]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-link_llvm_intrinsics.stderr b/src/test/ui/feature-gate-link_llvm_intrinsics.stderr
index 4072ce3cefb..7a9c5955958 100644
--- a/src/test/ui/feature-gate-link_llvm_intrinsics.stderr
+++ b/src/test/ui/feature-gate-link_llvm_intrinsics.stderr
@@ -8,4 +8,4 @@ LL |     fn sqrt(x: f32) -> f32;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-linkage.stderr b/src/test/ui/feature-gate-linkage.stderr
index a598ca97aee..2fc1a3e1ae5 100644
--- a/src/test/ui/feature-gate-linkage.stderr
+++ b/src/test/ui/feature-gate-linkage.stderr
@@ -8,4 +8,4 @@ LL |     #[linkage = "extern_weak"] static foo: isize;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-linker-flavor.stderr b/src/test/ui/feature-gate-linker-flavor.stderr
index d2f124397cc..b8bccece292 100644
--- a/src/test/ui/feature-gate-linker-flavor.stderr
+++ b/src/test/ui/feature-gate-linker-flavor.stderr
@@ -8,4 +8,4 @@ LL | #[used]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-log_syntax.stderr b/src/test/ui/feature-gate-log_syntax.stderr
index 070fe99512e..d9934be778e 100644
--- a/src/test/ui/feature-gate-log_syntax.stderr
+++ b/src/test/ui/feature-gate-log_syntax.stderr
@@ -8,4 +8,4 @@ LL |     log_syntax!() //~ ERROR `log_syntax!` is not stable enough
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-log_syntax2.stderr b/src/test/ui/feature-gate-log_syntax2.stderr
index 8aedddcc886..19e7de1a824 100644
--- a/src/test/ui/feature-gate-log_syntax2.stderr
+++ b/src/test/ui/feature-gate-log_syntax2.stderr
@@ -8,4 +8,4 @@ LL |     println!("{}", log_syntax!()); //~ ERROR `log_syntax!` is not stable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-macro-lifetime-matcher.stderr b/src/test/ui/feature-gate-macro-lifetime-matcher.stderr
index 0e0977b2d1a..b7805f6f5fb 100644
--- a/src/test/ui/feature-gate-macro-lifetime-matcher.stderr
+++ b/src/test/ui/feature-gate-macro-lifetime-matcher.stderr
@@ -8,4 +8,4 @@ LL | macro_rules! m { ($lt:lifetime) => {} }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-macro-vis-matcher.stderr b/src/test/ui/feature-gate-macro-vis-matcher.stderr
index 70a1374b020..9d98091674e 100644
--- a/src/test/ui/feature-gate-macro-vis-matcher.stderr
+++ b/src/test/ui/feature-gate-macro-vis-matcher.stderr
@@ -8,4 +8,4 @@ LL | macro_rules! m { ($v:vis) => {} }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-macro_at_most_once_rep.stderr b/src/test/ui/feature-gate-macro_at_most_once_rep.stderr
index 6089b25ac44..8eba07e6c08 100644
--- a/src/test/ui/feature-gate-macro_at_most_once_rep.stderr
+++ b/src/test/ui/feature-gate-macro_at_most_once_rep.stderr
@@ -8,4 +8,4 @@ LL | macro_rules! m { ($(a)?) => {} }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-main.stderr b/src/test/ui/feature-gate-main.stderr
index f6513f203d0..34c9fd15f7c 100644
--- a/src/test/ui/feature-gate-main.stderr
+++ b/src/test/ui/feature-gate-main.stderr
@@ -8,4 +8,4 @@ LL | fn foo() {} //~ ERROR: declaration of a nonstandard #[main] function may ch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-match_default_bindings.stderr b/src/test/ui/feature-gate-match_default_bindings.stderr
index 51f0b8cd98f..8fa553561de 100644
--- a/src/test/ui/feature-gate-match_default_bindings.stderr
+++ b/src/test/ui/feature-gate-match_default_bindings.stderr
@@ -8,4 +8,4 @@ LL |         Some(n) => {},
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-may-dangle.stderr b/src/test/ui/feature-gate-may-dangle.stderr
index 555f4f45614..85707f6e921 100644
--- a/src/test/ui/feature-gate-may-dangle.stderr
+++ b/src/test/ui/feature-gate-may-dangle.stderr
@@ -8,4 +8,4 @@ LL | impl<#[may_dangle] A> Drop for Pt<A> {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-naked_functions.stderr b/src/test/ui/feature-gate-naked_functions.stderr
index d4ba8ff4d73..a2d3dfc83ae 100644
--- a/src/test/ui/feature-gate-naked_functions.stderr
+++ b/src/test/ui/feature-gate-naked_functions.stderr
@@ -16,4 +16,4 @@ LL | #[naked]
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-needs-allocator.stderr b/src/test/ui/feature-gate-needs-allocator.stderr
index a526873f42d..13665b2a0eb 100644
--- a/src/test/ui/feature-gate-needs-allocator.stderr
+++ b/src/test/ui/feature-gate-needs-allocator.stderr
@@ -8,4 +8,4 @@ LL | #![needs_allocator] //~ ERROR the `#[needs_allocator]` attribute is
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-negate-unsigned.stderr b/src/test/ui/feature-gate-negate-unsigned.stderr
index 3c3056f9748..1025b56f55b 100644
--- a/src/test/ui/feature-gate-negate-unsigned.stderr
+++ b/src/test/ui/feature-gate-negate-unsigned.stderr
@@ -12,4 +12,4 @@ LL |     let _y = -x;
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0600"
+For more information about this error, try `rustc --explain E0600`.
diff --git a/src/test/ui/feature-gate-never_type.stderr b/src/test/ui/feature-gate-never_type.stderr
index e0a194ca6e9..187be6d8291 100644
--- a/src/test/ui/feature-gate-never_type.stderr
+++ b/src/test/ui/feature-gate-never_type.stderr
@@ -40,4 +40,4 @@ LL |     type Wub = !; //~ ERROR type is experimental
 
 error: aborting due to 5 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-nll.stderr b/src/test/ui/feature-gate-nll.stderr
index 8194680cef7..f7b431d19be 100644
--- a/src/test/ui/feature-gate-nll.stderr
+++ b/src/test/ui/feature-gate-nll.stderr
@@ -8,4 +8,4 @@ LL |     x = 22; //~ ERROR cannot assign to `x` because it is borrowed [E0506]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0506"
+For more information about this error, try `rustc --explain E0506`.
diff --git a/src/test/ui/feature-gate-no-debug.stderr b/src/test/ui/feature-gate-no-debug.stderr
index 943d3530d15..55fad0d99cf 100644
--- a/src/test/ui/feature-gate-no-debug.stderr
+++ b/src/test/ui/feature-gate-no-debug.stderr
@@ -8,4 +8,4 @@ LL | #[no_debug] //~ ERROR the `#[no_debug]` attribute was
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-no_core.stderr b/src/test/ui/feature-gate-no_core.stderr
index caadb98a710..c8813dcd991 100644
--- a/src/test/ui/feature-gate-no_core.stderr
+++ b/src/test/ui/feature-gate-no_core.stderr
@@ -8,4 +8,4 @@ LL | #![no_core] //~ ERROR no_core is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-non_ascii_idents.stderr b/src/test/ui/feature-gate-non_ascii_idents.stderr
index 38a2623267f..69d7e38d431 100644
--- a/src/test/ui/feature-gate-non_ascii_idents.stderr
+++ b/src/test/ui/feature-gate-non_ascii_idents.stderr
@@ -110,4 +110,4 @@ LL |     fn qüx();  //~ ERROR non-ascii idents
 
 error: aborting due to 13 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-non_exhaustive.stderr b/src/test/ui/feature-gate-non_exhaustive.stderr
index 468ef6e273c..67f103d852a 100644
--- a/src/test/ui/feature-gate-non_exhaustive.stderr
+++ b/src/test/ui/feature-gate-non_exhaustive.stderr
@@ -8,4 +8,4 @@ LL | #[non_exhaustive] //~ERROR non exhaustive is an experimental feature (see i
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-omit-gdb-pretty-printer-section.stderr b/src/test/ui/feature-gate-omit-gdb-pretty-printer-section.stderr
index ad8b12ea254..253811400ef 100644
--- a/src/test/ui/feature-gate-omit-gdb-pretty-printer-section.stderr
+++ b/src/test/ui/feature-gate-omit-gdb-pretty-printer-section.stderr
@@ -8,4 +8,4 @@ LL | #[omit_gdb_pretty_printer_section] //~ ERROR the `#[omit_gdb_pretty_printer
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-on-unimplemented.stderr b/src/test/ui/feature-gate-on-unimplemented.stderr
index 7cc956fa1f0..a059f5e3c4d 100644
--- a/src/test/ui/feature-gate-on-unimplemented.stderr
+++ b/src/test/ui/feature-gate-on-unimplemented.stderr
@@ -8,4 +8,4 @@ LL | #[rustc_on_unimplemented = "test error `{Self}` with `{Bar}`"]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-optin-builtin-traits.stderr b/src/test/ui/feature-gate-optin-builtin-traits.stderr
index ec7856338fb..8bd07ffd122 100644
--- a/src/test/ui/feature-gate-optin-builtin-traits.stderr
+++ b/src/test/ui/feature-gate-optin-builtin-traits.stderr
@@ -16,4 +16,4 @@ LL | impl !DummyTrait for DummyStruct {}
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-overlapping_marker_traits.stderr b/src/test/ui/feature-gate-overlapping_marker_traits.stderr
index 2b30691c40d..040ad019b9f 100644
--- a/src/test/ui/feature-gate-overlapping_marker_traits.stderr
+++ b/src/test/ui/feature-gate-overlapping_marker_traits.stderr
@@ -8,4 +8,4 @@ LL | impl<T: Debug> MyMarker for T {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0119"
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/feature-gate-pattern_parentheses.stderr b/src/test/ui/feature-gate-pattern_parentheses.stderr
index 4fc1441a0fa..fce024d20f4 100644
--- a/src/test/ui/feature-gate-pattern_parentheses.stderr
+++ b/src/test/ui/feature-gate-pattern_parentheses.stderr
@@ -8,4 +8,4 @@ LL |         (pat) => {} //~ ERROR parentheses in patterns are unstable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-placement-expr.stderr b/src/test/ui/feature-gate-placement-expr.stderr
index 96b38812cb0..b5c091763a1 100644
--- a/src/test/ui/feature-gate-placement-expr.stderr
+++ b/src/test/ui/feature-gate-placement-expr.stderr
@@ -8,4 +8,4 @@ LL |     let x = HEAP <- 'c'; //~ ERROR placement-in expression syntax is experi
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-plugin.stderr b/src/test/ui/feature-gate-plugin.stderr
index f9a98b13044..366e293c182 100644
--- a/src/test/ui/feature-gate-plugin.stderr
+++ b/src/test/ui/feature-gate-plugin.stderr
@@ -8,4 +8,4 @@ LL | #![plugin(foo)]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-plugin_registrar.stderr b/src/test/ui/feature-gate-plugin_registrar.stderr
index 731cca8f6a9..3e6ffb6ef1a 100644
--- a/src/test/ui/feature-gate-plugin_registrar.stderr
+++ b/src/test/ui/feature-gate-plugin_registrar.stderr
@@ -8,4 +8,4 @@ LL | pub fn registrar() {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-prelude_import.stderr b/src/test/ui/feature-gate-prelude_import.stderr
index 6b791ee2380..6841df54067 100644
--- a/src/test/ui/feature-gate-prelude_import.stderr
+++ b/src/test/ui/feature-gate-prelude_import.stderr
@@ -8,4 +8,4 @@ LL | #[prelude_import] //~ ERROR `#[prelude_import]` is for use by rustc only
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-profiler-runtime.stderr b/src/test/ui/feature-gate-profiler-runtime.stderr
index ea321591143..dd395742b4f 100644
--- a/src/test/ui/feature-gate-profiler-runtime.stderr
+++ b/src/test/ui/feature-gate-profiler-runtime.stderr
@@ -8,4 +8,4 @@ LL | #![profiler_runtime] //~ ERROR the `#[profiler_runtime]` attribute is
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-repr-simd.stderr b/src/test/ui/feature-gate-repr-simd.stderr
index 280dc4518dd..8174f82060a 100644
--- a/src/test/ui/feature-gate-repr-simd.stderr
+++ b/src/test/ui/feature-gate-repr-simd.stderr
@@ -8,4 +8,4 @@ LL | #[repr(simd)] //~ error: SIMD types are experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-repr128.stderr b/src/test/ui/feature-gate-repr128.stderr
index fef28398df6..29cba831f54 100644
--- a/src/test/ui/feature-gate-repr128.stderr
+++ b/src/test/ui/feature-gate-repr128.stderr
@@ -10,4 +10,4 @@ LL | | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-repr_transparent.stderr b/src/test/ui/feature-gate-repr_transparent.stderr
index 161ab0af341..a4ffaa26690 100644
--- a/src/test/ui/feature-gate-repr_transparent.stderr
+++ b/src/test/ui/feature-gate-repr_transparent.stderr
@@ -8,4 +8,4 @@ LL | #[repr(transparent)] //~ error: the `#[repr(transparent)]` attribute is exp
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-rustc-attrs.stderr b/src/test/ui/feature-gate-rustc-attrs.stderr
index 6743f328f39..fda95a5b97a 100644
--- a/src/test/ui/feature-gate-rustc-attrs.stderr
+++ b/src/test/ui/feature-gate-rustc-attrs.stderr
@@ -24,4 +24,4 @@ LL | #[rustc_foo]
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-rustc_const_unstable.stderr b/src/test/ui/feature-gate-rustc_const_unstable.stderr
index 25cc2e41016..fa3f9807a04 100644
--- a/src/test/ui/feature-gate-rustc_const_unstable.stderr
+++ b/src/test/ui/feature-gate-rustc_const_unstable.stderr
@@ -8,4 +8,4 @@ LL | #[rustc_const_unstable(feature="fzzzzzt")] //~ERROR internal feature
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-sanitizer-runtime.stderr b/src/test/ui/feature-gate-sanitizer-runtime.stderr
index 6640f59255a..fc93e103005 100644
--- a/src/test/ui/feature-gate-sanitizer-runtime.stderr
+++ b/src/test/ui/feature-gate-sanitizer-runtime.stderr
@@ -8,4 +8,4 @@ LL | #![sanitizer_runtime] //~ ERROR the `#[sanitizer_runtime]` attribute is
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-simd.stderr b/src/test/ui/feature-gate-simd.stderr
index b4ed7ee43c7..414a5d9eb5d 100644
--- a/src/test/ui/feature-gate-simd.stderr
+++ b/src/test/ui/feature-gate-simd.stderr
@@ -8,4 +8,4 @@ LL | #[repr(simd)] //~ ERROR SIMD types are experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-slice-patterns.stderr b/src/test/ui/feature-gate-slice-patterns.stderr
index 0f61313e092..7c216fad933 100644
--- a/src/test/ui/feature-gate-slice-patterns.stderr
+++ b/src/test/ui/feature-gate-slice-patterns.stderr
@@ -8,4 +8,4 @@ LL |         [1, 2, xs..] => {} //~ ERROR slice pattern syntax is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-start.stderr b/src/test/ui/feature-gate-start.stderr
index 533cc31fb0a..cf590d2a0e3 100644
--- a/src/test/ui/feature-gate-start.stderr
+++ b/src/test/ui/feature-gate-start.stderr
@@ -8,4 +8,4 @@ LL | fn foo() {} //~ ERROR: a #[start] function is an experimental feature
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-static-nobundle.stderr b/src/test/ui/feature-gate-static-nobundle.stderr
index d872b8f4c52..fd9f2b371f6 100644
--- a/src/test/ui/feature-gate-static-nobundle.stderr
+++ b/src/test/ui/feature-gate-static-nobundle.stderr
@@ -8,4 +8,4 @@ LL | #[link(name="foo", kind="static-nobundle")]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-stmt_expr_attributes.stderr b/src/test/ui/feature-gate-stmt_expr_attributes.stderr
index 8aca511ec16..cd3af90dfd3 100644
--- a/src/test/ui/feature-gate-stmt_expr_attributes.stderr
+++ b/src/test/ui/feature-gate-stmt_expr_attributes.stderr
@@ -8,4 +8,4 @@ LL | const X: i32 = #[allow(dead_code)] 8;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-target_feature.stderr b/src/test/ui/feature-gate-target_feature.stderr
index 0b7313de04d..0f31abf7b42 100644
--- a/src/test/ui/feature-gate-target_feature.stderr
+++ b/src/test/ui/feature-gate-target_feature.stderr
@@ -8,4 +8,4 @@ LL | #[target_feature = "+sse2"]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-thread_local.stderr b/src/test/ui/feature-gate-thread_local.stderr
index 0bbcb6a24b2..9b44c3f9590 100644
--- a/src/test/ui/feature-gate-thread_local.stderr
+++ b/src/test/ui/feature-gate-thread_local.stderr
@@ -8,4 +8,4 @@ LL | #[thread_local] //~ ERROR `#[thread_local]` is an experimental feature
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-trace_macros.stderr b/src/test/ui/feature-gate-trace_macros.stderr
index 56d69bbbb40..a31f618bbbe 100644
--- a/src/test/ui/feature-gate-trace_macros.stderr
+++ b/src/test/ui/feature-gate-trace_macros.stderr
@@ -8,4 +8,4 @@ LL |     trace_macros!(true); //~ ERROR: `trace_macros` is not stable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-type_ascription.stderr b/src/test/ui/feature-gate-type_ascription.stderr
index bd0ff84c438..2bd475b68b2 100644
--- a/src/test/ui/feature-gate-type_ascription.stderr
+++ b/src/test/ui/feature-gate-type_ascription.stderr
@@ -8,4 +8,4 @@ LL |     let a = 10: u8; //~ ERROR type ascription is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-unboxed-closures-manual-impls.stderr b/src/test/ui/feature-gate-unboxed-closures-manual-impls.stderr
index 5d1f4d09227..6dfcdfc2567 100644
--- a/src/test/ui/feature-gate-unboxed-closures-manual-impls.stderr
+++ b/src/test/ui/feature-gate-unboxed-closures-manual-impls.stderr
@@ -32,4 +32,4 @@ LL |     extern "rust-call" fn call_once(&self, args: ()) -> () {}
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-unboxed-closures-method-calls.stderr b/src/test/ui/feature-gate-unboxed-closures-method-calls.stderr
index 7eb938110f3..cc8615d3620 100644
--- a/src/test/ui/feature-gate-unboxed-closures-method-calls.stderr
+++ b/src/test/ui/feature-gate-unboxed-closures-method-calls.stderr
@@ -24,4 +24,4 @@ LL |     f.call_once(()); //~ ERROR use of unstable library feature 'fn_traits'
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-unboxed-closures-ufcs-calls.stderr b/src/test/ui/feature-gate-unboxed-closures-ufcs-calls.stderr
index 5db2ea6167c..26dd983e877 100644
--- a/src/test/ui/feature-gate-unboxed-closures-ufcs-calls.stderr
+++ b/src/test/ui/feature-gate-unboxed-closures-ufcs-calls.stderr
@@ -24,4 +24,4 @@ LL |     FnOnce::call_once(f, ()); //~ ERROR use of unstable library feature 'fn
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-unboxed-closures.stderr b/src/test/ui/feature-gate-unboxed-closures.stderr
index 54e75ce8ef4..a5b1ed9bbc4 100644
--- a/src/test/ui/feature-gate-unboxed-closures.stderr
+++ b/src/test/ui/feature-gate-unboxed-closures.stderr
@@ -10,4 +10,4 @@ LL | |     }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-underscore-lifetimes.stderr b/src/test/ui/feature-gate-underscore-lifetimes.stderr
index b92662f8a82..c1cddcd763e 100644
--- a/src/test/ui/feature-gate-underscore-lifetimes.stderr
+++ b/src/test/ui/feature-gate-underscore-lifetimes.stderr
@@ -8,4 +8,4 @@ LL | fn foo(x: &u8) -> Foo<'_> { //~ ERROR underscore lifetimes are unstable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-universal.stderr b/src/test/ui/feature-gate-universal.stderr
index 8d2e81055fe..dc1a6b29c72 100644
--- a/src/test/ui/feature-gate-universal.stderr
+++ b/src/test/ui/feature-gate-universal.stderr
@@ -8,4 +8,4 @@ LL | fn foo(x: impl std::fmt::Debug) { print!("{:?}", x); }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-unsized_tuple_coercion.stderr b/src/test/ui/feature-gate-unsized_tuple_coercion.stderr
index e0bfab164ff..bf790a3b003 100644
--- a/src/test/ui/feature-gate-unsized_tuple_coercion.stderr
+++ b/src/test/ui/feature-gate-unsized_tuple_coercion.stderr
@@ -8,4 +8,4 @@ LL |     let _ : &(Send,) = &((),);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-untagged_unions.stderr b/src/test/ui/feature-gate-untagged_unions.stderr
index eef42e8b6fd..e0c845b7768 100644
--- a/src/test/ui/feature-gate-untagged_unions.stderr
+++ b/src/test/ui/feature-gate-untagged_unions.stderr
@@ -30,4 +30,4 @@ LL | | }
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-unwind-attributes.stderr b/src/test/ui/feature-gate-unwind-attributes.stderr
index d22b56ca386..4c6e6f420de 100644
--- a/src/test/ui/feature-gate-unwind-attributes.stderr
+++ b/src/test/ui/feature-gate-unwind-attributes.stderr
@@ -8,4 +8,4 @@ LL |     #[unwind] //~ ERROR #[unwind] is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-used.stderr b/src/test/ui/feature-gate-used.stderr
index 44c7c142c55..d650b5ebb3b 100644
--- a/src/test/ui/feature-gate-used.stderr
+++ b/src/test/ui/feature-gate-used.stderr
@@ -8,4 +8,4 @@ LL | #[used]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-bench.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-bench.stderr
index 1d33bc55611..f9f1cce91f1 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-bench.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-bench.stderr
@@ -2,4 +2,4 @@ error[E0601]: main function not found
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0601"
+For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr
index 40a81171a89..36320be1dc8 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr
@@ -41,5 +41,5 @@ LL |     #[inline = "2100"] impl S { }
 
 error: aborting due to 6 previous errors
 
-You've got a few errors: E0518, E0601
-If you want more information on an error, try using "rustc --explain E0518"
+Some errors occurred: E0518, E0601.
+For more information about an error, try `rustc --explain E0518`.
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr
index 5e540f9139e..d1d37720a55 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr
@@ -10,4 +10,4 @@ error[E0601]: main function not found
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0601"
+For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr
index 5a184897a09..c7654a3f258 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr
@@ -38,4 +38,4 @@ error[E0601]: main function not found
 
 error: aborting due to 7 previous errors
 
-If you want more information on this error, try using "rustc --explain E0601"
+For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr
index 1d453085256..5a1dd706ff3 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr
@@ -44,4 +44,4 @@ LL |     #[rustc_deprecated = "1500"] impl S { }
 
 error: aborting due to 8 previous errors
 
-If you want more information on this error, try using "rustc --explain E0601"
+For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr
index f7f426299da..bee9b8e9682 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr
@@ -44,4 +44,4 @@ LL |     #[stable = "1300"] impl S { }
 
 error: aborting due to 8 previous errors
 
-If you want more information on this error, try using "rustc --explain E0601"
+For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-test.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-test.stderr
index 1d33bc55611..f9f1cce91f1 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-test.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-test.stderr
@@ -2,4 +2,4 @@ error[E0601]: main function not found
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0601"
+For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr
index afa44421711..970cc2f2a34 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr
@@ -44,4 +44,4 @@ LL |     #[unstable = "1200"] impl S { }
 
 error: aborting due to 8 previous errors
 
-If you want more information on this error, try using "rustc --explain E0601"
+For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/fmt/send-sync.stderr b/src/test/ui/fmt/send-sync.stderr
index 0943b64c5c0..abbe6d5b11c 100644
--- a/src/test/ui/fmt/send-sync.stderr
+++ b/src/test/ui/fmt/send-sync.stderr
@@ -40,4 +40,4 @@ LL | fn sync<T: Sync>(_: T) {}
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/generator/auto-trait-regions.stderr b/src/test/ui/generator/auto-trait-regions.stderr
index 8f78bb8fa88..cd83915fe82 100644
--- a/src/test/ui/generator/auto-trait-regions.stderr
+++ b/src/test/ui/generator/auto-trait-regions.stderr
@@ -33,5 +33,5 @@ LL | fn assert_foo<T: Foo>(f: T) {}
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0277, E0279
-If you want more information on an error, try using "rustc --explain E0277"
+Some errors occurred: E0277, E0279.
+For more information about an error, try `rustc --explain E0277`.
diff --git a/src/test/ui/generator/borrowing.stderr b/src/test/ui/generator/borrowing.stderr
index a27d950c045..2a5de3790ad 100644
--- a/src/test/ui/generator/borrowing.stderr
+++ b/src/test/ui/generator/borrowing.stderr
@@ -27,4 +27,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/generator/dropck.stderr b/src/test/ui/generator/dropck.stderr
index c4ae9051138..4a22d299701 100644
--- a/src/test/ui/generator/dropck.stderr
+++ b/src/test/ui/generator/dropck.stderr
@@ -14,4 +14,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/generator/generator-with-nll.stderr b/src/test/ui/generator/generator-with-nll.stderr
index 49542dd0ac3..7e39d3c5459 100644
--- a/src/test/ui/generator/generator-with-nll.stderr
+++ b/src/test/ui/generator/generator-with-nll.stderr
@@ -27,4 +27,4 @@ LL |         yield ();
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0626"
+For more information about this error, try `rustc --explain E0626`.
diff --git a/src/test/ui/generator/issue-48048.stderr b/src/test/ui/generator/issue-48048.stderr
index 75918766754..f0654685deb 100644
--- a/src/test/ui/generator/issue-48048.stderr
+++ b/src/test/ui/generator/issue-48048.stderr
@@ -8,4 +8,4 @@ LL |             yield;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0626"
+For more information about this error, try `rustc --explain E0626`.
diff --git a/src/test/ui/generator/no-arguments-on-generators.stderr b/src/test/ui/generator/no-arguments-on-generators.stderr
index 6091946f2fa..6520f8b2023 100644
--- a/src/test/ui/generator/no-arguments-on-generators.stderr
+++ b/src/test/ui/generator/no-arguments-on-generators.stderr
@@ -6,4 +6,4 @@ LL |     let gen = |start| { //~ ERROR generators cannot have explicit arguments
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0628"
+For more information about this error, try `rustc --explain E0628`.
diff --git a/src/test/ui/generator/not-send-sync.stderr b/src/test/ui/generator/not-send-sync.stderr
index 6ca583bf16d..7ef6edfacf4 100644
--- a/src/test/ui/generator/not-send-sync.stderr
+++ b/src/test/ui/generator/not-send-sync.stderr
@@ -30,4 +30,4 @@ LL |     fn assert_sync<T: Sync>(_: T) {}
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/generator/pattern-borrow.stderr b/src/test/ui/generator/pattern-borrow.stderr
index 6acfd96d887..48f23486a31 100644
--- a/src/test/ui/generator/pattern-borrow.stderr
+++ b/src/test/ui/generator/pattern-borrow.stderr
@@ -8,4 +8,4 @@ LL |             yield ();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0626"
+For more information about this error, try `rustc --explain E0626`.
diff --git a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr b/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr
index 7cd07adf0b1..65817e30c4d 100644
--- a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr
+++ b/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr
@@ -11,4 +11,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/generator/sized-yield.stderr b/src/test/ui/generator/sized-yield.stderr
index c10adad99eb..fc99c7e3bd7 100644
--- a/src/test/ui/generator/sized-yield.stderr
+++ b/src/test/ui/generator/sized-yield.stderr
@@ -20,4 +20,4 @@ LL |    gen.resume(); //~ ERROR the trait bound `str: std::marker::Sized` is not
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/generator/unsafe-immovable.stderr b/src/test/ui/generator/unsafe-immovable.stderr
index a6755283bce..b2add55613d 100644
--- a/src/test/ui/generator/unsafe-immovable.stderr
+++ b/src/test/ui/generator/unsafe-immovable.stderr
@@ -8,4 +8,4 @@ LL | |     };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0133"
+For more information about this error, try `rustc --explain E0133`.
diff --git a/src/test/ui/generator/yield-in-args.stderr b/src/test/ui/generator/yield-in-args.stderr
index 26152f73f5a..3219939e89b 100644
--- a/src/test/ui/generator/yield-in-args.stderr
+++ b/src/test/ui/generator/yield-in-args.stderr
@@ -6,4 +6,4 @@ LL |         foo(&b, yield); //~ ERROR
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0626"
+For more information about this error, try `rustc --explain E0626`.
diff --git a/src/test/ui/generator/yield-in-const.stderr b/src/test/ui/generator/yield-in-const.stderr
index 119f94695e7..41a20893f5c 100644
--- a/src/test/ui/generator/yield-in-const.stderr
+++ b/src/test/ui/generator/yield-in-const.stderr
@@ -8,5 +8,5 @@ LL | const A: u8 = { yield 3u8; 3u8};
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0601, E0627
-If you want more information on an error, try using "rustc --explain E0601"
+Some errors occurred: E0601, E0627.
+For more information about an error, try `rustc --explain E0601`.
diff --git a/src/test/ui/generator/yield-in-function.stderr b/src/test/ui/generator/yield-in-function.stderr
index b1d76b41fa2..35be1fcd28d 100644
--- a/src/test/ui/generator/yield-in-function.stderr
+++ b/src/test/ui/generator/yield-in-function.stderr
@@ -6,4 +6,4 @@ LL | fn main() { yield; }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0627"
+For more information about this error, try `rustc --explain E0627`.
diff --git a/src/test/ui/generator/yield-in-static.stderr b/src/test/ui/generator/yield-in-static.stderr
index 0a2da21e692..71ebc189035 100644
--- a/src/test/ui/generator/yield-in-static.stderr
+++ b/src/test/ui/generator/yield-in-static.stderr
@@ -8,5 +8,5 @@ LL | static B: u8 = { yield 3u8; 3u8};
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0601, E0627
-If you want more information on an error, try using "rustc --explain E0601"
+Some errors occurred: E0601, E0627.
+For more information about an error, try `rustc --explain E0601`.
diff --git a/src/test/ui/generator/yield-while-iterating.stderr b/src/test/ui/generator/yield-while-iterating.stderr
index c1a047f6c2a..c20b1348e27 100644
--- a/src/test/ui/generator/yield-while-iterating.stderr
+++ b/src/test/ui/generator/yield-while-iterating.stderr
@@ -22,5 +22,5 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0502, E0626
-If you want more information on an error, try using "rustc --explain E0502"
+Some errors occurred: E0502, E0626.
+For more information about an error, try `rustc --explain E0502`.
diff --git a/src/test/ui/generator/yield-while-local-borrowed.stderr b/src/test/ui/generator/yield-while-local-borrowed.stderr
index 7417cdd9aa5..a7f9862a726 100644
--- a/src/test/ui/generator/yield-while-local-borrowed.stderr
+++ b/src/test/ui/generator/yield-while-local-borrowed.stderr
@@ -36,4 +36,4 @@ LL |             yield();
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0626"
+For more information about this error, try `rustc --explain E0626`.
diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.stderr b/src/test/ui/generator/yield-while-ref-reborrowed.stderr
index 57d688e78f6..8139814c7f2 100644
--- a/src/test/ui/generator/yield-while-ref-reborrowed.stderr
+++ b/src/test/ui/generator/yield-while-ref-reborrowed.stderr
@@ -14,4 +14,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0501"
+For more information about this error, try `rustc --explain E0501`.
diff --git a/src/test/ui/generic-type-less-params-with-defaults.stderr b/src/test/ui/generic-type-less-params-with-defaults.stderr
index 327a36df80c..28867eb2254 100644
--- a/src/test/ui/generic-type-less-params-with-defaults.stderr
+++ b/src/test/ui/generic-type-less-params-with-defaults.stderr
@@ -6,4 +6,4 @@ LL |     let _: Vec;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0243"
+For more information about this error, try `rustc --explain E0243`.
diff --git a/src/test/ui/generic-type-more-params-with-defaults.stderr b/src/test/ui/generic-type-more-params-with-defaults.stderr
index 1f60d7997e3..684a22ce45c 100644
--- a/src/test/ui/generic-type-more-params-with-defaults.stderr
+++ b/src/test/ui/generic-type-more-params-with-defaults.stderr
@@ -6,4 +6,4 @@ LL |     let _: Vec<isize, Heap, bool>;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0244"
+For more information about this error, try `rustc --explain E0244`.
diff --git a/src/test/ui/if-let-arm-types.stderr b/src/test/ui/if-let-arm-types.stderr
index b20426103f4..2e6b71dadf1 100644
--- a/src/test/ui/if-let-arm-types.stderr
+++ b/src/test/ui/if-let-arm-types.stderr
@@ -23,4 +23,4 @@ LL | |     };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/impl-duplicate-methods.stderr b/src/test/ui/impl-duplicate-methods.stderr
index dcbac5cfa0b..99e1e56e323 100644
--- a/src/test/ui/impl-duplicate-methods.stderr
+++ b/src/test/ui/impl-duplicate-methods.stderr
@@ -8,4 +8,4 @@ LL |     fn orange(&self) {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0201"
+For more information about this error, try `rustc --explain E0201`.
diff --git a/src/test/ui/impl-trait/auto-trait-leak.stderr b/src/test/ui/impl-trait/auto-trait-leak.stderr
index bf7705881c9..71ca8675db4 100644
--- a/src/test/ui/impl-trait/auto-trait-leak.stderr
+++ b/src/test/ui/impl-trait/auto-trait-leak.stderr
@@ -58,5 +58,5 @@ LL | fn cycle1() -> impl Clone {
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0277, E0391
-If you want more information on an error, try using "rustc --explain E0277"
+Some errors occurred: E0277, E0391.
+For more information about an error, try `rustc --explain E0277`.
diff --git a/src/test/ui/impl-trait/equality.stderr b/src/test/ui/impl-trait/equality.stderr
index 0c72468a267..0f310df0714 100644
--- a/src/test/ui/impl-trait/equality.stderr
+++ b/src/test/ui/impl-trait/equality.stderr
@@ -53,5 +53,5 @@ LL |          x.0);
 
 error: aborting due to 6 previous errors
 
-You've got a few errors: E0277, E0308
-If you want more information on an error, try using "rustc --explain E0277"
+Some errors occurred: E0277, E0308.
+For more information about an error, try `rustc --explain E0277`.
diff --git a/src/test/ui/impl-trait/impl-trait-plus-priority.stderr b/src/test/ui/impl-trait/impl-trait-plus-priority.stderr
index 1d4159aaa45..2a9199b25bc 100644
--- a/src/test/ui/impl-trait/impl-trait-plus-priority.stderr
+++ b/src/test/ui/impl-trait/impl-trait-plus-priority.stderr
@@ -66,4 +66,4 @@ LL | type A = &A + B;
 
 error: aborting due to 11 previous errors
 
-If you want more information on this error, try using "rustc --explain E0178"
+For more information about this error, try `rustc --explain E0178`.
diff --git a/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.stderr b/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.stderr
index d80251200b2..89bc5388494 100644
--- a/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.stderr
+++ b/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.stderr
@@ -13,4 +13,4 @@ LL |     f1.foo(1usize);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr b/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr
index b441ff518bd..438d29f0535 100644
--- a/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr
+++ b/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr
@@ -15,4 +15,4 @@ LL |     foo(|s| s.is_empty());
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/impl-trait/no-method-suggested-traits.stderr b/src/test/ui/impl-trait/no-method-suggested-traits.stderr
index d5250b42cc2..bc4afb93109 100644
--- a/src/test/ui/impl-trait/no-method-suggested-traits.stderr
+++ b/src/test/ui/impl-trait/no-method-suggested-traits.stderr
@@ -255,4 +255,4 @@ LL |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Bar::X)).me
 
 error: aborting due to 24 previous errors
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/impl-trait/trait_type.stderr b/src/test/ui/impl-trait/trait_type.stderr
index 6c2fde03de3..c91ebb705de 100644
--- a/src/test/ui/impl-trait/trait_type.stderr
+++ b/src/test/ui/impl-trait/trait_type.stderr
@@ -33,5 +33,5 @@ LL | impl std::fmt::Display for MyType4 {}
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0046, E0050, E0053, E0186
-If you want more information on an error, try using "rustc --explain E0046"
+Some errors occurred: E0046, E0050, E0053, E0186.
+For more information about an error, try `rustc --explain E0046`.
diff --git a/src/test/ui/impl-trait/universal-mismatched-type.stderr b/src/test/ui/impl-trait/universal-mismatched-type.stderr
index 67b3dacdaf5..64f1aff13bd 100644
--- a/src/test/ui/impl-trait/universal-mismatched-type.stderr
+++ b/src/test/ui/impl-trait/universal-mismatched-type.stderr
@@ -11,4 +11,4 @@ LL |     x //~ ERROR mismatched types
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/impl-trait/universal-two-impl-traits.stderr b/src/test/ui/impl-trait/universal-two-impl-traits.stderr
index 4309c1a9bc9..61f52ff25fb 100644
--- a/src/test/ui/impl-trait/universal-two-impl-traits.stderr
+++ b/src/test/ui/impl-trait/universal-two-impl-traits.stderr
@@ -9,4 +9,4 @@ LL |     a = y; //~ ERROR mismatched
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/impl-trait/universal_wrong_bounds.stderr b/src/test/ui/impl-trait/universal_wrong_bounds.stderr
index 6cf0baa5fcc..a02fc1f748f 100644
--- a/src/test/ui/impl-trait/universal_wrong_bounds.stderr
+++ b/src/test/ui/impl-trait/universal_wrong_bounds.stderr
@@ -26,5 +26,3 @@ LL | use std::fmt::Debug;
 
 error: cannot continue compilation due to previous error
 
-You've got a few errors: E0405, E0425
-If you want more information on an error, try using "rustc --explain E0405"
diff --git a/src/test/ui/impl-unused-rps-in-assoc-type.stderr b/src/test/ui/impl-unused-rps-in-assoc-type.stderr
index fb3cf9a30c8..1f7f790b1e4 100644
--- a/src/test/ui/impl-unused-rps-in-assoc-type.stderr
+++ b/src/test/ui/impl-unused-rps-in-assoc-type.stderr
@@ -6,4 +6,4 @@ LL | impl<'a> Fun for Holder { //~ ERROR E0207
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0207"
+For more information about this error, try `rustc --explain E0207`.
diff --git a/src/test/ui/impl_trait_projections.stderr b/src/test/ui/impl_trait_projections.stderr
index f519f21215e..9b38de614fc 100644
--- a/src/test/ui/impl_trait_projections.stderr
+++ b/src/test/ui/impl_trait_projections.stderr
@@ -32,5 +32,5 @@ LL | fn projection_is_disallowed(x: impl Iterator) -> <impl Iterator>::Item {
 
 error: aborting due to 5 previous errors
 
-You've got a few errors: E0223, E0667
-If you want more information on an error, try using "rustc --explain E0223"
+Some errors occurred: E0223, E0667.
+For more information about an error, try `rustc --explain E0223`.
diff --git a/src/test/ui/imports/duplicate.stderr b/src/test/ui/imports/duplicate.stderr
index 0715674077a..452e3e1e200 100644
--- a/src/test/ui/imports/duplicate.stderr
+++ b/src/test/ui/imports/duplicate.stderr
@@ -86,5 +86,5 @@ LL |     use self::m2::*;
 
 error: aborting due to 5 previous errors
 
-You've got a few errors: E0252, E0659
-If you want more information on an error, try using "rustc --explain E0252"
+Some errors occurred: E0252, E0659.
+For more information about an error, try `rustc --explain E0252`.
diff --git a/src/test/ui/imports/macro-paths.stderr b/src/test/ui/imports/macro-paths.stderr
index 815694919c7..1422fb0904d 100644
--- a/src/test/ui/imports/macro-paths.stderr
+++ b/src/test/ui/imports/macro-paths.stderr
@@ -40,5 +40,5 @@ error[E0601]: main function not found
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0601, E0659
-If you want more information on an error, try using "rustc --explain E0601"
+Some errors occurred: E0601, E0659.
+For more information about an error, try `rustc --explain E0601`.
diff --git a/src/test/ui/imports/macros.stderr b/src/test/ui/imports/macros.stderr
index c32fb56cd5d..d74020ecab2 100644
--- a/src/test/ui/imports/macros.stderr
+++ b/src/test/ui/imports/macros.stderr
@@ -55,5 +55,5 @@ error[E0601]: main function not found
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0601, E0659
-If you want more information on an error, try using "rustc --explain E0601"
+Some errors occurred: E0601, E0659.
+For more information about an error, try `rustc --explain E0601`.
diff --git a/src/test/ui/imports/shadow_builtin_macros.stderr b/src/test/ui/imports/shadow_builtin_macros.stderr
index 8c72d27d6aa..c9d80ada472 100644
--- a/src/test/ui/imports/shadow_builtin_macros.stderr
+++ b/src/test/ui/imports/shadow_builtin_macros.stderr
@@ -57,4 +57,4 @@ LL | #[macro_use(n)]
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0659"
+For more information about this error, try `rustc --explain E0659`.
diff --git a/src/test/ui/impossible_range.stderr b/src/test/ui/impossible_range.stderr
index 0754dbc796b..d941b522def 100644
--- a/src/test/ui/impossible_range.stderr
+++ b/src/test/ui/impossible_range.stderr
@@ -16,4 +16,4 @@ LL |     0..=; //~ERROR inclusive range with no end
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0586"
+For more information about this error, try `rustc --explain E0586`.
diff --git a/src/test/ui/in-band-lifetimes/E0687.stderr b/src/test/ui/in-band-lifetimes/E0687.stderr
index e1fa4164cc4..441494d738a 100644
--- a/src/test/ui/in-band-lifetimes/E0687.stderr
+++ b/src/test/ui/in-band-lifetimes/E0687.stderr
@@ -24,4 +24,4 @@ LL |     fn bar(&self, x: fn(&'a u32)) {} //~ ERROR must be explicitly
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0687"
+For more information about this error, try `rustc --explain E0687`.
diff --git a/src/test/ui/in-band-lifetimes/E0687_where.stderr b/src/test/ui/in-band-lifetimes/E0687_where.stderr
index 74da124c9c7..a2ad5cf0f83 100644
--- a/src/test/ui/in-band-lifetimes/E0687_where.stderr
+++ b/src/test/ui/in-band-lifetimes/E0687_where.stderr
@@ -12,4 +12,4 @@ LL | fn baz(x: &impl Fn(&'a u32)) {} //~ ERROR must be explicitly
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0687"
+For more information about this error, try `rustc --explain E0687`.
diff --git a/src/test/ui/in-band-lifetimes/E0688.stderr b/src/test/ui/in-band-lifetimes/E0688.stderr
index 3521e370dc5..66dca227941 100644
--- a/src/test/ui/in-band-lifetimes/E0688.stderr
+++ b/src/test/ui/in-band-lifetimes/E0688.stderr
@@ -24,4 +24,4 @@ LL | impl<'b> Foo<'a> { //~ ERROR cannot mix
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0688"
+For more information about this error, try `rustc --explain E0688`.
diff --git a/src/test/ui/in-band-lifetimes/mismatched.stderr b/src/test/ui/in-band-lifetimes/mismatched.stderr
index 9485c9652a9..d2748b2da4b 100644
--- a/src/test/ui/in-band-lifetimes/mismatched.stderr
+++ b/src/test/ui/in-band-lifetimes/mismatched.stderr
@@ -16,5 +16,5 @@ LL | fn foo2(x: &'a u32, y: &'b u32) -> &'a u32 { y } //~ ERROR lifetime mismatc
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0621, E0623
-If you want more information on an error, try using "rustc --explain E0621"
+Some errors occurred: E0621, E0623.
+For more information about an error, try `rustc --explain E0621`.
diff --git a/src/test/ui/in-band-lifetimes/mismatched_trait.stderr b/src/test/ui/in-band-lifetimes/mismatched_trait.stderr
index 5007701afdb..71b46f6d4d6 100644
--- a/src/test/ui/in-band-lifetimes/mismatched_trait.stderr
+++ b/src/test/ui/in-band-lifetimes/mismatched_trait.stderr
@@ -8,4 +8,4 @@ LL |         y //~ ERROR explicit lifetime required
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr b/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr
index bc55b1c56cf..a3d05e72ed9 100644
--- a/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr
+++ b/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr
@@ -20,5 +20,5 @@ LL | |     }
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0495, E0601
-If you want more information on an error, try using "rustc --explain E0495"
+Some errors occurred: E0495, E0601.
+For more information about an error, try `rustc --explain E0495`.
diff --git a/src/test/ui/in-band-lifetimes/mismatched_trait_impl.stderr b/src/test/ui/in-band-lifetimes/mismatched_trait_impl.stderr
index 41b0c77ea14..675ae1695b5 100644
--- a/src/test/ui/in-band-lifetimes/mismatched_trait_impl.stderr
+++ b/src/test/ui/in-band-lifetimes/mismatched_trait_impl.stderr
@@ -22,4 +22,4 @@ LL |     fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 { //~ ERROR cannot infer
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0495"
+For more information about this error, try `rustc --explain E0495`.
diff --git a/src/test/ui/in-band-lifetimes/mut_while_borrow.stderr b/src/test/ui/in-band-lifetimes/mut_while_borrow.stderr
index 258b369f257..1498eb7ac1d 100644
--- a/src/test/ui/in-band-lifetimes/mut_while_borrow.stderr
+++ b/src/test/ui/in-band-lifetimes/mut_while_borrow.stderr
@@ -8,4 +8,4 @@ LL |     p += 1; //~ ERROR cannot assign to `p` because it is borrowed
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0506"
+For more information about this error, try `rustc --explain E0506`.
diff --git a/src/test/ui/in-band-lifetimes/no_in_band_in_struct.stderr b/src/test/ui/in-band-lifetimes/no_in_band_in_struct.stderr
index 7cba013c96b..da46cb7f22e 100644
--- a/src/test/ui/in-band-lifetimes/no_in_band_in_struct.stderr
+++ b/src/test/ui/in-band-lifetimes/no_in_band_in_struct.stderr
@@ -12,4 +12,4 @@ LL |     Baz(&'test u32), //~ ERROR undeclared lifetime
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0261"
+For more information about this error, try `rustc --explain E0261`.
diff --git a/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr b/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr
index 7b1d0509bbd..d53b71907a4 100644
--- a/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr
+++ b/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr
@@ -12,4 +12,4 @@ LL |     let y: fn(&'test u32) = foo2; //~ ERROR use of undeclared lifetime
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0261"
+For more information about this error, try `rustc --explain E0261`.
diff --git a/src/test/ui/in-band-lifetimes/shadow.stderr b/src/test/ui/in-band-lifetimes/shadow.stderr
index b22b18aa929..0ee228fca31 100644
--- a/src/test/ui/in-band-lifetimes/shadow.stderr
+++ b/src/test/ui/in-band-lifetimes/shadow.stderr
@@ -17,4 +17,4 @@ LL |     fn baz(x: for<'s> fn(&'s u32)) {} //~ ERROR shadows a lifetime name
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0496"
+For more information about this error, try `rustc --explain E0496`.
diff --git a/src/test/ui/index-help.stderr b/src/test/ui/index-help.stderr
index ae3cd529ac4..669c0837fda 100644
--- a/src/test/ui/index-help.stderr
+++ b/src/test/ui/index-help.stderr
@@ -9,4 +9,4 @@ LL |     x[0i32]; //~ ERROR E0277
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/infinite-recursion-const-fn.stderr b/src/test/ui/infinite-recursion-const-fn.stderr
index bc062ecce25..81717fe1f09 100644
--- a/src/test/ui/infinite-recursion-const-fn.stderr
+++ b/src/test/ui/infinite-recursion-const-fn.stderr
@@ -69,4 +69,4 @@ LL | const ARR: [i32; a()] = [5; 6];
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0080"
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/interior-mutability/interior-mutability.stderr b/src/test/ui/interior-mutability/interior-mutability.stderr
index e27353eda09..4c489c5964b 100644
--- a/src/test/ui/interior-mutability/interior-mutability.stderr
+++ b/src/test/ui/interior-mutability/interior-mutability.stderr
@@ -12,4 +12,4 @@ LL |     catch_unwind(|| { x.set(23); }); //~ ERROR the trait bound
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr b/src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr
index 2dac52d6f81..2dd62ec0500 100644
--- a/src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr
+++ b/src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr
@@ -8,4 +8,4 @@ LL | pub mod baz;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0583"
+For more information about this error, try `rustc --explain E0583`.
diff --git a/src/test/ui/invalid-path-in-const.stderr b/src/test/ui/invalid-path-in-const.stderr
index 06eb6005d71..9214800b93a 100644
--- a/src/test/ui/invalid-path-in-const.stderr
+++ b/src/test/ui/invalid-path-in-const.stderr
@@ -6,4 +6,4 @@ LL |     fn f(a: [u8; u32::DOESNOTEXIST]) {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/issue-10969.stderr b/src/test/ui/issue-10969.stderr
index b4d365dcc00..edc4ecbab52 100644
--- a/src/test/ui/issue-10969.stderr
+++ b/src/test/ui/issue-10969.stderr
@@ -16,4 +16,4 @@ LL |     i(); //~ERROR expected function, found `i32`
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0618"
+For more information about this error, try `rustc --explain E0618`.
diff --git a/src/test/ui/issue-11004.stderr b/src/test/ui/issue-11004.stderr
index 268c3cd6d2a..215120c9c25 100644
--- a/src/test/ui/issue-11004.stderr
+++ b/src/test/ui/issue-11004.stderr
@@ -12,4 +12,4 @@ LL |     let y : f64 = n.y; //~ no field `y` on type `*mut A`
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0609"
+For more information about this error, try `rustc --explain E0609`.
diff --git a/src/test/ui/issue-11319.stderr b/src/test/ui/issue-11319.stderr
index b94f8001ccf..8189cf5ea17 100644
--- a/src/test/ui/issue-11319.stderr
+++ b/src/test/ui/issue-11319.stderr
@@ -17,4 +17,4 @@ LL | |     }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/issue-12187-1.stderr b/src/test/ui/issue-12187-1.stderr
index 29b1e985183..7d4df2901fe 100644
--- a/src/test/ui/issue-12187-1.stderr
+++ b/src/test/ui/issue-12187-1.stderr
@@ -9,4 +9,4 @@ LL |     let &v = new();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/issue-12187-2.stderr b/src/test/ui/issue-12187-2.stderr
index 327105bee16..f7ecbd44772 100644
--- a/src/test/ui/issue-12187-2.stderr
+++ b/src/test/ui/issue-12187-2.stderr
@@ -9,4 +9,4 @@ LL |     let &v = new();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/issue-12511.stderr b/src/test/ui/issue-12511.stderr
index 3f0c0e7ee13..c1612b8cb67 100644
--- a/src/test/ui/issue-12511.stderr
+++ b/src/test/ui/issue-12511.stderr
@@ -18,4 +18,4 @@ LL | trait t1 : t2 {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0391"
+For more information about this error, try `rustc --explain E0391`.
diff --git a/src/test/ui/issue-13058.stderr b/src/test/ui/issue-13058.stderr
index 30936d4c90d..cef5f5ae475 100644
--- a/src/test/ui/issue-13058.stderr
+++ b/src/test/ui/issue-13058.stderr
@@ -21,5 +21,5 @@ LL |     check((3, 5));
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0308, E0621
-If you want more information on an error, try using "rustc --explain E0308"
+Some errors occurred: E0308, E0621.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/issue-14092.stderr b/src/test/ui/issue-14092.stderr
index 209ca27a20b..f90ea4776ab 100644
--- a/src/test/ui/issue-14092.stderr
+++ b/src/test/ui/issue-14092.stderr
@@ -6,4 +6,4 @@ LL | fn fn1(0: Box) {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0243"
+For more information about this error, try `rustc --explain E0243`.
diff --git a/src/test/ui/issue-15260.stderr b/src/test/ui/issue-15260.stderr
index 1b0a39d02f5..10cb79e0fc5 100644
--- a/src/test/ui/issue-15260.stderr
+++ b/src/test/ui/issue-15260.stderr
@@ -33,4 +33,4 @@ LL |         a: x
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0025"
+For more information about this error, try `rustc --explain E0025`.
diff --git a/src/test/ui/issue-15524.stderr b/src/test/ui/issue-15524.stderr
index e26766eca37..a116e621a95 100644
--- a/src/test/ui/issue-15524.stderr
+++ b/src/test/ui/issue-15524.stderr
@@ -26,4 +26,4 @@ LL |     E = N,
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0081"
+For more information about this error, try `rustc --explain E0081`.
diff --git a/src/test/ui/issue-17263.stderr b/src/test/ui/issue-17263.stderr
index e321a9f4562..4767fbbcfbb 100644
--- a/src/test/ui/issue-17263.stderr
+++ b/src/test/ui/issue-17263.stderr
@@ -22,5 +22,5 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0499, E0502
-If you want more information on an error, try using "rustc --explain E0499"
+Some errors occurred: E0499, E0502.
+For more information about an error, try `rustc --explain E0499`.
diff --git a/src/test/ui/issue-17441.stderr b/src/test/ui/issue-17441.stderr
index ec0f33caffc..80ba49cce1a 100644
--- a/src/test/ui/issue-17441.stderr
+++ b/src/test/ui/issue-17441.stderr
@@ -44,4 +44,4 @@ LL |     let _quux = [1_usize, 2] as [usize];
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0620"
+For more information about this error, try `rustc --explain E0620`.
diff --git a/src/test/ui/issue-18183.stderr b/src/test/ui/issue-18183.stderr
index 93cd351cbc5..169a3019d52 100644
--- a/src/test/ui/issue-18183.stderr
+++ b/src/test/ui/issue-18183.stderr
@@ -6,4 +6,4 @@ LL | pub struct Foo<Bar=Bar>(Bar); //~ ERROR E0128
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0128"
+For more information about this error, try `rustc --explain E0128`.
diff --git a/src/test/ui/issue-18819.stderr b/src/test/ui/issue-18819.stderr
index e714707c2c3..86926863598 100644
--- a/src/test/ui/issue-18819.stderr
+++ b/src/test/ui/issue-18819.stderr
@@ -9,4 +9,4 @@ LL |     print_x(X);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0061"
+For more information about this error, try `rustc --explain E0061`.
diff --git a/src/test/ui/issue-19498.stderr b/src/test/ui/issue-19498.stderr
index b2793dff2bf..839ab778061 100644
--- a/src/test/ui/issue-19498.stderr
+++ b/src/test/ui/issue-19498.stderr
@@ -44,4 +44,4 @@ LL |     use C::D as OtherD;
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0255"
+For more information about this error, try `rustc --explain E0255`.
diff --git a/src/test/ui/issue-19707.stderr b/src/test/ui/issue-19707.stderr
index 22a892c9252..56088d38aaf 100644
--- a/src/test/ui/issue-19707.stderr
+++ b/src/test/ui/issue-19707.stderr
@@ -16,4 +16,4 @@ LL | fn bar<F: Fn(&u8, &u8) -> &u8>(f: &F) {} //~ ERROR missing lifetime specifi
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0106"
+For more information about this error, try `rustc --explain E0106`.
diff --git a/src/test/ui/issue-19922.stderr b/src/test/ui/issue-19922.stderr
index ac64cb12ef0..a5bc579e192 100644
--- a/src/test/ui/issue-19922.stderr
+++ b/src/test/ui/issue-19922.stderr
@@ -8,4 +8,4 @@ LL |     let homura = Homura::Akemi { kaname: () };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0559"
+For more information about this error, try `rustc --explain E0559`.
diff --git a/src/test/ui/issue-20692.stderr b/src/test/ui/issue-20692.stderr
index 1c23f42f3cc..1316773f6b7 100644
--- a/src/test/ui/issue-20692.stderr
+++ b/src/test/ui/issue-20692.stderr
@@ -17,4 +17,4 @@ LL |     let _ = x
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0038"
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/issue-21546.stderr b/src/test/ui/issue-21546.stderr
index 6f8000f2492..bff79e52aa1 100644
--- a/src/test/ui/issue-21546.stderr
+++ b/src/test/ui/issue-21546.stderr
@@ -66,4 +66,4 @@ LL | mod Corge { }
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0428"
+For more information about this error, try `rustc --explain E0428`.
diff --git a/src/test/ui/issue-21600.stderr b/src/test/ui/issue-21600.stderr
index b1dcf1cd730..873dc7448be 100644
--- a/src/test/ui/issue-21600.stderr
+++ b/src/test/ui/issue-21600.stderr
@@ -29,4 +29,4 @@ LL |         call_it(|| x.gen_mut()); //~ ERROR cannot borrow data mutably in a
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0387"
+For more information about this error, try `rustc --explain E0387`.
diff --git a/src/test/ui/issue-21950.stderr b/src/test/ui/issue-21950.stderr
index 9d33e1fd0ab..a2f74a29aab 100644
--- a/src/test/ui/issue-21950.stderr
+++ b/src/test/ui/issue-21950.stderr
@@ -14,5 +14,5 @@ LL |             &Add;
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0191, E0393
-If you want more information on an error, try using "rustc --explain E0191"
+Some errors occurred: E0191, E0393.
+For more information about an error, try `rustc --explain E0191`.
diff --git a/src/test/ui/issue-22370.stderr b/src/test/ui/issue-22370.stderr
index 79362ce7aa3..b3691503fc1 100644
--- a/src/test/ui/issue-22370.stderr
+++ b/src/test/ui/issue-22370.stderr
@@ -8,4 +8,4 @@ LL | fn f(a: &A) {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0393"
+For more information about this error, try `rustc --explain E0393`.
diff --git a/src/test/ui/issue-22560.stderr b/src/test/ui/issue-22560.stderr
index 907b0d8822d..b5524036fae 100644
--- a/src/test/ui/issue-22560.stderr
+++ b/src/test/ui/issue-22560.stderr
@@ -32,5 +32,5 @@ LL | |             Sub;
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0191, E0225, E0393
-If you want more information on an error, try using "rustc --explain E0191"
+Some errors occurred: E0191, E0225, E0393.
+For more information about an error, try `rustc --explain E0191`.
diff --git a/src/test/ui/issue-22886.stderr b/src/test/ui/issue-22886.stderr
index 4a69e6bc4c2..0e05cbfa7ee 100644
--- a/src/test/ui/issue-22886.stderr
+++ b/src/test/ui/issue-22886.stderr
@@ -6,4 +6,4 @@ LL | impl<'a> Iterator for Newtype { //~ ERROR E0207
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0207"
+For more information about this error, try `rustc --explain E0207`.
diff --git a/src/test/ui/issue-22933-2.stderr b/src/test/ui/issue-22933-2.stderr
index 41324fd8b75..435a89b716f 100644
--- a/src/test/ui/issue-22933-2.stderr
+++ b/src/test/ui/issue-22933-2.stderr
@@ -9,4 +9,4 @@ LL |     ApplePie = Delicious::Apple as isize | Delicious::PIE as isize,
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/issue-23041.stderr b/src/test/ui/issue-23041.stderr
index cf4e677ed0c..f89bce09c7e 100644
--- a/src/test/ui/issue-23041.stderr
+++ b/src/test/ui/issue-23041.stderr
@@ -6,4 +6,4 @@ LL |     b.downcast_ref::<fn(_)->_>(); //~ ERROR E0282
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/issue-23173.stderr b/src/test/ui/issue-23173.stderr
index bf2c67f93f8..d58a4d2b8f8 100644
--- a/src/test/ui/issue-23173.stderr
+++ b/src/test/ui/issue-23173.stderr
@@ -36,4 +36,4 @@ LL |     Struct::Assoc;
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/issue-23217.stderr b/src/test/ui/issue-23217.stderr
index 7abe4bd7b21..be9ec9d73c2 100644
--- a/src/test/ui/issue-23217.stderr
+++ b/src/test/ui/issue-23217.stderr
@@ -8,4 +8,4 @@ LL |     B = SomeEnum::A,
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/issue-23302-1.stderr b/src/test/ui/issue-23302-1.stderr
index 087eae43a29..c587c00279b 100644
--- a/src/test/ui/issue-23302-1.stderr
+++ b/src/test/ui/issue-23302-1.stderr
@@ -18,4 +18,4 @@ LL |     A = X::A as isize, //~ ERROR E0391
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0391"
+For more information about this error, try `rustc --explain E0391`.
diff --git a/src/test/ui/issue-23302-2.stderr b/src/test/ui/issue-23302-2.stderr
index 66ba5c32582..553ddaa1a81 100644
--- a/src/test/ui/issue-23302-2.stderr
+++ b/src/test/ui/issue-23302-2.stderr
@@ -18,4 +18,4 @@ LL |     A = Y::B as isize, //~ ERROR E0391
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0391"
+For more information about this error, try `rustc --explain E0391`.
diff --git a/src/test/ui/issue-23302-3.stderr b/src/test/ui/issue-23302-3.stderr
index 31168579394..8cf296bc6db 100644
--- a/src/test/ui/issue-23302-3.stderr
+++ b/src/test/ui/issue-23302-3.stderr
@@ -28,4 +28,4 @@ LL | const B: i32 = A; //~ ERROR cyclic dependency detected
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0391"
+For more information about this error, try `rustc --explain E0391`.
diff --git a/src/test/ui/issue-23543.stderr b/src/test/ui/issue-23543.stderr
index c62af8f0635..ea443f1cbbb 100644
--- a/src/test/ui/issue-23543.stderr
+++ b/src/test/ui/issue-23543.stderr
@@ -6,4 +6,4 @@ LL |         where T<Bogus = Foo>: A;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0229"
+For more information about this error, try `rustc --explain E0229`.
diff --git a/src/test/ui/issue-23544.stderr b/src/test/ui/issue-23544.stderr
index 882703cdb5a..147e2a212ed 100644
--- a/src/test/ui/issue-23544.stderr
+++ b/src/test/ui/issue-23544.stderr
@@ -6,4 +6,4 @@ LL |         where T<Bogus = Self::AlsoBogus>: A;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0229"
+For more information about this error, try `rustc --explain E0229`.
diff --git a/src/test/ui/issue-23716.stderr b/src/test/ui/issue-23716.stderr
index 739c8d66e71..fd268c1b5a1 100644
--- a/src/test/ui/issue-23716.stderr
+++ b/src/test/ui/issue-23716.stderr
@@ -18,4 +18,4 @@ LL | fn question(answer: i32) {}
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0530"
+For more information about this error, try `rustc --explain E0530`.
diff --git a/src/test/ui/issue-24036.stderr b/src/test/ui/issue-24036.stderr
index bbf64d8305d..24995be773e 100644
--- a/src/test/ui/issue-24036.stderr
+++ b/src/test/ui/issue-24036.stderr
@@ -29,4 +29,4 @@ LL | |     };
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/issue-24081.stderr b/src/test/ui/issue-24081.stderr
index 257e32f9198..17cd3ec0aa6 100644
--- a/src/test/ui/issue-24081.stderr
+++ b/src/test/ui/issue-24081.stderr
@@ -75,4 +75,4 @@ LL | use std::ops::Rem as OtherRem;
 
 error: aborting due to 5 previous errors
 
-If you want more information on this error, try using "rustc --explain E0255"
+For more information about this error, try `rustc --explain E0255`.
diff --git a/src/test/ui/issue-24424.stderr b/src/test/ui/issue-24424.stderr
index c3d5211cddc..7bcf67a5048 100644
--- a/src/test/ui/issue-24424.stderr
+++ b/src/test/ui/issue-24424.stderr
@@ -12,4 +12,4 @@ LL | trait Trait0<'l0>  {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0283"
+For more information about this error, try `rustc --explain E0283`.
diff --git a/src/test/ui/issue-25385.stderr b/src/test/ui/issue-25385.stderr
index 88e30d7fae0..f12388d4b45 100644
--- a/src/test/ui/issue-25385.stderr
+++ b/src/test/ui/issue-25385.stderr
@@ -15,4 +15,4 @@ LL |     foo!(1i32.foo());
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/issue-25793.stderr b/src/test/ui/issue-25793.stderr
index 2d8b5d6f499..926a744f69e 100644
--- a/src/test/ui/issue-25793.stderr
+++ b/src/test/ui/issue-25793.stderr
@@ -11,4 +11,4 @@ LL |         self.get_size(width!(self))
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0503"
+For more information about this error, try `rustc --explain E0503`.
diff --git a/src/test/ui/issue-25826.stderr b/src/test/ui/issue-25826.stderr
index 94cbcf53f43..fed9e8efa84 100644
--- a/src/test/ui/issue-25826.stderr
+++ b/src/test/ui/issue-25826.stderr
@@ -6,4 +6,4 @@ LL |     const A: bool = id::<u8> as *const () < id::<u16> as *const ();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0395"
+For more information about this error, try `rustc --explain E0395`.
diff --git a/src/test/ui/issue-26056.stderr b/src/test/ui/issue-26056.stderr
index c806308562c..51a48af81a1 100644
--- a/src/test/ui/issue-26056.stderr
+++ b/src/test/ui/issue-26056.stderr
@@ -8,4 +8,4 @@ LL |         as &Map<Key=u32,MapValue=u32>;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0038"
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/issue-26093.stderr b/src/test/ui/issue-26093.stderr
index 29ffd9635c6..1abe313bbf6 100644
--- a/src/test/ui/issue-26093.stderr
+++ b/src/test/ui/issue-26093.stderr
@@ -9,4 +9,4 @@ LL |     not_a_place!(99);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0070"
+For more information about this error, try `rustc --explain E0070`.
diff --git a/src/test/ui/issue-26472.stderr b/src/test/ui/issue-26472.stderr
index 345008b4578..26f54f61a7e 100644
--- a/src/test/ui/issue-26472.stderr
+++ b/src/test/ui/issue-26472.stderr
@@ -8,4 +8,4 @@ LL |     let v = s.len;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0616"
+For more information about this error, try `rustc --explain E0616`.
diff --git a/src/test/ui/issue-26638.stderr b/src/test/ui/issue-26638.stderr
index a5fc3ba26d6..cf6fcd9f01c 100644
--- a/src/test/ui/issue-26638.stderr
+++ b/src/test/ui/issue-26638.stderr
@@ -26,4 +26,4 @@ LL | fn parse_type_3() -> &str { unimplemented!() }
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0106"
+For more information about this error, try `rustc --explain E0106`.
diff --git a/src/test/ui/issue-26886.stderr b/src/test/ui/issue-26886.stderr
index dc812d1bae3..75942623941 100644
--- a/src/test/ui/issue-26886.stderr
+++ b/src/test/ui/issue-26886.stderr
@@ -29,4 +29,4 @@ LL | use std::sync as other_sync; //~ ERROR the name `sync` is defined multiple
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0252"
+For more information about this error, try `rustc --explain E0252`.
diff --git a/src/test/ui/issue-27842.stderr b/src/test/ui/issue-27842.stderr
index 98f2b18dc77..026594811e4 100644
--- a/src/test/ui/issue-27842.stderr
+++ b/src/test/ui/issue-27842.stderr
@@ -14,4 +14,4 @@ LL |     let _ = tup[i];
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0608"
+For more information about this error, try `rustc --explain E0608`.
diff --git a/src/test/ui/issue-27942.stderr b/src/test/ui/issue-27942.stderr
index 19654a647c5..879eda0f856 100644
--- a/src/test/ui/issue-27942.stderr
+++ b/src/test/ui/issue-27942.stderr
@@ -38,4 +38,4 @@ LL |     fn select(&self) -> BufferViewHandle<R>;
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/issue-2848.stderr b/src/test/ui/issue-2848.stderr
index 6ab018b0014..8f7ebbf95dd 100644
--- a/src/test/ui/issue-2848.stderr
+++ b/src/test/ui/issue-2848.stderr
@@ -8,4 +8,4 @@ LL |       alpha | beta => {} //~  ERROR variable `beta` is not bound in all pat
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0408"
+For more information about this error, try `rustc --explain E0408`.
diff --git a/src/test/ui/issue-28568.stderr b/src/test/ui/issue-28568.stderr
index fecc5a41b3b..3208074642f 100644
--- a/src/test/ui/issue-28568.stderr
+++ b/src/test/ui/issue-28568.stderr
@@ -9,4 +9,4 @@ LL | impl Drop for MyStruct {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0119"
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/issue-28776.stderr b/src/test/ui/issue-28776.stderr
index e426f05ddf6..3b468a88205 100644
--- a/src/test/ui/issue-28776.stderr
+++ b/src/test/ui/issue-28776.stderr
@@ -6,4 +6,4 @@ LL |     (&ptr::write)(1 as *mut _, 42);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0133"
+For more information about this error, try `rustc --explain E0133`.
diff --git a/src/test/ui/issue-28837.stderr b/src/test/ui/issue-28837.stderr
index 62fc0ebec32..88994eaeb93 100644
--- a/src/test/ui/issue-28837.stderr
+++ b/src/test/ui/issue-28837.stderr
@@ -120,4 +120,4 @@ LL |     a >= a; //~ ERROR binary operation `>=` cannot be applied to type `A`
 
 error: aborting due to 15 previous errors
 
-If you want more information on this error, try using "rustc --explain E0369"
+For more information about this error, try `rustc --explain E0369`.
diff --git a/src/test/ui/issue-28971.stderr b/src/test/ui/issue-28971.stderr
index ebd759a9c3c..81d8d97963b 100644
--- a/src/test/ui/issue-28971.stderr
+++ b/src/test/ui/issue-28971.stderr
@@ -9,4 +9,4 @@ LL |             Foo::Baz(..) => (),
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/issue-29124.stderr b/src/test/ui/issue-29124.stderr
index 091671b2309..bd00772dfd2 100644
--- a/src/test/ui/issue-29124.stderr
+++ b/src/test/ui/issue-29124.stderr
@@ -16,4 +16,4 @@ LL |     func.x();
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/issue-29723.stderr b/src/test/ui/issue-29723.stderr
index 1b4c750471f..48e50b9dea9 100644
--- a/src/test/ui/issue-29723.stderr
+++ b/src/test/ui/issue-29723.stderr
@@ -11,4 +11,4 @@ LL |             s
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0382"
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/issue-3008-1.stderr b/src/test/ui/issue-3008-1.stderr
index 282181d51cd..05c1f2aae81 100644
--- a/src/test/ui/issue-3008-1.stderr
+++ b/src/test/ui/issue-3008-1.stderr
@@ -11,4 +11,4 @@ LL |     BarSome(Bar)
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0072"
+For more information about this error, try `rustc --explain E0072`.
diff --git a/src/test/ui/issue-3008-2.stderr b/src/test/ui/issue-3008-2.stderr
index a015e6d621d..d02fb45be49 100644
--- a/src/test/ui/issue-3008-2.stderr
+++ b/src/test/ui/issue-3008-2.stderr
@@ -10,4 +10,4 @@ LL | struct bar { x: bar }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0072"
+For more information about this error, try `rustc --explain E0072`.
diff --git a/src/test/ui/issue-30255.stderr b/src/test/ui/issue-30255.stderr
index 6a55025d7b1..9556f6d9e23 100644
--- a/src/test/ui/issue-30255.stderr
+++ b/src/test/ui/issue-30255.stderr
@@ -24,4 +24,4 @@ LL | fn h(a: &bool, b: bool, c: &S, d: &i32) -> &i32 {
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0106"
+For more information about this error, try `rustc --explain E0106`.
diff --git a/src/test/ui/issue-30302.stderr b/src/test/ui/issue-30302.stderr
index 6528058428a..42dfdadf9c4 100644
--- a/src/test/ui/issue-30302.stderr
+++ b/src/test/ui/issue-30302.stderr
@@ -23,3 +23,4 @@ LL | #![deny(unreachable_patterns)]
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0170`.
diff --git a/src/test/ui/issue-3044.stderr b/src/test/ui/issue-3044.stderr
index 00f9b302ffb..cdca9be48ac 100644
--- a/src/test/ui/issue-3044.stderr
+++ b/src/test/ui/issue-3044.stderr
@@ -6,4 +6,4 @@ LL |     needlesArr.iter().fold(|x, y| {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0061"
+For more information about this error, try `rustc --explain E0061`.
diff --git a/src/test/ui/issue-32326.stderr b/src/test/ui/issue-32326.stderr
index 290c491b489..1aa99c402ed 100644
--- a/src/test/ui/issue-32326.stderr
+++ b/src/test/ui/issue-32326.stderr
@@ -12,4 +12,4 @@ LL |     Plus(Expr, Expr),
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0072"
+For more information about this error, try `rustc --explain E0072`.
diff --git a/src/test/ui/issue-33525.stderr b/src/test/ui/issue-33525.stderr
index ad308b87b37..2b365e1cc98 100644
--- a/src/test/ui/issue-33525.stderr
+++ b/src/test/ui/issue-33525.stderr
@@ -18,5 +18,5 @@ LL |     "".ipsum; //~ ERROR no field
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0425, E0609
-If you want more information on an error, try using "rustc --explain E0425"
+Some errors occurred: E0425, E0609.
+For more information about an error, try `rustc --explain E0425`.
diff --git a/src/test/ui/issue-33941.stderr b/src/test/ui/issue-33941.stderr
index ef76158682b..f20b87fa371 100644
--- a/src/test/ui/issue-33941.stderr
+++ b/src/test/ui/issue-33941.stderr
@@ -19,4 +19,4 @@ LL |     for _ in HashMap::new().iter().cloned() {} //~ ERROR type mismatch
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0271"
+For more information about this error, try `rustc --explain E0271`.
diff --git a/src/test/ui/issue-34047.stderr b/src/test/ui/issue-34047.stderr
index efd6222db20..10804cc6fff 100644
--- a/src/test/ui/issue-34047.stderr
+++ b/src/test/ui/issue-34047.stderr
@@ -9,4 +9,4 @@ LL |         mut C => {} //~ ERROR match bindings cannot shadow constants
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0530"
+For more information about this error, try `rustc --explain E0530`.
diff --git a/src/test/ui/issue-34209.stderr b/src/test/ui/issue-34209.stderr
index faf3f3856fd..5c31acea5b6 100644
--- a/src/test/ui/issue-34209.stderr
+++ b/src/test/ui/issue-34209.stderr
@@ -8,4 +8,4 @@ LL |         S::B{ } => { },
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0223"
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/issue-35139.stderr b/src/test/ui/issue-35139.stderr
index 79b0ecff94e..7ec1459dd16 100644
--- a/src/test/ui/issue-35139.stderr
+++ b/src/test/ui/issue-35139.stderr
@@ -6,4 +6,4 @@ LL | impl<'a> MethodType for MTFn { //~ ERROR E0207
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0207"
+For more information about this error, try `rustc --explain E0207`.
diff --git a/src/test/ui/issue-35241.stderr b/src/test/ui/issue-35241.stderr
index be0b21f9460..42bf0aae5b1 100644
--- a/src/test/ui/issue-35241.stderr
+++ b/src/test/ui/issue-35241.stderr
@@ -13,4 +13,4 @@ LL | fn test() -> Foo { Foo } //~ ERROR mismatched types
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/issue-35675.stderr b/src/test/ui/issue-35675.stderr
index 84054b532de..fef8de3a28d 100644
--- a/src/test/ui/issue-35675.stderr
+++ b/src/test/ui/issue-35675.stderr
@@ -65,5 +65,5 @@ LL | fn qux() -> Some {
 
 error: aborting due to 7 previous errors
 
-You've got a few errors: E0412, E0425, E0573
-If you want more information on an error, try using "rustc --explain E0412"
+Some errors occurred: E0412, E0425, E0573.
+For more information about an error, try `rustc --explain E0412`.
diff --git a/src/test/ui/issue-35869.stderr b/src/test/ui/issue-35869.stderr
index e90906ee841..fa971c111a4 100644
--- a/src/test/ui/issue-35869.stderr
+++ b/src/test/ui/issue-35869.stderr
@@ -48,4 +48,4 @@ LL |     fn qux() -> u16 { 5u16 }
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0053"
+For more information about this error, try `rustc --explain E0053`.
diff --git a/src/test/ui/issue-36163.stderr b/src/test/ui/issue-36163.stderr
index 4323eb4858f..7ab4bd46ebf 100644
--- a/src/test/ui/issue-36163.stderr
+++ b/src/test/ui/issue-36163.stderr
@@ -28,4 +28,4 @@ LL | const A: isize = Foo::B as isize;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0391"
+For more information about this error, try `rustc --explain E0391`.
diff --git a/src/test/ui/issue-36400.stderr b/src/test/ui/issue-36400.stderr
index 4a632356b4e..dbd6999b4f2 100644
--- a/src/test/ui/issue-36400.stderr
+++ b/src/test/ui/issue-36400.stderr
@@ -8,4 +8,4 @@ LL |     f(&mut *x); //~ ERROR cannot borrow immutable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/issue-36708.stderr b/src/test/ui/issue-36708.stderr
index d2aa5b6c0ec..4e28a769f50 100644
--- a/src/test/ui/issue-36708.stderr
+++ b/src/test/ui/issue-36708.stderr
@@ -6,4 +6,4 @@ LL |     fn foo<T>() {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0049"
+For more information about this error, try `rustc --explain E0049`.
diff --git a/src/test/ui/issue-3779.stderr b/src/test/ui/issue-3779.stderr
index 6dcbabbe39a..f5e89638f16 100644
--- a/src/test/ui/issue-3779.stderr
+++ b/src/test/ui/issue-3779.stderr
@@ -11,4 +11,4 @@ LL |     element: Option<S>
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0072"
+For more information about this error, try `rustc --explain E0072`.
diff --git a/src/test/ui/issue-37884.stderr b/src/test/ui/issue-37884.stderr
index d1f6cb7d922..73fbb2d3203 100644
--- a/src/test/ui/issue-37884.stderr
+++ b/src/test/ui/issue-37884.stderr
@@ -29,4 +29,4 @@ LL | impl<'a, T: 'a> Iterator for RepeatMut<'a, T> {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/issue-40402-ref-hints/issue-40402-1.stderr b/src/test/ui/issue-40402-ref-hints/issue-40402-1.stderr
index 999583dcd31..70be30e4f71 100644
--- a/src/test/ui/issue-40402-ref-hints/issue-40402-1.stderr
+++ b/src/test/ui/issue-40402-ref-hints/issue-40402-1.stderr
@@ -9,4 +9,4 @@ LL |     let e = f.v[0]; //~ ERROR cannot move out of indexed content
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0507"
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/issue-40402-ref-hints/issue-40402-2.stderr b/src/test/ui/issue-40402-ref-hints/issue-40402-2.stderr
index 3703d32be06..4ed28963b5b 100644
--- a/src/test/ui/issue-40402-ref-hints/issue-40402-2.stderr
+++ b/src/test/ui/issue-40402-ref-hints/issue-40402-2.stderr
@@ -9,4 +9,4 @@ LL |     let (a, b) = x[0]; //~ ERROR cannot move out of indexed content
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0507"
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/issue-41652/issue_41652.stderr b/src/test/ui/issue-41652/issue_41652.stderr
index df7b8a6525f..3f76b25692c 100644
--- a/src/test/ui/issue-41652/issue_41652.stderr
+++ b/src/test/ui/issue-41652/issue_41652.stderr
@@ -10,4 +10,4 @@ LL |         3_i32.f()
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0689"
+For more information about this error, try `rustc --explain E0689`.
diff --git a/src/test/ui/issue-42106.stderr b/src/test/ui/issue-42106.stderr
index c9629cc6e61..b8944bb2423 100644
--- a/src/test/ui/issue-42106.stderr
+++ b/src/test/ui/issue-42106.stderr
@@ -10,4 +10,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0502"
+For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/issue-4335.stderr b/src/test/ui/issue-4335.stderr
index 90b94a597a5..80f5b445bb6 100644
--- a/src/test/ui/issue-4335.stderr
+++ b/src/test/ui/issue-4335.stderr
@@ -18,5 +18,5 @@ LL |     id(Box::new(|| *v))
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0373, E0507
-If you want more information on an error, try using "rustc --explain E0373"
+Some errors occurred: E0373, E0507.
+For more information about an error, try `rustc --explain E0373`.
diff --git a/src/test/ui/issue-44023.stderr b/src/test/ui/issue-44023.stderr
index a3dde7321c2..3baf7ec0277 100644
--- a/src/test/ui/issue-44023.stderr
+++ b/src/test/ui/issue-44023.stderr
@@ -11,4 +11,4 @@ LL | | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/issue-45157.stderr b/src/test/ui/issue-45157.stderr
index 07102f68633..e528a84ebd1 100644
--- a/src/test/ui/issue-45157.stderr
+++ b/src/test/ui/issue-45157.stderr
@@ -12,4 +12,4 @@ LL |         println!("{} {}", mref, nref)
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0502"
+For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/issue-45697-1.stderr b/src/test/ui/issue-45697-1.stderr
index 2a6d219267d..aa899c5aee9 100644
--- a/src/test/ui/issue-45697-1.stderr
+++ b/src/test/ui/issue-45697-1.stderr
@@ -16,5 +16,5 @@ LL |         *y.pointer += 1;
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0503, E0506
-If you want more information on an error, try using "rustc --explain E0503"
+Some errors occurred: E0503, E0506.
+For more information about an error, try `rustc --explain E0503`.
diff --git a/src/test/ui/issue-45697.stderr b/src/test/ui/issue-45697.stderr
index 30baded7dad..babfc33b945 100644
--- a/src/test/ui/issue-45697.stderr
+++ b/src/test/ui/issue-45697.stderr
@@ -16,5 +16,5 @@ LL |         *y.pointer += 1;
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0503, E0506
-If you want more information on an error, try using "rustc --explain E0503"
+Some errors occurred: E0503, E0506.
+For more information about an error, try `rustc --explain E0503`.
diff --git a/src/test/ui/issue-45730.stderr b/src/test/ui/issue-45730.stderr
index b10c69f26c5..aa5773e3dbf 100644
--- a/src/test/ui/issue-45730.stderr
+++ b/src/test/ui/issue-45730.stderr
@@ -30,4 +30,4 @@ LL |     let x = 0 as *const i32 as *const _ as *mut _; //~ ERROR cannot cast
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0641"
+For more information about this error, try `rustc --explain E0641`.
diff --git a/src/test/ui/issue-46112.stderr b/src/test/ui/issue-46112.stderr
index 7c679684165..796187b93aa 100644
--- a/src/test/ui/issue-46112.stderr
+++ b/src/test/ui/issue-46112.stderr
@@ -12,4 +12,4 @@ LL | fn main() { test(Ok(())); }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/issue-46332.stderr b/src/test/ui/issue-46332.stderr
index c3b17884676..06553767cc9 100644
--- a/src/test/ui/issue-46332.stderr
+++ b/src/test/ui/issue-46332.stderr
@@ -6,4 +6,4 @@ LL |     TyUInt {};
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0422"
+For more information about this error, try `rustc --explain E0422`.
diff --git a/src/test/ui/issue-46471-1.stderr b/src/test/ui/issue-46471-1.stderr
index b46bcbd6911..bfd5bfa9f72 100644
--- a/src/test/ui/issue-46471-1.stderr
+++ b/src/test/ui/issue-46471-1.stderr
@@ -22,4 +22,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/issue-46471.stderr b/src/test/ui/issue-46471.stderr
index ce2b2c31025..ac974afa13a 100644
--- a/src/test/ui/issue-46471.stderr
+++ b/src/test/ui/issue-46471.stderr
@@ -22,4 +22,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/issue-46472.stderr b/src/test/ui/issue-46472.stderr
index a0d41c961a4..9b55b78b43d 100644
--- a/src/test/ui/issue-46472.stderr
+++ b/src/test/ui/issue-46472.stderr
@@ -30,4 +30,4 @@ LL | fn bar<'a>() -> &'a mut u32 {
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/issue-46983.stderr b/src/test/ui/issue-46983.stderr
index 67c8fa8261f..31aeebd5a72 100644
--- a/src/test/ui/issue-46983.stderr
+++ b/src/test/ui/issue-46983.stderr
@@ -8,4 +8,4 @@ LL |     &*x
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/issue-47377.stderr b/src/test/ui/issue-47377.stderr
index 2de117489c3..66c4a1277a0 100644
--- a/src/test/ui/issue-47377.stderr
+++ b/src/test/ui/issue-47377.stderr
@@ -10,4 +10,4 @@ LL |      let _a = b.to_owned() + ", World!";
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0369"
+For more information about this error, try `rustc --explain E0369`.
diff --git a/src/test/ui/issue-47380.stderr b/src/test/ui/issue-47380.stderr
index 968dc614ad6..585a2ec64d0 100644
--- a/src/test/ui/issue-47380.stderr
+++ b/src/test/ui/issue-47380.stderr
@@ -10,4 +10,4 @@ LL |     println!("🦀🦀🦀🦀🦀"); let _a = b.to_owned() + ", World!";
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0369"
+For more information about this error, try `rustc --explain E0369`.
diff --git a/src/test/ui/issue-47511.stderr b/src/test/ui/issue-47511.stderr
index 2b8ba8794fb..6ee71fc6c73 100644
--- a/src/test/ui/issue-47511.stderr
+++ b/src/test/ui/issue-47511.stderr
@@ -14,4 +14,4 @@ LL | fn g<'a>(_: X<'a>) -> X<'a> {
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0581"
+For more information about this error, try `rustc --explain E0581`.
diff --git a/src/test/ui/issue-47623.stderr b/src/test/ui/issue-47623.stderr
index fd15ce78420..8cbed1c293e 100644
--- a/src/test/ui/issue-47623.stderr
+++ b/src/test/ui/issue-47623.stderr
@@ -6,4 +6,4 @@ LL | use self; //~ERROR `self` imports are only allowed within a { } list
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0429"
+For more information about this error, try `rustc --explain E0429`.
diff --git a/src/test/ui/issue-47706-trait.stderr b/src/test/ui/issue-47706-trait.stderr
index a6a270b057a..542ba501780 100644
--- a/src/test/ui/issue-47706-trait.stderr
+++ b/src/test/ui/issue-47706-trait.stderr
@@ -10,5 +10,5 @@ LL |         None::<()>.map(Self::f);
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0593, E0601
-If you want more information on an error, try using "rustc --explain E0593"
+Some errors occurred: E0593, E0601.
+For more information about an error, try `rustc --explain E0593`.
diff --git a/src/test/ui/issue-47706.stderr b/src/test/ui/issue-47706.stderr
index ef48d4d7aae..0a5c8beccd1 100644
--- a/src/test/ui/issue-47706.stderr
+++ b/src/test/ui/issue-47706.stderr
@@ -28,4 +28,4 @@ LL | | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0593"
+For more information about this error, try `rustc --explain E0593`.
diff --git a/src/test/ui/issue-48276.stderr b/src/test/ui/issue-48276.stderr
index 9273ece2c90..db4894aa691 100644
--- a/src/test/ui/issue-48276.stderr
+++ b/src/test/ui/issue-48276.stderr
@@ -25,4 +25,4 @@ LL |     fn from(&self) -> &'static str {
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0185"
+For more information about this error, try `rustc --explain E0185`.
diff --git a/src/test/ui/issue-4935.stderr b/src/test/ui/issue-4935.stderr
index fb5a2261c1f..25efd54443a 100644
--- a/src/test/ui/issue-4935.stderr
+++ b/src/test/ui/issue-4935.stderr
@@ -9,4 +9,4 @@ LL | fn main() { foo(5, 6) }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0061"
+For more information about this error, try `rustc --explain E0061`.
diff --git a/src/test/ui/issue-5239-1.stderr b/src/test/ui/issue-5239-1.stderr
index 6a640572623..2f9204e72d3 100644
--- a/src/test/ui/issue-5239-1.stderr
+++ b/src/test/ui/issue-5239-1.stderr
@@ -8,4 +8,4 @@ LL |     let x = |ref x: isize| { x += 1; };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0368"
+For more information about this error, try `rustc --explain E0368`.
diff --git a/src/test/ui/issue-6458-3.stderr b/src/test/ui/issue-6458-3.stderr
index 8eb864a878a..c09b2643dfa 100644
--- a/src/test/ui/issue-6458-3.stderr
+++ b/src/test/ui/issue-6458-3.stderr
@@ -6,4 +6,4 @@ LL |     mem::transmute(0);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/issue-6458-4.stderr b/src/test/ui/issue-6458-4.stderr
index 2615085a930..13b0ace6465 100644
--- a/src/test/ui/issue-6458-4.stderr
+++ b/src/test/ui/issue-6458-4.stderr
@@ -13,4 +13,4 @@ LL | | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/issue-6458.stderr b/src/test/ui/issue-6458.stderr
index 058a6ea5c7d..701795c748d 100644
--- a/src/test/ui/issue-6458.stderr
+++ b/src/test/ui/issue-6458.stderr
@@ -6,4 +6,4 @@ LL |    foo(TypeWithState(marker::PhantomData));
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/issue-7813.stderr b/src/test/ui/issue-7813.stderr
index b4291684db4..34837e90e4f 100644
--- a/src/test/ui/issue-7813.stderr
+++ b/src/test/ui/issue-7813.stderr
@@ -8,4 +8,4 @@ LL |     let v = &[]; //~ ERROR type annotations needed
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/lifetime-elision-return-type-requires-explicit-lifetime.stderr b/src/test/ui/lifetime-elision-return-type-requires-explicit-lifetime.stderr
index b8145a893aa..30cff86ed1d 100644
--- a/src/test/ui/lifetime-elision-return-type-requires-explicit-lifetime.stderr
+++ b/src/test/ui/lifetime-elision-return-type-requires-explicit-lifetime.stderr
@@ -52,4 +52,4 @@ LL | fn k<'a, T: WithLifetime<'a>>(_x: T::Output) -> &isize {
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0106"
+For more information about this error, try `rustc --explain E0106`.
diff --git a/src/test/ui/lifetime-errors/42701_one_named_and_one_anonymous.stderr b/src/test/ui/lifetime-errors/42701_one_named_and_one_anonymous.stderr
index 4cf0ad0888b..87cb1748913 100644
--- a/src/test/ui/lifetime-errors/42701_one_named_and_one_anonymous.stderr
+++ b/src/test/ui/lifetime-errors/42701_one_named_and_one_anonymous.stderr
@@ -9,4 +9,4 @@ LL |         &*x //~ ERROR explicit lifetime
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr
index 5b65dffdb38..29163361e23 100644
--- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr
+++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr
@@ -9,4 +9,4 @@ LL |                     other //~ ERROR explicit lifetime
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr
index b11b96595df..e18156179a2 100644
--- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr
+++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr
@@ -8,4 +8,4 @@ LL |     if x > y { x } else { y } //~ ERROR explicit lifetime
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr
index a334f97b3cc..f208fb57f5b 100644
--- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr
+++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr
@@ -8,4 +8,4 @@ LL |     if x > y { x } else { y } //~ ERROR explicit lifetime
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr
index d61292330b8..7604b9a9017 100644
--- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr
+++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr
@@ -8,4 +8,4 @@ LL |    if x > y { x } else { y } //~ ERROR explicit lifetime
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr
index 9efdb33f7e5..83c6ff19867 100644
--- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr
+++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr
@@ -9,4 +9,4 @@ LL |     if true { &self.field } else { x } //~ ERROR explicit lifetime
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr
index f27d869a4d4..0eb8afbb26b 100644
--- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr
+++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr
@@ -11,4 +11,4 @@ LL |         if x > y { x } else { y } //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else.stderr
index d098df514e1..9893eee77e8 100644
--- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else.stderr
+++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else.stderr
@@ -8,4 +8,4 @@ LL |     if x > y { x } else { y } //~ ERROR explicit lifetime
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr
index c72d25fe2a9..b6dfdff60be 100644
--- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr
+++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr
@@ -11,4 +11,4 @@ LL |     x //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr
index 4d9e26c0632..6c32adc11ce 100644
--- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr
+++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr
@@ -11,4 +11,4 @@ LL |         if true { x } else { self } //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex1b-return-no-names-if-else.stderr b/src/test/ui/lifetime-errors/ex1b-return-no-names-if-else.stderr
index 90f21014852..4710ebfa967 100644
--- a/src/test/ui/lifetime-errors/ex1b-return-no-names-if-else.stderr
+++ b/src/test/ui/lifetime-errors/ex1b-return-no-names-if-else.stderr
@@ -8,4 +8,4 @@ LL | fn foo(x: &i32, y: &i32) -> &i32 { //~ ERROR missing lifetime
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0106"
+For more information about this error, try `rustc --explain E0106`.
diff --git a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-2.stderr b/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-2.stderr
index 5d331627691..5c9b7666de6 100644
--- a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-2.stderr
+++ b/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-2.stderr
@@ -8,4 +8,4 @@ LL |     y.push(x); //~ ERROR explicit lifetime
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr b/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr
index d840467835b..4cfb76f85f2 100644
--- a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr
+++ b/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr
@@ -9,4 +9,4 @@ LL |     x.push(y); //~ ERROR explicit lifetime required
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name.stderr b/src/test/ui/lifetime-errors/ex2a-push-one-existing-name.stderr
index a5433ec0834..ede76bca2ba 100644
--- a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name.stderr
+++ b/src/test/ui/lifetime-errors/ex2a-push-one-existing-name.stderr
@@ -8,4 +8,4 @@ LL |     x.push(y); //~ ERROR explicit lifetime
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/lifetime-errors/ex2b-push-no-existing-names.stderr b/src/test/ui/lifetime-errors/ex2b-push-no-existing-names.stderr
index dd220a7e661..9884c0f3511 100644
--- a/src/test/ui/lifetime-errors/ex2b-push-no-existing-names.stderr
+++ b/src/test/ui/lifetime-errors/ex2b-push-no-existing-names.stderr
@@ -8,4 +8,4 @@ LL |     x.push(y); //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex2c-push-inference-variable.stderr b/src/test/ui/lifetime-errors/ex2c-push-inference-variable.stderr
index bba52f408b0..114024c2fb0 100644
--- a/src/test/ui/lifetime-errors/ex2c-push-inference-variable.stderr
+++ b/src/test/ui/lifetime-errors/ex2c-push-inference-variable.stderr
@@ -9,4 +9,4 @@ LL |     x.push(z); //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex2d-push-inference-variable-2.stderr b/src/test/ui/lifetime-errors/ex2d-push-inference-variable-2.stderr
index 673aee256b4..32fc8b42f42 100644
--- a/src/test/ui/lifetime-errors/ex2d-push-inference-variable-2.stderr
+++ b/src/test/ui/lifetime-errors/ex2d-push-inference-variable-2.stderr
@@ -8,4 +8,4 @@ LL |     let a: &mut Vec<Ref<i32>> = x; //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex2e-push-inference-variable-3.stderr b/src/test/ui/lifetime-errors/ex2e-push-inference-variable-3.stderr
index cbe48abbb99..f62848ffa8c 100644
--- a/src/test/ui/lifetime-errors/ex2e-push-inference-variable-3.stderr
+++ b/src/test/ui/lifetime-errors/ex2e-push-inference-variable-3.stderr
@@ -8,4 +8,4 @@ LL |     let a: &mut Vec<Ref<i32>> = x; //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-2.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-2.stderr
index eb7985a565f..f3716c30703 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-2.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-2.stderr
@@ -8,4 +8,4 @@ LL |     v = x; //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-3.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-3.stderr
index e9c156149d4..5a584296d3b 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-3.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-3.stderr
@@ -16,4 +16,4 @@ LL |     z.push((x,y)); //~ ERROR lifetime mismatch
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr
index 19cd661505a..158f40f2969 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr
@@ -8,4 +8,4 @@ LL |     x.b = y.b; //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr
index 52a319fad61..546789eedcb 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr
@@ -10,4 +10,4 @@ LL |     x.a = x.b; //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr
index 121afa47bc1..ccc5e02ab70 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr
@@ -10,4 +10,4 @@ LL |     x.a = x.b; //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr
index 7348b366e80..f69bcb64297 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr
@@ -9,4 +9,4 @@ LL |     x.push(y); //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr
index 5478abfdbc0..f9530c436a0 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr
@@ -8,4 +8,4 @@ LL |     x.push(y); //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr
index 1cde0d83feb..243103e2d18 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr
@@ -8,4 +8,4 @@ LL |     x.push(y); //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr
index ca6c4337b9b..c4dd2823431 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr
@@ -8,4 +8,4 @@ LL |     x.push(y); //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr
index 8bcc7d4a92b..52293e45306 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr
@@ -10,4 +10,4 @@ LL |     y = x.b; //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr
index 80639d9359e..b5d10e573c4 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr
@@ -8,4 +8,4 @@ LL |     y.b = x; //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr
index c0ceefdea17..08913299520 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr
@@ -8,4 +8,4 @@ LL |     y.b = x; //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr
index 28af2905e4a..133611ae489 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr
@@ -8,4 +8,4 @@ LL |     x.b = y; //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr
index ff2492b9436..01ea885b63e 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr
@@ -10,4 +10,4 @@ LL |     x //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr
index b6bd1c5c922..aa5ab540295 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr
@@ -10,4 +10,4 @@ LL |         if true { x } else { self } //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr
index 5a5abf3f98b..8a9ee9a05b8 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr
@@ -8,4 +8,4 @@ LL |   y.push(z); //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr
index b09877ede38..65c9ea4e757 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr
@@ -8,4 +8,4 @@ LL |         x.push(y); //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr
index 9e18c2e11bf..43ca5cd603f 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr
@@ -8,4 +8,4 @@ LL |   y.push(z); //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions.stderr
index d73af970e56..57187a47239 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions.stderr
@@ -8,4 +8,4 @@ LL |     x.push(y); //~ ERROR lifetime mismatch
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/lifetime-errors/liveness-assign-imm-local-notes.stderr b/src/test/ui/lifetime-errors/liveness-assign-imm-local-notes.stderr
index 8a69514932a..43743118966 100644
--- a/src/test/ui/lifetime-errors/liveness-assign-imm-local-notes.stderr
+++ b/src/test/ui/lifetime-errors/liveness-assign-imm-local-notes.stderr
@@ -62,4 +62,4 @@ LL |             x = 2;      //~ ERROR (Ast) [E0384]
 
 error: aborting due to 8 previous errors
 
-If you want more information on this error, try using "rustc --explain E0384"
+For more information about this error, try `rustc --explain E0384`.
diff --git a/src/test/ui/lifetimes/borrowck-let-suggestion.stderr b/src/test/ui/lifetimes/borrowck-let-suggestion.stderr
index aaa01a86d60..c78b09a86a4 100644
--- a/src/test/ui/lifetimes/borrowck-let-suggestion.stderr
+++ b/src/test/ui/lifetimes/borrowck-let-suggestion.stderr
@@ -13,4 +13,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr b/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr
index b58cbfd7b2e..ea79990bbb1 100644
--- a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr
+++ b/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr
@@ -111,5 +111,5 @@ LL | |     }
 
 error: aborting due to 7 previous errors
 
-You've got a few errors: E0309, E0310
-If you want more information on an error, try using "rustc --explain E0309"
+Some errors occurred: E0309, E0310.
+For more information about an error, try `rustc --explain E0309`.
diff --git a/src/test/ui/lint-forbid-attr.stderr b/src/test/ui/lint-forbid-attr.stderr
index 73a40a46c11..aa0c0c1f5c2 100644
--- a/src/test/ui/lint-forbid-attr.stderr
+++ b/src/test/ui/lint-forbid-attr.stderr
@@ -9,4 +9,4 @@ LL | #[allow(deprecated)]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0453"
+For more information about this error, try `rustc --explain E0453`.
diff --git a/src/test/ui/lint/outer-forbid.stderr b/src/test/ui/lint/outer-forbid.stderr
index 62bec0fe7b3..e49dcd4a2d1 100644
--- a/src/test/ui/lint/outer-forbid.stderr
+++ b/src/test/ui/lint/outer-forbid.stderr
@@ -27,4 +27,4 @@ LL | #[allow(bad_style)] //~ ERROR overruled
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0453"
+For more information about this error, try `rustc --explain E0453`.
diff --git a/src/test/ui/lint/use_suggestion_json.stderr b/src/test/ui/lint/use_suggestion_json.stderr
index 00624f7e5ca..b90c5aa3a4b 100644
--- a/src/test/ui/lint/use_suggestion_json.stderr
+++ b/src/test/ui/lint/use_suggestion_json.stderr
@@ -384,7 +384,6 @@ LL | use std::collections::hash_map::Iter;
    |
 and 8 other candidates
 
-If you want more information on this error, try using /"rustc --explain E0412/"
 "
 }
 {
@@ -397,3 +396,12 @@ If you want more information on this error, try using /"rustc --explain E0412/"
 
 "
 }
+{
+  "message": "For more information about this error, try `rustc --explain E0412`.",
+  "code": null,
+  "level": "",
+  "spans": [],
+  "children": [],
+  "rendered": "For more information about this error, try `rustc --explain E0412`.
+"
+}
diff --git a/src/test/ui/liveness-return-last-stmt-semi.stderr b/src/test/ui/liveness-return-last-stmt-semi.stderr
index faf098296e8..1fa001879a0 100644
--- a/src/test/ui/liveness-return-last-stmt-semi.stderr
+++ b/src/test/ui/liveness-return-last-stmt-semi.stderr
@@ -49,4 +49,4 @@ LL | | }
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/loop-break-value-no-repeat.stderr b/src/test/ui/loop-break-value-no-repeat.stderr
index 0f04847df4c..4421f557e42 100644
--- a/src/test/ui/loop-break-value-no-repeat.stderr
+++ b/src/test/ui/loop-break-value-no-repeat.stderr
@@ -10,4 +10,4 @@ LL |         break //~ ERROR `break` with value from a `for` loop
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0571"
+For more information about this error, try `rustc --explain E0571`.
diff --git a/src/test/ui/lub-glb/old-lub-glb-hr.stderr b/src/test/ui/lub-glb/old-lub-glb-hr.stderr
index 0fa6fdae481..9b40062bd57 100644
--- a/src/test/ui/lub-glb/old-lub-glb-hr.stderr
+++ b/src/test/ui/lub-glb/old-lub-glb-hr.stderr
@@ -16,4 +16,4 @@ LL | |     };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/lub-glb/old-lub-glb-object.stderr b/src/test/ui/lub-glb/old-lub-glb-object.stderr
index 49fb063a9c6..6a69e7cc717 100644
--- a/src/test/ui/lub-glb/old-lub-glb-object.stderr
+++ b/src/test/ui/lub-glb/old-lub-glb-object.stderr
@@ -16,4 +16,4 @@ LL | |     };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr b/src/test/ui/macros/macro-backtrace-invalid-internals.stderr
index 58fc3c3a65b..eab6cd23748 100644
--- a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr
+++ b/src/test/ui/macros/macro-backtrace-invalid-internals.stderr
@@ -80,5 +80,5 @@ LL |           2.0_f32.powi(2) //~ ERROR can't call method `powi` on ambiguous n
 
 error: aborting due to 8 previous errors
 
-You've got a few errors: E0599, E0609, E0610, E0689
-If you want more information on an error, try using "rustc --explain E0599"
+Some errors occurred: E0599, E0609, E0610, E0689.
+For more information about an error, try `rustc --explain E0599`.
diff --git a/src/test/ui/macros/macro-backtrace-nested.stderr b/src/test/ui/macros/macro-backtrace-nested.stderr
index a0ed467b5af..a4fe702c0d9 100644
--- a/src/test/ui/macros/macro-backtrace-nested.stderr
+++ b/src/test/ui/macros/macro-backtrace-nested.stderr
@@ -18,4 +18,4 @@ LL |     call_nested_expr_sum!();
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0425"
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/macros/macro_path_as_generic_bound.stderr b/src/test/ui/macros/macro_path_as_generic_bound.stderr
index d573523a5a0..06d22714dd8 100644
--- a/src/test/ui/macros/macro_path_as_generic_bound.stderr
+++ b/src/test/ui/macros/macro_path_as_generic_bound.stderr
@@ -6,4 +6,3 @@ LL | foo!(m::m2::A); //~ ERROR failed to resolve
 
 error: cannot continue compilation due to previous error
 
-If you want more information on this error, try using "rustc --explain E0433"
diff --git a/src/test/ui/macros/span-covering-argument-1.stderr b/src/test/ui/macros/span-covering-argument-1.stderr
index 3343c210d24..c67095d9ee7 100644
--- a/src/test/ui/macros/span-covering-argument-1.stderr
+++ b/src/test/ui/macros/span-covering-argument-1.stderr
@@ -11,4 +11,4 @@ LL |     bad!(foo whatever);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/main-wrong-location.stderr b/src/test/ui/main-wrong-location.stderr
index 0f775dba536..aad68de9ec7 100644
--- a/src/test/ui/main-wrong-location.stderr
+++ b/src/test/ui/main-wrong-location.stderr
@@ -9,4 +9,4 @@ LL |     fn main() { }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0601"
+For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/method-call-err-msg.stderr b/src/test/ui/method-call-err-msg.stderr
index 05d5bde18cf..3e5bbdfa8f8 100644
--- a/src/test/ui/method-call-err-msg.stderr
+++ b/src/test/ui/method-call-err-msg.stderr
@@ -43,5 +43,5 @@ LL |      .take()    //~ ERROR no method named `take` found for type `Foo` in th
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0061, E0599
-If you want more information on an error, try using "rustc --explain E0061"
+Some errors occurred: E0061, E0599.
+For more information about an error, try `rustc --explain E0061`.
diff --git a/src/test/ui/method-missing-call.stderr b/src/test/ui/method-missing-call.stderr
index a5715d4a7ad..82d04cb06dd 100644
--- a/src/test/ui/method-missing-call.stderr
+++ b/src/test/ui/method-missing-call.stderr
@@ -16,4 +16,4 @@ LL |               .filter_map; //~ ERROR attempted to take value of method `fil
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0615"
+For more information about this error, try `rustc --explain E0615`.
diff --git a/src/test/ui/mismatched_types/E0053.stderr b/src/test/ui/mismatched_types/E0053.stderr
index 8256c9328d9..1b16694bf2c 100644
--- a/src/test/ui/mismatched_types/E0053.stderr
+++ b/src/test/ui/mismatched_types/E0053.stderr
@@ -24,4 +24,4 @@ LL |     fn bar(&mut self) { }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0053"
+For more information about this error, try `rustc --explain E0053`.
diff --git a/src/test/ui/mismatched_types/E0409.stderr b/src/test/ui/mismatched_types/E0409.stderr
index 93cea816824..a1bfcafe053 100644
--- a/src/test/ui/mismatched_types/E0409.stderr
+++ b/src/test/ui/mismatched_types/E0409.stderr
@@ -17,5 +17,5 @@ LL |         (0, ref y) | (y, 0) => {} //~ ERROR E0409
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0308, E0409
-If you want more information on an error, try using "rustc --explain E0308"
+Some errors occurred: E0308, E0409.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/mismatched_types/E0631.stderr b/src/test/ui/mismatched_types/E0631.stderr
index 4560771f21e..647e0a215aa 100644
--- a/src/test/ui/mismatched_types/E0631.stderr
+++ b/src/test/ui/mismatched_types/E0631.stderr
@@ -58,4 +58,4 @@ LL | fn bar<F: Fn<usize>>(_: F) {}
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0631"
+For more information about this error, try `rustc --explain E0631`.
diff --git a/src/test/ui/mismatched_types/abridged.stderr b/src/test/ui/mismatched_types/abridged.stderr
index 423b460e31d..1b2ea514f3e 100644
--- a/src/test/ui/mismatched_types/abridged.stderr
+++ b/src/test/ui/mismatched_types/abridged.stderr
@@ -68,4 +68,4 @@ LL |     x //~ ERROR mismatched types
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/mismatched_types/binops.stderr b/src/test/ui/mismatched_types/binops.stderr
index 75950c0f6d3..9d23b256fd3 100644
--- a/src/test/ui/mismatched_types/binops.stderr
+++ b/src/test/ui/mismatched_types/binops.stderr
@@ -48,4 +48,4 @@ LL |     6 == Ok(1); //~ ERROR is not satisfied
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/mismatched_types/cast-rfc0401.stderr b/src/test/ui/mismatched_types/cast-rfc0401.stderr
index a4e5a897e49..7931e7ff07f 100644
--- a/src/test/ui/mismatched_types/cast-rfc0401.stderr
+++ b/src/test/ui/mismatched_types/cast-rfc0401.stderr
@@ -248,5 +248,5 @@ LL |     vec![0.0].iter().map(|s| s as f32).collect::<Vec<f32>>(); //~ ERROR is
 
 error: aborting due to 34 previous errors
 
-You've got a few errors: E0054, E0277, E0604, E0605, E0606, E0607, E0609
-If you want more information on an error, try using "rustc --explain E0054"
+Some errors occurred: E0054, E0277, E0604, E0605, E0606, E0607, E0609.
+For more information about an error, try `rustc --explain E0054`.
diff --git a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr b/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr
index 46cb027c907..262c4aa1a7c 100644
--- a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr
+++ b/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr
@@ -12,4 +12,4 @@ LL |     m.iter().map( |(_, b)| {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0593"
+For more information about this error, try `rustc --explain E0593`.
diff --git a/src/test/ui/mismatched_types/closure-arg-count.stderr b/src/test/ui/mismatched_types/closure-arg-count.stderr
index 0370c2596cc..6451c0d06fa 100644
--- a/src/test/ui/mismatched_types/closure-arg-count.stderr
+++ b/src/test/ui/mismatched_types/closure-arg-count.stderr
@@ -118,4 +118,4 @@ LL |     let _it = vec![1, 2, 3].into_iter().map(usize::checked_add);
 
 error: aborting due to 12 previous errors
 
-If you want more information on this error, try using "rustc --explain E0593"
+For more information about this error, try `rustc --explain E0593`.
diff --git a/src/test/ui/mismatched_types/closure-arg-type-mismatch.stderr b/src/test/ui/mismatched_types/closure-arg-type-mismatch.stderr
index b37779dd093..62e646c8d39 100644
--- a/src/test/ui/mismatched_types/closure-arg-type-mismatch.stderr
+++ b/src/test/ui/mismatched_types/closure-arg-type-mismatch.stderr
@@ -51,5 +51,5 @@ LL | fn baz<F: Fn(*mut &u32)>(_: F) {}
 
 error: aborting due to 5 previous errors
 
-You've got a few errors: E0271, E0631
-If you want more information on an error, try using "rustc --explain E0271"
+Some errors occurred: E0271, E0631.
+For more information about an error, try `rustc --explain E0271`.
diff --git a/src/test/ui/mismatched_types/closure-mismatch.stderr b/src/test/ui/mismatched_types/closure-mismatch.stderr
index 3950242e27b..cb03d0ea4cc 100644
--- a/src/test/ui/mismatched_types/closure-mismatch.stderr
+++ b/src/test/ui/mismatched_types/closure-mismatch.stderr
@@ -28,5 +28,5 @@ LL | fn baz<T: Foo>(_: T) {}
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0271, E0631
-If you want more information on an error, try using "rustc --explain E0271"
+Some errors occurred: E0271, E0631.
+For more information about an error, try `rustc --explain E0271`.
diff --git a/src/test/ui/mismatched_types/const-fn-in-trait.stderr b/src/test/ui/mismatched_types/const-fn-in-trait.stderr
index 453f1d9e614..ba248e076d4 100644
--- a/src/test/ui/mismatched_types/const-fn-in-trait.stderr
+++ b/src/test/ui/mismatched_types/const-fn-in-trait.stderr
@@ -12,4 +12,4 @@ LL |     const fn f() -> u32 { 22 } //~ ERROR cannot be declared const
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0379"
+For more information about this error, try `rustc --explain E0379`.
diff --git a/src/test/ui/mismatched_types/fn-variance-1.stderr b/src/test/ui/mismatched_types/fn-variance-1.stderr
index d62026f7520..221ee79bd67 100644
--- a/src/test/ui/mismatched_types/fn-variance-1.stderr
+++ b/src/test/ui/mismatched_types/fn-variance-1.stderr
@@ -30,4 +30,4 @@ LL | fn apply<T, F>(t: T, f: F) where F: FnOnce(T) {
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0631"
+For more information about this error, try `rustc --explain E0631`.
diff --git a/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr b/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr
index e28e3f12bf7..1fed5288397 100644
--- a/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr
+++ b/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr
@@ -9,4 +9,4 @@ LL |         x //~ ERROR mismatched types
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/mismatched_types/issue-19109.stderr b/src/test/ui/mismatched_types/issue-19109.stderr
index c52048919b3..c838c617ae4 100644
--- a/src/test/ui/mismatched_types/issue-19109.stderr
+++ b/src/test/ui/mismatched_types/issue-19109.stderr
@@ -11,4 +11,4 @@ LL |     t as *mut Trait
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/mismatched_types/issue-26480.stderr b/src/test/ui/mismatched_types/issue-26480.stderr
index f07cb2f7314..ff047a28adc 100644
--- a/src/test/ui/mismatched_types/issue-26480.stderr
+++ b/src/test/ui/mismatched_types/issue-26480.stderr
@@ -20,5 +20,5 @@ LL |     cast!(2);
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0308, E0605
-If you want more information on an error, try using "rustc --explain E0308"
+Some errors occurred: E0308, E0605.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/mismatched_types/issue-35030.stderr b/src/test/ui/mismatched_types/issue-35030.stderr
index df573df67d4..062bda4468a 100644
--- a/src/test/ui/mismatched_types/issue-35030.stderr
+++ b/src/test/ui/mismatched_types/issue-35030.stderr
@@ -9,4 +9,4 @@ LL |         Some(true) //~ ERROR mismatched types
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/mismatched_types/issue-36053-2.stderr b/src/test/ui/mismatched_types/issue-36053-2.stderr
index bd1a930baa9..86a92a70287 100644
--- a/src/test/ui/mismatched_types/issue-36053-2.stderr
+++ b/src/test/ui/mismatched_types/issue-36053-2.stderr
@@ -18,5 +18,5 @@ LL |     once::<&str>("str").fuse().filter(|a: &str| true).count();
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0599, E0631
-If you want more information on an error, try using "rustc --explain E0599"
+Some errors occurred: E0599, E0631.
+For more information about an error, try `rustc --explain E0599`.
diff --git a/src/test/ui/mismatched_types/issue-38371.stderr b/src/test/ui/mismatched_types/issue-38371.stderr
index bba216b1e8c..1bf1521e39e 100644
--- a/src/test/ui/mismatched_types/issue-38371.stderr
+++ b/src/test/ui/mismatched_types/issue-38371.stderr
@@ -35,5 +35,5 @@ LL | fn ugh(&[bar]: &u32) { //~ ERROR expected an array or slice
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0308, E0529
-If you want more information on an error, try using "rustc --explain E0308"
+Some errors occurred: E0308, E0529.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/mismatched_types/main.stderr b/src/test/ui/mismatched_types/main.stderr
index 7793a38b38e..ce6f2ee6e05 100644
--- a/src/test/ui/mismatched_types/main.stderr
+++ b/src/test/ui/mismatched_types/main.stderr
@@ -11,4 +11,4 @@ LL | |     );
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr b/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr
index d84b8474ded..471c15f6d72 100644
--- a/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr
+++ b/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr
@@ -9,4 +9,4 @@ LL |     a.unwrap();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/mismatched_types/overloaded-calls-bad.stderr b/src/test/ui/mismatched_types/overloaded-calls-bad.stderr
index 830eec48d11..d841a340431 100644
--- a/src/test/ui/mismatched_types/overloaded-calls-bad.stderr
+++ b/src/test/ui/mismatched_types/overloaded-calls-bad.stderr
@@ -21,5 +21,5 @@ LL |     let ans = s("burma", "shave");
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0057, E0308
-If you want more information on an error, try using "rustc --explain E0057"
+Some errors occurred: E0057, E0308.
+For more information about an error, try `rustc --explain E0057`.
diff --git a/src/test/ui/mismatched_types/trait-bounds-cant-coerce.stderr b/src/test/ui/mismatched_types/trait-bounds-cant-coerce.stderr
index e922b203adf..bbe9053430a 100644
--- a/src/test/ui/mismatched_types/trait-bounds-cant-coerce.stderr
+++ b/src/test/ui/mismatched_types/trait-bounds-cant-coerce.stderr
@@ -9,4 +9,4 @@ LL |     a(x); //~ ERROR mismatched types [E0308]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
index 0460ec3194a..28b16641e4d 100644
--- a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
+++ b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
@@ -24,4 +24,4 @@ LL |     fn bar(&mut self, bar: &Bar) { } //~ ERROR incompatible type
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0053"
+For more information about this error, try `rustc --explain E0053`.
diff --git a/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr b/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr
index cac85e7fbac..762f0744d80 100644
--- a/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr
+++ b/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr
@@ -15,4 +15,4 @@ LL | fn call_it<F:FnMut(isize,isize)->isize>(y: isize, mut f: F) -> isize {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0631"
+For more information about this error, try `rustc --explain E0631`.
diff --git a/src/test/ui/missing-items/issue-40221.stderr b/src/test/ui/missing-items/issue-40221.stderr
index cb30805ce2f..81c9f40f6cf 100644
--- a/src/test/ui/missing-items/issue-40221.stderr
+++ b/src/test/ui/missing-items/issue-40221.stderr
@@ -6,4 +6,4 @@ LL |     match proto { //~ ERROR non-exhaustive patterns
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0004"
+For more information about this error, try `rustc --explain E0004`.
diff --git a/src/test/ui/missing-items/m2.stderr b/src/test/ui/missing-items/m2.stderr
index aebe25ab492..1e4b47b44fa 100644
--- a/src/test/ui/missing-items/m2.stderr
+++ b/src/test/ui/missing-items/m2.stderr
@@ -12,5 +12,5 @@ LL | impl m1::X for X { //~ ERROR not all trait items implemented
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0046, E0601
-If you want more information on an error, try using "rustc --explain E0046"
+Some errors occurred: E0046, E0601.
+For more information about an error, try `rustc --explain E0046`.
diff --git a/src/test/ui/missing-items/missing-type-parameter.stderr b/src/test/ui/missing-items/missing-type-parameter.stderr
index c2798af66f2..a27e8aac28f 100644
--- a/src/test/ui/missing-items/missing-type-parameter.stderr
+++ b/src/test/ui/missing-items/missing-type-parameter.stderr
@@ -6,4 +6,4 @@ LL |     foo(); //~ ERROR type annotations needed
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr b/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr
index 1df422730ec..f494af0ff3e 100644
--- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr
+++ b/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr
@@ -8,4 +8,4 @@ LL | mod missing;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0583"
+For more information about this error, try `rustc --explain E0583`.
diff --git a/src/test/ui/moves-based-on-type-block-bad.stderr b/src/test/ui/moves-based-on-type-block-bad.stderr
index fd83309274d..f1b88292410 100644
--- a/src/test/ui/moves-based-on-type-block-bad.stderr
+++ b/src/test/ui/moves-based-on-type-block-bad.stderr
@@ -9,4 +9,4 @@ LL |                 box E::Bar(x) => println!("{}", x.to_string()),
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0507"
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/moves-based-on-type-match-bindings.stderr b/src/test/ui/moves-based-on-type-match-bindings.stderr
index 1c33004d8f6..62e16df583f 100644
--- a/src/test/ui/moves-based-on-type-match-bindings.stderr
+++ b/src/test/ui/moves-based-on-type-match-bindings.stderr
@@ -11,4 +11,4 @@ LL |     touch(&x); //~ ERROR use of partially moved value: `x`
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0382"
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/moves-based-on-type-tuple.stderr b/src/test/ui/moves-based-on-type-tuple.stderr
index a614b33c63e..b0a3b6bf1fd 100644
--- a/src/test/ui/moves-based-on-type-tuple.stderr
+++ b/src/test/ui/moves-based-on-type-tuple.stderr
@@ -20,4 +20,4 @@ LL |     box (x, x)
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0382"
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/nested_impl_trait.stderr b/src/test/ui/nested_impl_trait.stderr
index b3e61e74bbb..10d767db8d3 100644
--- a/src/test/ui/nested_impl_trait.stderr
+++ b/src/test/ui/nested_impl_trait.stderr
@@ -48,5 +48,5 @@ LL | fn allowed_in_ret_type() -> impl Fn() -> impl Into<u32> {
 
 error: aborting due to 6 previous errors
 
-You've got a few errors: E0562, E0666
-If you want more information on an error, try using "rustc --explain E0562"
+Some errors occurred: E0562, E0666.
+For more information about an error, try `rustc --explain E0562`.
diff --git a/src/test/ui/nll/borrowed-local-error.stderr b/src/test/ui/nll/borrowed-local-error.stderr
index 24964f651f7..901b1ca271a 100644
--- a/src/test/ui/nll/borrowed-local-error.stderr
+++ b/src/test/ui/nll/borrowed-local-error.stderr
@@ -14,4 +14,4 @@ LL | |     });
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/borrowed-match-issue-45045.stderr b/src/test/ui/nll/borrowed-match-issue-45045.stderr
index a80bc686e34..7904e601579 100644
--- a/src/test/ui/nll/borrowed-match-issue-45045.stderr
+++ b/src/test/ui/nll/borrowed-match-issue-45045.stderr
@@ -27,4 +27,4 @@ LL |     *g = Xyz::B;
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0503"
+For more information about this error, try `rustc --explain E0503`.
diff --git a/src/test/ui/nll/borrowed-referent-issue-38899.stderr b/src/test/ui/nll/borrowed-referent-issue-38899.stderr
index 675f85ecb4d..5c5a66e7e21 100644
--- a/src/test/ui/nll/borrowed-referent-issue-38899.stderr
+++ b/src/test/ui/nll/borrowed-referent-issue-38899.stderr
@@ -12,4 +12,4 @@ LL |     drop(x);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0502"
+For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/nll/borrowed-temporary-error.stderr b/src/test/ui/nll/borrowed-temporary-error.stderr
index 575d9b5a62d..37746a173eb 100644
--- a/src/test/ui/nll/borrowed-temporary-error.stderr
+++ b/src/test/ui/nll/borrowed-temporary-error.stderr
@@ -11,4 +11,4 @@ LL |     println!("{:?}", x);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/borrowed-universal-error-2.stderr b/src/test/ui/nll/borrowed-universal-error-2.stderr
index 2e4d7cc8f81..467b02d207d 100644
--- a/src/test/ui/nll/borrowed-universal-error-2.stderr
+++ b/src/test/ui/nll/borrowed-universal-error-2.stderr
@@ -15,4 +15,4 @@ LL | fn foo<'a>(x: &'a (u32,)) -> &'a u32 {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/borrowed-universal-error.stderr b/src/test/ui/nll/borrowed-universal-error.stderr
index 3e9a3ceb1db..94d9bb36fa4 100644
--- a/src/test/ui/nll/borrowed-universal-error.stderr
+++ b/src/test/ui/nll/borrowed-universal-error.stderr
@@ -15,4 +15,4 @@ LL | fn foo<'a>(x: &'a (u32,)) -> &'a u32 {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/capture-ref-in-struct.stderr b/src/test/ui/nll/capture-ref-in-struct.stderr
index 0fb71807584..81946de612a 100644
--- a/src/test/ui/nll/capture-ref-in-struct.stderr
+++ b/src/test/ui/nll/capture-ref-in-struct.stderr
@@ -12,4 +12,4 @@ LL |     deref(p);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/closure-requirements/escape-argument.stderr b/src/test/ui/nll/closure-requirements/escape-argument.stderr
index 18ffdc58349..a9a52aba842 100644
--- a/src/test/ui/nll/closure-requirements/escape-argument.stderr
+++ b/src/test/ui/nll/closure-requirements/escape-argument.stderr
@@ -37,4 +37,4 @@ LL |     deref(p);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr b/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr
index 7b2b2f74872..a7fb9d90a21 100644
--- a/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr
+++ b/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr
@@ -64,4 +64,4 @@ LL |       deref(p);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr b/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr
index 0a45603a42c..fd6b7a2e68d 100644
--- a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr
+++ b/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr
@@ -41,4 +41,4 @@ LL |     deref(p);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr
index 798f222c136..947b95b1c53 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr
@@ -49,4 +49,4 @@ LL | | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
index 86653138a18..d39cdc34471 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
@@ -83,4 +83,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr
index 6eb0926b1c8..475fdd94781 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr
@@ -49,4 +49,4 @@ LL | | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr b/src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr
index dfe4e5f844e..5bdfc7e935f 100644
--- a/src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr
@@ -60,4 +60,4 @@ LL | | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0309"
+For more information about this error, try `rustc --explain E0309`.
diff --git a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr b/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr
index a162d754def..1e93ae1ee07 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr
+++ b/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr
@@ -14,4 +14,4 @@ LL |     &*x
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr b/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr
index f8bf188e789..3af6d7d21f7 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr
+++ b/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr
@@ -16,4 +16,4 @@ LL |     &*x
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0623"
+For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/nll/drop-no-may-dangle.stderr b/src/test/ui/nll/drop-no-may-dangle.stderr
index bbb9c0051bc..6454413901b 100644
--- a/src/test/ui/nll/drop-no-may-dangle.stderr
+++ b/src/test/ui/nll/drop-no-may-dangle.stderr
@@ -23,4 +23,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0506"
+For more information about this error, try `rustc --explain E0506`.
diff --git a/src/test/ui/nll/get_default.stderr b/src/test/ui/nll/get_default.stderr
index 37c9a10cf92..064fd38b872 100644
--- a/src/test/ui/nll/get_default.stderr
+++ b/src/test/ui/nll/get_default.stderr
@@ -48,4 +48,4 @@ LL |                 return v;
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0502"
+For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/nll/guarantor-issue-46974.stderr b/src/test/ui/nll/guarantor-issue-46974.stderr
index 82c5e8dafdc..3cb20cc975f 100644
--- a/src/test/ui/nll/guarantor-issue-46974.stderr
+++ b/src/test/ui/nll/guarantor-issue-46974.stderr
@@ -20,5 +20,5 @@ LL |     &s.0 //~ ERROR explicit lifetime required in the type of `s` [E0621]
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0506, E0621
-If you want more information on an error, try using "rustc --explain E0506"
+Some errors occurred: E0506, E0621.
+For more information about an error, try `rustc --explain E0506`.
diff --git a/src/test/ui/nll/issue-31567.stderr b/src/test/ui/nll/issue-31567.stderr
index e0ff653e2b4..579dc7eba8c 100644
--- a/src/test/ui/nll/issue-31567.stderr
+++ b/src/test/ui/nll/issue-31567.stderr
@@ -15,4 +15,4 @@ LL | fn get_dangling<'a>(v: VecWrapper<'a>) -> &'a u32 {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/issue-47470.stderr b/src/test/ui/nll/issue-47470.stderr
index 1356461a6e4..f84a68d85b9 100644
--- a/src/test/ui/nll/issue-47470.stderr
+++ b/src/test/ui/nll/issue-47470.stderr
@@ -14,4 +14,4 @@ LL | impl<'a> Bar for Foo<'a> {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr b/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr
index d34b8184e6d..327454ee60e 100644
--- a/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr
+++ b/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr
@@ -12,4 +12,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0506"
+For more information about this error, try `rustc --explain E0506`.
diff --git a/src/test/ui/nll/maybe-initialized-drop-with-fragment.stderr b/src/test/ui/nll/maybe-initialized-drop-with-fragment.stderr
index ed81aa6006a..54be12f2895 100644
--- a/src/test/ui/nll/maybe-initialized-drop-with-fragment.stderr
+++ b/src/test/ui/nll/maybe-initialized-drop-with-fragment.stderr
@@ -11,4 +11,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0506"
+For more information about this error, try `rustc --explain E0506`.
diff --git a/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr b/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr
index 96eb2afd5b1..ee926e42793 100644
--- a/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr
+++ b/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr
@@ -12,4 +12,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0506"
+For more information about this error, try `rustc --explain E0506`.
diff --git a/src/test/ui/nll/maybe-initialized-drop.stderr b/src/test/ui/nll/maybe-initialized-drop.stderr
index 1e4851d10da..cc842c29ccb 100644
--- a/src/test/ui/nll/maybe-initialized-drop.stderr
+++ b/src/test/ui/nll/maybe-initialized-drop.stderr
@@ -10,4 +10,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0506"
+For more information about this error, try `rustc --explain E0506`.
diff --git a/src/test/ui/nll/return-ref-mut-issue-46557.stderr b/src/test/ui/nll/return-ref-mut-issue-46557.stderr
index 2184beac99b..f40e38c63f5 100644
--- a/src/test/ui/nll/return-ref-mut-issue-46557.stderr
+++ b/src/test/ui/nll/return-ref-mut-issue-46557.stderr
@@ -14,4 +14,4 @@ LL | | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/nll/trait-associated-constant.stderr b/src/test/ui/nll/trait-associated-constant.stderr
index 990b5faf347..2c3fd091f9a 100644
--- a/src/test/ui/nll/trait-associated-constant.stderr
+++ b/src/test/ui/nll/trait-associated-constant.stderr
@@ -38,4 +38,4 @@ LL | impl<'a: 'b, 'b> Anything<'a, 'b> for FailStruct2 {
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/nll/ty-outlives/impl-trait-captures.stderr b/src/test/ui/nll/ty-outlives/impl-trait-captures.stderr
index 3b75b8d7027..bfa58bfc807 100644
--- a/src/test/ui/nll/ty-outlives/impl-trait-captures.stderr
+++ b/src/test/ui/nll/ty-outlives/impl-trait-captures.stderr
@@ -14,4 +14,4 @@ LL |     x
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0621"
+For more information about this error, try `rustc --explain E0621`.
diff --git a/src/test/ui/nll/ty-outlives/impl-trait-outlives.stderr b/src/test/ui/nll/ty-outlives/impl-trait-outlives.stderr
index 33abfb5c3a1..f29d2233e70 100644
--- a/src/test/ui/nll/ty-outlives/impl-trait-outlives.stderr
+++ b/src/test/ui/nll/ty-outlives/impl-trait-outlives.stderr
@@ -28,4 +28,4 @@ LL |     x
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0309"
+For more information about this error, try `rustc --explain E0309`.
diff --git a/src/test/ui/nll/ty-outlives/projection-implied-bounds.stderr b/src/test/ui/nll/ty-outlives/projection-implied-bounds.stderr
index 2ad715e0c5b..fa53967ed3a 100644
--- a/src/test/ui/nll/ty-outlives/projection-implied-bounds.stderr
+++ b/src/test/ui/nll/ty-outlives/projection-implied-bounds.stderr
@@ -14,4 +14,4 @@ LL |     twice(value, |value_ref, item| invoke2(value_ref, item));
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0310"
+For more information about this error, try `rustc --explain E0310`.
diff --git a/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr b/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr
index a580502f175..bcdf984f65a 100644
--- a/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr
+++ b/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr
@@ -159,4 +159,4 @@ LL | | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0309"
+For more information about this error, try `rustc --explain E0309`.
diff --git a/src/test/ui/nll/ty-outlives/projection-no-regions-fn.stderr b/src/test/ui/nll/ty-outlives/projection-no-regions-fn.stderr
index 05385c16bdc..95851e7edc7 100644
--- a/src/test/ui/nll/ty-outlives/projection-no-regions-fn.stderr
+++ b/src/test/ui/nll/ty-outlives/projection-no-regions-fn.stderr
@@ -28,4 +28,4 @@ LL |     Box::new(x.next())
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0309"
+For more information about this error, try `rustc --explain E0309`.
diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr b/src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr
index f557b448cec..aa45cf18701 100644
--- a/src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr
+++ b/src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr
@@ -198,4 +198,4 @@ LL | | }
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0309"
+For more information about this error, try `rustc --explain E0309`.
diff --git a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr b/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr
index 4fc0dffa675..c7cbdaec339 100644
--- a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr
+++ b/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr
@@ -330,4 +330,4 @@ LL | | }
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0309"
+For more information about this error, try `rustc --explain E0309`.
diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr b/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr
index ab3c4006459..997cc57cfa2 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr
+++ b/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr
@@ -85,4 +85,4 @@ LL | | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0309"
+For more information about this error, try `rustc --explain E0309`.
diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr
index 76ccb13e53e..ba08bc1ff7b 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr
+++ b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr
@@ -60,4 +60,4 @@ LL |     x
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0309"
+For more information about this error, try `rustc --explain E0309`.
diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr
index 83d2b959c80..fcdb0b0a4a9 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr
+++ b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr
@@ -193,4 +193,4 @@ LL | | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0309"
+For more information about this error, try `rustc --explain E0309`.
diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.stderr b/src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.stderr
index bdbde6c4ac0..1510ca61e5c 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.stderr
+++ b/src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.stderr
@@ -8,4 +8,4 @@ LL |     outlives(cell, t)
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0309"
+For more information about this error, try `rustc --explain E0309`.
diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn-body.stderr b/src/test/ui/nll/ty-outlives/ty-param-fn-body.stderr
index 21ca9e38103..34ed709a273 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-fn-body.stderr
+++ b/src/test/ui/nll/ty-outlives/ty-param-fn-body.stderr
@@ -14,4 +14,4 @@ LL |     outlives(cell, t)
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0309"
+For more information about this error, try `rustc --explain E0309`.
diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn.stderr b/src/test/ui/nll/ty-outlives/ty-param-fn.stderr
index 9fe074a299d..98ccfc52029 100644
--- a/src/test/ui/nll/ty-outlives/ty-param-fn.stderr
+++ b/src/test/ui/nll/ty-outlives/ty-param-fn.stderr
@@ -28,4 +28,4 @@ LL |     x
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0309"
+For more information about this error, try `rustc --explain E0309`.
diff --git a/src/test/ui/no-patterns-in-args.stderr b/src/test/ui/no-patterns-in-args.stderr
index e0e5ed07ef2..8ac1cced28f 100644
--- a/src/test/ui/no-patterns-in-args.stderr
+++ b/src/test/ui/no-patterns-in-args.stderr
@@ -30,5 +30,5 @@ LL | type A2 = fn(&arg: u8); //~ ERROR patterns aren't allowed in function point
 
 error: aborting due to 5 previous errors
 
-You've got a few errors: E0130, E0561
-If you want more information on an error, try using "rustc --explain E0130"
+Some errors occurred: E0130, E0561.
+For more information about an error, try `rustc --explain E0130`.
diff --git a/src/test/ui/non-constant-expr-for-arr-len.stderr b/src/test/ui/non-constant-expr-for-arr-len.stderr
index 6e9bafa5a4c..9504c84b10e 100644
--- a/src/test/ui/non-constant-expr-for-arr-len.stderr
+++ b/src/test/ui/non-constant-expr-for-arr-len.stderr
@@ -6,4 +6,4 @@ LL |         let _x = [0; n];
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0435"
+For more information about this error, try `rustc --explain E0435`.
diff --git a/src/test/ui/non-exhaustive-pattern-witness.stderr b/src/test/ui/non-exhaustive-pattern-witness.stderr
index 74bf0e256e3..7179b4b135a 100644
--- a/src/test/ui/non-exhaustive-pattern-witness.stderr
+++ b/src/test/ui/non-exhaustive-pattern-witness.stderr
@@ -42,4 +42,4 @@ LL |     match ((), false) {
 
 error: aborting due to 7 previous errors
 
-If you want more information on this error, try using "rustc --explain E0004"
+For more information about this error, try `rustc --explain E0004`.
diff --git a/src/test/ui/non_modrs_mods/non_modrs_mods.stderr b/src/test/ui/non_modrs_mods/non_modrs_mods.stderr
index d4ca6f53feb..c45ab734fd5 100644
--- a/src/test/ui/non_modrs_mods/non_modrs_mods.stderr
+++ b/src/test/ui/non_modrs_mods/non_modrs_mods.stderr
@@ -36,4 +36,4 @@ LL | pub mod innest;
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/not-enough-arguments.stderr b/src/test/ui/not-enough-arguments.stderr
index a39070cef1f..6a869cc5d55 100644
--- a/src/test/ui/not-enough-arguments.stderr
+++ b/src/test/ui/not-enough-arguments.stderr
@@ -9,4 +9,4 @@ LL |   foo(1, 2, 3);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0061"
+For more information about this error, try `rustc --explain E0061`.
diff --git a/src/test/ui/numeric-fields.stderr b/src/test/ui/numeric-fields.stderr
index bed94e8f09a..607980ba3bf 100644
--- a/src/test/ui/numeric-fields.stderr
+++ b/src/test/ui/numeric-fields.stderr
@@ -14,5 +14,5 @@ LL |         S{0: a, 0x1: b, ..} => {}
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0026, E0560
-If you want more information on an error, try using "rustc --explain E0026"
+Some errors occurred: E0026, E0560.
+For more information about an error, try `rustc --explain E0026`.
diff --git a/src/test/ui/object-safety-associated-consts.stderr b/src/test/ui/object-safety-associated-consts.stderr
index 71a2a499267..39ec5a64e93 100644
--- a/src/test/ui/object-safety-associated-consts.stderr
+++ b/src/test/ui/object-safety-associated-consts.stderr
@@ -8,4 +8,4 @@ LL | fn make_bar<T:Bar>(t: &T) -> &Bar {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0038"
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/object-safety-generics.stderr b/src/test/ui/object-safety-generics.stderr
index e10a2c6b124..e5dfa666630 100644
--- a/src/test/ui/object-safety-generics.stderr
+++ b/src/test/ui/object-safety-generics.stderr
@@ -16,4 +16,4 @@ LL | fn make_bar_explicit<T:Bar>(t: &T) -> &Bar {
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0038"
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/object-safety-mentions-Self.stderr b/src/test/ui/object-safety-mentions-Self.stderr
index a1690d60ff2..b181be95a54 100644
--- a/src/test/ui/object-safety-mentions-Self.stderr
+++ b/src/test/ui/object-safety-mentions-Self.stderr
@@ -16,4 +16,4 @@ LL | fn make_baz<T:Baz>(t: &T) -> &Baz {
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0038"
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/object-safety-sized.stderr b/src/test/ui/object-safety-sized.stderr
index 994dd943c76..a6dd16666c6 100644
--- a/src/test/ui/object-safety-sized.stderr
+++ b/src/test/ui/object-safety-sized.stderr
@@ -8,4 +8,4 @@ LL | fn make_bar<T:Bar>(t: &T) -> &Bar {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0038"
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/object-safety-supertrait-mentions-Self.stderr b/src/test/ui/object-safety-supertrait-mentions-Self.stderr
index d2ca35ced9d..f562bc6c54f 100644
--- a/src/test/ui/object-safety-supertrait-mentions-Self.stderr
+++ b/src/test/ui/object-safety-supertrait-mentions-Self.stderr
@@ -8,4 +8,4 @@ LL | fn make_baz<T:Baz>(t: &T) -> &Baz {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0038"
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/on-unimplemented/bad-annotation.stderr b/src/test/ui/on-unimplemented/bad-annotation.stderr
index ce4dcfb906d..c3738375738 100644
--- a/src/test/ui/on-unimplemented/bad-annotation.stderr
+++ b/src/test/ui/on-unimplemented/bad-annotation.stderr
@@ -74,5 +74,5 @@ LL | #[rustc_on_unimplemented(on(desugared, on(desugared, message="x")), message
 
 error: aborting due to 10 previous errors
 
-You've got a few errors: E0230, E0231, E0232
-If you want more information on an error, try using "rustc --explain E0230"
+Some errors occurred: E0230, E0231, E0232.
+For more information about an error, try `rustc --explain E0230`.
diff --git a/src/test/ui/on-unimplemented/multiple-impls.stderr b/src/test/ui/on-unimplemented/multiple-impls.stderr
index ca072387588..23635a3c415 100644
--- a/src/test/ui/on-unimplemented/multiple-impls.stderr
+++ b/src/test/ui/on-unimplemented/multiple-impls.stderr
@@ -63,4 +63,4 @@ LL |     Index::index(&[] as &[i32], Bar(2u32));
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/on-unimplemented/no-debug.stderr b/src/test/ui/on-unimplemented/no-debug.stderr
index dfb7b576c5a..5d8f80e57b0 100644
--- a/src/test/ui/on-unimplemented/no-debug.stderr
+++ b/src/test/ui/on-unimplemented/no-debug.stderr
@@ -36,4 +36,4 @@ LL |     println!("{} {}", Foo, Bar);
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/on-unimplemented/on-impl.stderr b/src/test/ui/on-unimplemented/on-impl.stderr
index 6f9868d4cda..2b286ad0be7 100644
--- a/src/test/ui/on-unimplemented/on-impl.stderr
+++ b/src/test/ui/on-unimplemented/on-impl.stderr
@@ -21,4 +21,4 @@ LL |     Index::<u32>::index(&[1, 2, 3] as &[i32], 2u32);
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/on-unimplemented/on-trait.stderr b/src/test/ui/on-unimplemented/on-trait.stderr
index 8708f146186..8bd910403b4 100644
--- a/src/test/ui/on-unimplemented/on-trait.stderr
+++ b/src/test/ui/on-unimplemented/on-trait.stderr
@@ -26,4 +26,4 @@ LL | fn foobar<U: Clone, T: Foo<u8, U, u32>>() -> T {
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/on-unimplemented/slice-index.stderr b/src/test/ui/on-unimplemented/slice-index.stderr
index 5e507b3aa9c..6a4756eb1c9 100644
--- a/src/test/ui/on-unimplemented/slice-index.stderr
+++ b/src/test/ui/on-unimplemented/slice-index.stderr
@@ -18,4 +18,4 @@ LL |     x[..1i32]; //~ ERROR E0277
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/partialeq_help.stderr b/src/test/ui/partialeq_help.stderr
index ff03c7efa50..c813b64d40b 100644
--- a/src/test/ui/partialeq_help.stderr
+++ b/src/test/ui/partialeq_help.stderr
@@ -9,4 +9,4 @@ LL |     a == b; //~ ERROR E0277
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/pat-slice-old-style.stderr b/src/test/ui/pat-slice-old-style.stderr
index 0fbd9b8e209..6fa5b18a14e 100644
--- a/src/test/ui/pat-slice-old-style.stderr
+++ b/src/test/ui/pat-slice-old-style.stderr
@@ -8,4 +8,4 @@ LL |         [a, b..] => {},
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/qualified-path-params-2.stderr b/src/test/ui/qualified-path-params-2.stderr
index 471e6f4fa5d..8b618cbf7ba 100644
--- a/src/test/ui/qualified-path-params-2.stderr
+++ b/src/test/ui/qualified-path-params-2.stderr
@@ -14,5 +14,5 @@ LL | type A = <S as Tr>::A::f<u8>;
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0109, E0223
-If you want more information on an error, try using "rustc --explain E0109"
+Some errors occurred: E0109, E0223.
+For more information about an error, try `rustc --explain E0109`.
diff --git a/src/test/ui/reachable/expr_unary.stderr b/src/test/ui/reachable/expr_unary.stderr
index beb0f556292..b09721e5957 100644
--- a/src/test/ui/reachable/expr_unary.stderr
+++ b/src/test/ui/reachable/expr_unary.stderr
@@ -32,4 +32,4 @@ LL |     let x: ! = ! { return; 22 }; //~ ERROR unreachable
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0600"
+For more information about this error, try `rustc --explain E0600`.
diff --git a/src/test/ui/recursive-requirements.stderr b/src/test/ui/recursive-requirements.stderr
index 2f5945d9fe4..d9e08102ab6 100644
--- a/src/test/ui/recursive-requirements.stderr
+++ b/src/test/ui/recursive-requirements.stderr
@@ -12,4 +12,4 @@ LL |     let _: AssertSync<Foo> = unimplemented!(); //~ ERROR E0275
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0275"
+For more information about this error, try `rustc --explain E0275`.
diff --git a/src/test/ui/region-borrow-params-issue-29793-small.stderr b/src/test/ui/region-borrow-params-issue-29793-small.stderr
index a342f51e257..cfe38fe2004 100644
--- a/src/test/ui/region-borrow-params-issue-29793-small.stderr
+++ b/src/test/ui/region-borrow-params-issue-29793-small.stderr
@@ -244,5 +244,5 @@ LL |             let f = move |t: bool| if t { x } else { y }; // (separate erro
 
 error: aborting due to 20 previous errors
 
-You've got a few errors: E0373, E0597
-If you want more information on an error, try using "rustc --explain E0373"
+Some errors occurred: E0373, E0597.
+For more information about an error, try `rustc --explain E0373`.
diff --git a/src/test/ui/regions-fn-subtyping-return-static.stderr b/src/test/ui/regions-fn-subtyping-return-static.stderr
index 6a7cd6f0236..bd10dc8a808 100644
--- a/src/test/ui/regions-fn-subtyping-return-static.stderr
+++ b/src/test/ui/regions-fn-subtyping-return-static.stderr
@@ -9,4 +9,4 @@ LL |     want_F(bar); //~ ERROR E0308
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/regions-nested-fns-2.stderr b/src/test/ui/regions-nested-fns-2.stderr
index 16bec5ee218..c0aa6f9d542 100644
--- a/src/test/ui/regions-nested-fns-2.stderr
+++ b/src/test/ui/regions-nested-fns-2.stderr
@@ -13,4 +13,4 @@ LL |         move |z| {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0373"
+For more information about this error, try `rustc --explain E0373`.
diff --git a/src/test/ui/resolve-conflict-item-vs-import.stderr b/src/test/ui/resolve-conflict-item-vs-import.stderr
index 73e3e961137..5ef4bdf4aad 100644
--- a/src/test/ui/resolve-conflict-item-vs-import.stderr
+++ b/src/test/ui/resolve-conflict-item-vs-import.stderr
@@ -15,4 +15,4 @@ LL | use std::mem::transmute as other_transmute;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0255"
+For more information about this error, try `rustc --explain E0255`.
diff --git a/src/test/ui/resolve-inconsistent-names.stderr b/src/test/ui/resolve-inconsistent-names.stderr
index c136b79de00..17caac210d4 100644
--- a/src/test/ui/resolve-inconsistent-names.stderr
+++ b/src/test/ui/resolve-inconsistent-names.stderr
@@ -16,4 +16,4 @@ LL |        a | b => {} //~  ERROR variable `a` is not bound in all patterns
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0408"
+For more information about this error, try `rustc --explain E0408`.
diff --git a/src/test/ui/resolve/enums-are-namespaced-xc.stderr b/src/test/ui/resolve/enums-are-namespaced-xc.stderr
index df65f5ddded..4b1750a54dc 100644
--- a/src/test/ui/resolve/enums-are-namespaced-xc.stderr
+++ b/src/test/ui/resolve/enums-are-namespaced-xc.stderr
@@ -30,5 +30,5 @@ LL | use namespaced_enums::Foo::C;
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0422, E0425
-If you want more information on an error, try using "rustc --explain E0422"
+Some errors occurred: E0422, E0425.
+For more information about an error, try `rustc --explain E0422`.
diff --git a/src/test/ui/resolve/issue-14254.stderr b/src/test/ui/resolve/issue-14254.stderr
index 226fe36dba3..325e8850845 100644
--- a/src/test/ui/resolve/issue-14254.stderr
+++ b/src/test/ui/resolve/issue-14254.stderr
@@ -146,5 +146,5 @@ error[E0601]: main function not found
 
 error: aborting due to 25 previous errors
 
-You've got a few errors: E0425, E0601
-If you want more information on an error, try using "rustc --explain E0425"
+Some errors occurred: E0425, E0601.
+For more information about an error, try `rustc --explain E0425`.
diff --git a/src/test/ui/resolve/issue-16058.stderr b/src/test/ui/resolve/issue-16058.stderr
index 36c62408de7..0ea6da3b27d 100644
--- a/src/test/ui/resolve/issue-16058.stderr
+++ b/src/test/ui/resolve/issue-16058.stderr
@@ -14,4 +14,4 @@ LL | use std::thread::Result;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0574"
+For more information about this error, try `rustc --explain E0574`.
diff --git a/src/test/ui/resolve/issue-17518.stderr b/src/test/ui/resolve/issue-17518.stderr
index c5d8f457ec7..177b38aae7b 100644
--- a/src/test/ui/resolve/issue-17518.stderr
+++ b/src/test/ui/resolve/issue-17518.stderr
@@ -10,4 +10,4 @@ LL | use SomeEnum::E;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0422"
+For more information about this error, try `rustc --explain E0422`.
diff --git a/src/test/ui/resolve/issue-18252.stderr b/src/test/ui/resolve/issue-18252.stderr
index 4ac907b23ec..8de552ea089 100644
--- a/src/test/ui/resolve/issue-18252.stderr
+++ b/src/test/ui/resolve/issue-18252.stderr
@@ -6,4 +6,4 @@ LL |     let f = Foo::Variant(42);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0423"
+For more information about this error, try `rustc --explain E0423`.
diff --git a/src/test/ui/resolve/issue-19452.stderr b/src/test/ui/resolve/issue-19452.stderr
index 50845755866..0dbd4c85a37 100644
--- a/src/test/ui/resolve/issue-19452.stderr
+++ b/src/test/ui/resolve/issue-19452.stderr
@@ -12,4 +12,4 @@ LL |     let homura = issue_19452_aux::Homura::Madoka;
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0423"
+For more information about this error, try `rustc --explain E0423`.
diff --git a/src/test/ui/resolve/issue-21221-1.stderr b/src/test/ui/resolve/issue-21221-1.stderr
index 8056a47b464..a9d2aeee2d1 100644
--- a/src/test/ui/resolve/issue-21221-1.stderr
+++ b/src/test/ui/resolve/issue-21221-1.stderr
@@ -47,5 +47,3 @@ LL | use std::ops::Div;
 
 error: cannot continue compilation due to previous error
 
-You've got a few errors: E0405, E0412
-If you want more information on an error, try using "rustc --explain E0405"
diff --git a/src/test/ui/resolve/issue-21221-2.stderr b/src/test/ui/resolve/issue-21221-2.stderr
index 398c85920fd..50781d43792 100644
--- a/src/test/ui/resolve/issue-21221-2.stderr
+++ b/src/test/ui/resolve/issue-21221-2.stderr
@@ -12,5 +12,3 @@ error[E0601]: main function not found
 
 error: cannot continue compilation due to previous error
 
-You've got a few errors: E0405, E0601
-If you want more information on an error, try using "rustc --explain E0405"
diff --git a/src/test/ui/resolve/issue-21221-3.stderr b/src/test/ui/resolve/issue-21221-3.stderr
index 75601e932df..7725f74cb49 100644
--- a/src/test/ui/resolve/issue-21221-3.stderr
+++ b/src/test/ui/resolve/issue-21221-3.stderr
@@ -10,4 +10,3 @@ LL | use issue_21221_3::outer::OuterTrait;
 
 error: cannot continue compilation due to previous error
 
-If you want more information on this error, try using "rustc --explain E0405"
diff --git a/src/test/ui/resolve/issue-21221-4.stderr b/src/test/ui/resolve/issue-21221-4.stderr
index 10dcf0aa3b9..b0a4d5ba4d8 100644
--- a/src/test/ui/resolve/issue-21221-4.stderr
+++ b/src/test/ui/resolve/issue-21221-4.stderr
@@ -10,4 +10,3 @@ LL | use issue_21221_4::T;
 
 error: cannot continue compilation due to previous error
 
-If you want more information on this error, try using "rustc --explain E0405"
diff --git a/src/test/ui/resolve/issue-23305.stderr b/src/test/ui/resolve/issue-23305.stderr
index a9d43aeb742..63b7ab78b13 100644
--- a/src/test/ui/resolve/issue-23305.stderr
+++ b/src/test/ui/resolve/issue-23305.stderr
@@ -13,4 +13,4 @@ LL | impl ToNbt<Self> {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0391"
+For more information about this error, try `rustc --explain E0391`.
diff --git a/src/test/ui/resolve/issue-2356.stderr b/src/test/ui/resolve/issue-2356.stderr
index 6cf5fdeeb0d..3e6c38bce51 100644
--- a/src/test/ui/resolve/issue-2356.stderr
+++ b/src/test/ui/resolve/issue-2356.stderr
@@ -108,5 +108,5 @@ LL |     self += 1;
 
 error: aborting due to 17 previous errors
 
-You've got a few errors: E0424, E0425
-If you want more information on an error, try using "rustc --explain E0424"
+Some errors occurred: E0424, E0425.
+For more information about an error, try `rustc --explain E0424`.
diff --git a/src/test/ui/resolve/issue-24968.stderr b/src/test/ui/resolve/issue-24968.stderr
index 8aa84f2ed87..9a1d5ea170e 100644
--- a/src/test/ui/resolve/issue-24968.stderr
+++ b/src/test/ui/resolve/issue-24968.stderr
@@ -6,4 +6,4 @@ LL | fn foo(_: Self) {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0411"
+For more information about this error, try `rustc --explain E0411`.
diff --git a/src/test/ui/resolve/issue-33876.stderr b/src/test/ui/resolve/issue-33876.stderr
index 2742d4af712..631a9f6f724 100644
--- a/src/test/ui/resolve/issue-33876.stderr
+++ b/src/test/ui/resolve/issue-33876.stderr
@@ -6,4 +6,4 @@ LL |     let any: &Any = &Bar; //~ ERROR expected value, found trait `Bar`
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0423"
+For more information about this error, try `rustc --explain E0423`.
diff --git a/src/test/ui/resolve/issue-3907-2.stderr b/src/test/ui/resolve/issue-3907-2.stderr
index 7d01cd739e0..567fd31b09c 100644
--- a/src/test/ui/resolve/issue-3907-2.stderr
+++ b/src/test/ui/resolve/issue-3907-2.stderr
@@ -8,4 +8,4 @@ LL | fn bar(_x: Foo) {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0038"
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/resolve/issue-3907.stderr b/src/test/ui/resolve/issue-3907.stderr
index 80ee2e028eb..2b8b2b20685 100644
--- a/src/test/ui/resolve/issue-3907.stderr
+++ b/src/test/ui/resolve/issue-3907.stderr
@@ -10,4 +10,3 @@ LL | use issue_3907::Foo;
 
 error: cannot continue compilation due to previous error
 
-If you want more information on this error, try using "rustc --explain E0404"
diff --git a/src/test/ui/resolve/issue-39226.stderr b/src/test/ui/resolve/issue-39226.stderr
index 4d1e3ae9b10..089fb9fa660 100644
--- a/src/test/ui/resolve/issue-39226.stderr
+++ b/src/test/ui/resolve/issue-39226.stderr
@@ -9,4 +9,4 @@ LL |         handle: Handle
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0423"
+For more information about this error, try `rustc --explain E0423`.
diff --git a/src/test/ui/resolve/issue-5035-2.stderr b/src/test/ui/resolve/issue-5035-2.stderr
index fedb8b607fc..92309274e84 100644
--- a/src/test/ui/resolve/issue-5035-2.stderr
+++ b/src/test/ui/resolve/issue-5035-2.stderr
@@ -9,4 +9,4 @@ LL | fn foo(_x: K) {} //~ ERROR: `I + 'static: std::marker::Sized` is not satisf
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/resolve/issue-5035.stderr b/src/test/ui/resolve/issue-5035.stderr
index 9b3d69d90c0..6597f05889a 100644
--- a/src/test/ui/resolve/issue-5035.stderr
+++ b/src/test/ui/resolve/issue-5035.stderr
@@ -15,5 +15,3 @@ LL | impl K for isize {} //~ ERROR expected trait, found type alias `K`
 
 error: cannot continue compilation due to previous error
 
-You've got a few errors: E0404, E0432
-If you want more information on an error, try using "rustc --explain E0404"
diff --git a/src/test/ui/resolve/issue-6702.stderr b/src/test/ui/resolve/issue-6702.stderr
index 708ff2e5001..6f2312afe4f 100644
--- a/src/test/ui/resolve/issue-6702.stderr
+++ b/src/test/ui/resolve/issue-6702.stderr
@@ -6,4 +6,4 @@ LL |     let _m = Monster(); //~ ERROR expected function, found struct `Monster`
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0423"
+For more information about this error, try `rustc --explain E0423`.
diff --git a/src/test/ui/resolve/levenshtein.stderr b/src/test/ui/resolve/levenshtein.stderr
index 1a00395f2de..bb3caf342bf 100644
--- a/src/test/ui/resolve/levenshtein.stderr
+++ b/src/test/ui/resolve/levenshtein.stderr
@@ -48,5 +48,5 @@ LL |     let b: m::first = m::second; // Misspelled item in module.
 
 error: aborting due to 8 previous errors
 
-You've got a few errors: E0412, E0425
-If you want more information on an error, try using "rustc --explain E0412"
+Some errors occurred: E0412, E0425.
+For more information about an error, try `rustc --explain E0412`.
diff --git a/src/test/ui/resolve/name-clash-nullary.stderr b/src/test/ui/resolve/name-clash-nullary.stderr
index aefdc9b9fe1..862ad270502 100644
--- a/src/test/ui/resolve/name-clash-nullary.stderr
+++ b/src/test/ui/resolve/name-clash-nullary.stderr
@@ -9,4 +9,4 @@ LL |   let None: isize = 42; //~ ERROR mismatched types
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/resolve/privacy-enum-ctor.stderr b/src/test/ui/resolve/privacy-enum-ctor.stderr
index 7af2f5931dc..d8ab21ddb5f 100644
--- a/src/test/ui/resolve/privacy-enum-ctor.stderr
+++ b/src/test/ui/resolve/privacy-enum-ctor.stderr
@@ -223,5 +223,5 @@ LL |     let _: E = E::Unit;
 
 error: aborting due to 23 previous errors
 
-You've got a few errors: E0308, E0412, E0423, E0603, E0618
-If you want more information on an error, try using "rustc --explain E0308"
+Some errors occurred: E0308, E0412, E0423, E0603, E0618.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/resolve/privacy-struct-ctor.stderr b/src/test/ui/resolve/privacy-struct-ctor.stderr
index ddd8f238e87..6ea5241fff0 100644
--- a/src/test/ui/resolve/privacy-struct-ctor.stderr
+++ b/src/test/ui/resolve/privacy-struct-ctor.stderr
@@ -75,5 +75,5 @@ LL |     xcrate::m::n::Z;
 
 error: aborting due to 10 previous errors
 
-You've got a few errors: E0423, E0603
-If you want more information on an error, try using "rustc --explain E0423"
+Some errors occurred: E0423, E0603.
+For more information about an error, try `rustc --explain E0423`.
diff --git a/src/test/ui/resolve/resolve-assoc-suggestions.stderr b/src/test/ui/resolve/resolve-assoc-suggestions.stderr
index e03a9052e4b..916fa9793dc 100644
--- a/src/test/ui/resolve/resolve-assoc-suggestions.stderr
+++ b/src/test/ui/resolve/resolve-assoc-suggestions.stderr
@@ -54,5 +54,5 @@ LL |         method;
 
 error: aborting due to 9 previous errors
 
-You've got a few errors: E0412, E0425, E0531
-If you want more information on an error, try using "rustc --explain E0412"
+Some errors occurred: E0412, E0425, E0531.
+For more information about an error, try `rustc --explain E0412`.
diff --git a/src/test/ui/resolve/resolve-hint-macro.stderr b/src/test/ui/resolve/resolve-hint-macro.stderr
index 82279b7b2df..9de6fd85de2 100644
--- a/src/test/ui/resolve/resolve-hint-macro.stderr
+++ b/src/test/ui/resolve/resolve-hint-macro.stderr
@@ -6,4 +6,4 @@ LL |     assert(true);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0423"
+For more information about this error, try `rustc --explain E0423`.
diff --git a/src/test/ui/resolve/resolve-speculative-adjustment.stderr b/src/test/ui/resolve/resolve-speculative-adjustment.stderr
index 0e3eb95f9c4..217bfb42566 100644
--- a/src/test/ui/resolve/resolve-speculative-adjustment.stderr
+++ b/src/test/ui/resolve/resolve-speculative-adjustment.stderr
@@ -24,4 +24,4 @@ LL |         method();
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0425"
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr b/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
index c6058c7af03..263319f2ffa 100644
--- a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
+++ b/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
@@ -76,5 +76,5 @@ error[E0601]: main function not found
 
 error: aborting due to 10 previous errors
 
-You've got a few errors: E0423, E0601
-If you want more information on an error, try using "rustc --explain E0423"
+Some errors occurred: E0423, E0601.
+For more information about an error, try `rustc --explain E0423`.
diff --git a/src/test/ui/resolve/token-error-correct-2.stderr b/src/test/ui/resolve/token-error-correct-2.stderr
index 41d77bf16b9..7abc1ba4781 100644
--- a/src/test/ui/resolve/token-error-correct-2.stderr
+++ b/src/test/ui/resolve/token-error-correct-2.stderr
@@ -18,4 +18,4 @@ LL |     if foo {
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0425"
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/resolve/token-error-correct-3.stderr b/src/test/ui/resolve/token-error-correct-3.stderr
index 98989f99dd4..284acd20ba5 100644
--- a/src/test/ui/resolve/token-error-correct-3.stderr
+++ b/src/test/ui/resolve/token-error-correct-3.stderr
@@ -44,5 +44,5 @@ LL |             fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mis
 
 error: aborting due to 5 previous errors
 
-You've got a few errors: E0308, E0425
-If you want more information on an error, try using "rustc --explain E0308"
+Some errors occurred: E0308, E0425.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/resolve/tuple-struct-alias.stderr b/src/test/ui/resolve/tuple-struct-alias.stderr
index 50d997e01da..cdac6277bcf 100644
--- a/src/test/ui/resolve/tuple-struct-alias.stderr
+++ b/src/test/ui/resolve/tuple-struct-alias.stderr
@@ -32,5 +32,5 @@ LL |         A(..) => {} //~ ERROR expected tuple struct/variant
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0423, E0532
-If you want more information on an error, try using "rustc --explain E0423"
+Some errors occurred: E0423, E0532.
+For more information about an error, try `rustc --explain E0423`.
diff --git a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr b/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr
index c225563b754..6e7bd28d16f 100644
--- a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr
+++ b/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr
@@ -12,5 +12,3 @@ LL | fn g<F:Typedef(isize) -> isize>(x: F) {}
 
 error: cannot continue compilation due to previous error
 
-You've got a few errors: E0404, E0405
-If you want more information on an error, try using "rustc --explain E0404"
diff --git a/src/test/ui/resolve/unresolved_static_type_field.stderr b/src/test/ui/resolve/unresolved_static_type_field.stderr
index 7012419d94c..262a4983b81 100644
--- a/src/test/ui/resolve/unresolved_static_type_field.stderr
+++ b/src/test/ui/resolve/unresolved_static_type_field.stderr
@@ -9,4 +9,4 @@ LL |         f(cx);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0425"
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/resolve/use_suggestion_placement.stderr b/src/test/ui/resolve/use_suggestion_placement.stderr
index da2ea67ad08..caae70900dc 100644
--- a/src/test/ui/resolve/use_suggestion_placement.stderr
+++ b/src/test/ui/resolve/use_suggestion_placement.stderr
@@ -32,5 +32,5 @@ LL | use std::collections::hash_map::HashMap;
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0412, E0425
-If you want more information on an error, try using "rustc --explain E0412"
+Some errors occurred: E0412, E0425.
+For more information about an error, try `rustc --explain E0412`.
diff --git a/src/test/ui/rfc-2005-default-binding-mode/const.stderr b/src/test/ui/rfc-2005-default-binding-mode/const.stderr
index b91e64b42bf..302b3a8dbc3 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/const.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/const.stderr
@@ -9,4 +9,4 @@ LL |         FOO => {}, //~ ERROR mismatched types
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/rfc-2005-default-binding-mode/enum.stderr b/src/test/ui/rfc-2005-default-binding-mode/enum.stderr
index 59c857110a9..18cd0774667 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/enum.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/enum.stderr
@@ -24,4 +24,4 @@ LL |         *x += 1; //~ ERROR cannot assign to immutable
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0594"
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr b/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr
index 72e5c1fce1e..392efecb9cd 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr
@@ -24,4 +24,4 @@ LL |             *n += 1; //~ ERROR cannot assign to immutable
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0594"
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/rfc-2005-default-binding-mode/for.stderr b/src/test/ui/rfc-2005-default-binding-mode/for.stderr
index cdf6a1667aa..4094c185063 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/for.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/for.stderr
@@ -8,4 +8,4 @@ LL |     for (n, mut m) in &tups {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0009"
+For more information about this error, try `rustc --explain E0009`.
diff --git a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr b/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
index e304ae14065..154fa79fa3f 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
@@ -6,4 +6,4 @@ LL |         Some((x, 3)) | &Some((ref x, 5)) => x,
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0409"
+For more information about this error, try `rustc --explain E0409`.
diff --git a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr b/src/test/ui/rfc-2005-default-binding-mode/lit.stderr
index 1d8f544dbad..dde1f2d352c 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/lit.stderr
@@ -18,4 +18,4 @@ LL |         b"abc" => true, //~ ERROR mismatched types
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr b/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr
index b92f9662613..e3a613f9261 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr
@@ -6,4 +6,4 @@ LL |         u32::XXX => { } //~ ERROR no associated item named
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/rfc-2005-default-binding-mode/slice.stderr b/src/test/ui/rfc-2005-default-binding-mode/slice.stderr
index f10d0f83f0c..c0127e5990e 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/slice.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/slice.stderr
@@ -6,4 +6,4 @@ LL |     match sl { //~ ERROR non-exhaustive patterns
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0004"
+For more information about this error, try `rustc --explain E0004`.
diff --git a/src/test/ui/rfc-2005-default-binding-mode/suggestion.stderr b/src/test/ui/rfc-2005-default-binding-mode/suggestion.stderr
index 1d713be96d7..ea58c62fc84 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/suggestion.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/suggestion.stderr
@@ -8,4 +8,4 @@ LL |     if let Some(y) = &Some(22) { //~ ERROR non-reference pattern
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.stderr b/src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.stderr
index 67e50346ace..054530e24bd 100644
--- a/src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.stderr
+++ b/src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.stderr
@@ -6,4 +6,4 @@ LL |     type Quux<'a> = <T as Foo>::Bar<'a, 'static>;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0110"
+For more information about this error, try `rustc --explain E0110`.
diff --git a/src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr b/src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr
index bc342119e59..64e82c0d109 100644
--- a/src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr
+++ b/src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr
@@ -30,5 +30,5 @@ LL |     fn iter<'a>(&'a self) -> Self::Iter<'undeclared>;
 
 error: aborting due to 5 previous errors
 
-You've got a few errors: E0110, E0261
-If you want more information on an error, try using "rustc --explain E0110"
+Some errors occurred: E0110, E0261.
+For more information about an error, try `rustc --explain E0110`.
diff --git a/src/test/ui/rfc1598-generic-associated-types/iterable.stderr b/src/test/ui/rfc1598-generic-associated-types/iterable.stderr
index 0c126236d0e..d33eebb42d6 100644
--- a/src/test/ui/rfc1598-generic-associated-types/iterable.stderr
+++ b/src/test/ui/rfc1598-generic-associated-types/iterable.stderr
@@ -18,4 +18,4 @@ LL |     fn iter<'a>(&'a self) -> Self::Iter<'a>;
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0110"
+For more information about this error, try `rustc --explain E0110`.
diff --git a/src/test/ui/rfc1598-generic-associated-types/pointer_family.stderr b/src/test/ui/rfc1598-generic-associated-types/pointer_family.stderr
index 6df4ceed66d..3e772eee4f4 100644
--- a/src/test/ui/rfc1598-generic-associated-types/pointer_family.stderr
+++ b/src/test/ui/rfc1598-generic-associated-types/pointer_family.stderr
@@ -24,4 +24,4 @@ LL |     fn new<T>(value: T) -> Self::Pointer<T> {
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0109"
+For more information about this error, try `rustc --explain E0109`.
diff --git a/src/test/ui/rfc1598-generic-associated-types/streaming_iterator.stderr b/src/test/ui/rfc1598-generic-associated-types/streaming_iterator.stderr
index df03c15aaa7..9ab80151a7e 100644
--- a/src/test/ui/rfc1598-generic-associated-types/streaming_iterator.stderr
+++ b/src/test/ui/rfc1598-generic-associated-types/streaming_iterator.stderr
@@ -18,4 +18,4 @@ LL |     fn next<'a>(&'a self) -> Option<Self::Item<'a>>;
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0110"
+For more information about this error, try `rustc --explain E0110`.
diff --git a/src/test/ui/self-impl.stderr b/src/test/ui/self-impl.stderr
index e17c2b6e792..a5a5135faad 100644
--- a/src/test/ui/self-impl.stderr
+++ b/src/test/ui/self-impl.stderr
@@ -16,4 +16,4 @@ LL |         let _: Self::Baz = true;
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0223"
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/shadowed-lifetime.stderr b/src/test/ui/shadowed-lifetime.stderr
index efb9faa0963..8d7c00bb61e 100644
--- a/src/test/ui/shadowed-lifetime.stderr
+++ b/src/test/ui/shadowed-lifetime.stderr
@@ -16,4 +16,4 @@ LL |         let x: for<'b> fn(&'b isize) = panic!();
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0496"
+For more information about this error, try `rustc --explain E0496`.
diff --git a/src/test/ui/shadowed-type-parameter.stderr b/src/test/ui/shadowed-type-parameter.stderr
index d13c75b25c3..c40343e31b4 100644
--- a/src/test/ui/shadowed-type-parameter.stderr
+++ b/src/test/ui/shadowed-type-parameter.stderr
@@ -26,4 +26,4 @@ LL |     fn shadow_in_method<T>(&self) {}
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0194"
+For more information about this error, try `rustc --explain E0194`.
diff --git a/src/test/ui/span/E0046.stderr b/src/test/ui/span/E0046.stderr
index 047a9115caf..035e2e08720 100644
--- a/src/test/ui/span/E0046.stderr
+++ b/src/test/ui/span/E0046.stderr
@@ -9,4 +9,4 @@ LL | impl Foo for Bar {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0046"
+For more information about this error, try `rustc --explain E0046`.
diff --git a/src/test/ui/span/E0057.stderr b/src/test/ui/span/E0057.stderr
index 0d6cd77de07..fb3e710b8cf 100644
--- a/src/test/ui/span/E0057.stderr
+++ b/src/test/ui/span/E0057.stderr
@@ -12,4 +12,4 @@ LL |     let c = f(2, 3); //~ ERROR E0057
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0057"
+For more information about this error, try `rustc --explain E0057`.
diff --git a/src/test/ui/span/E0072.stderr b/src/test/ui/span/E0072.stderr
index 1c03cfe0e9e..f8bf41fefa8 100644
--- a/src/test/ui/span/E0072.stderr
+++ b/src/test/ui/span/E0072.stderr
@@ -11,4 +11,4 @@ LL |     tail: Option<ListNode>,
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0072"
+For more information about this error, try `rustc --explain E0072`.
diff --git a/src/test/ui/span/E0204.stderr b/src/test/ui/span/E0204.stderr
index aa21c6762e7..8be1af61d80 100644
--- a/src/test/ui/span/E0204.stderr
+++ b/src/test/ui/span/E0204.stderr
@@ -36,4 +36,4 @@ LL |     Bar(&'a mut bool),
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0204"
+For more information about this error, try `rustc --explain E0204`.
diff --git a/src/test/ui/span/E0493.stderr b/src/test/ui/span/E0493.stderr
index 74a85c0164e..85d83de9d80 100644
--- a/src/test/ui/span/E0493.stderr
+++ b/src/test/ui/span/E0493.stderr
@@ -6,4 +6,4 @@ LL | const F : Foo = (Foo { a : 0 }, Foo { a : 1 }).1;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0493"
+For more information about this error, try `rustc --explain E0493`.
diff --git a/src/test/ui/span/E0535.stderr b/src/test/ui/span/E0535.stderr
index 309696eebc4..2191aebbeb2 100644
--- a/src/test/ui/span/E0535.stderr
+++ b/src/test/ui/span/E0535.stderr
@@ -6,4 +6,4 @@ LL | #[inline(unknown)] //~ ERROR E0535
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0535"
+For more information about this error, try `rustc --explain E0535`.
diff --git a/src/test/ui/span/E0536.stderr b/src/test/ui/span/E0536.stderr
index ff8f4543874..2b998356c20 100644
--- a/src/test/ui/span/E0536.stderr
+++ b/src/test/ui/span/E0536.stderr
@@ -6,4 +6,4 @@ LL | #[cfg(not())] //~ ERROR E0536
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0536"
+For more information about this error, try `rustc --explain E0536`.
diff --git a/src/test/ui/span/E0537.stderr b/src/test/ui/span/E0537.stderr
index 88e74b1cce5..7257c73acb5 100644
--- a/src/test/ui/span/E0537.stderr
+++ b/src/test/ui/span/E0537.stderr
@@ -6,4 +6,4 @@ LL | #[cfg(unknown())] //~ ERROR E0537
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0537"
+For more information about this error, try `rustc --explain E0537`.
diff --git a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr b/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
index 901a1af94bc..01c0603256c 100644
--- a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
+++ b/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
@@ -84,5 +84,5 @@ LL |     *x.y_mut() = 3; //~ ERROR cannot borrow
 
 error: aborting due to 10 previous errors
 
-You've got a few errors: E0499, E0596
-If you want more information on an error, try using "rustc --explain E0499"
+Some errors occurred: E0499, E0596.
+For more information about an error, try `rustc --explain E0499`.
diff --git a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr b/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr
index 948d6d175de..3a28ef36d05 100644
--- a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr
+++ b/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr
@@ -32,4 +32,4 @@ LL |     **x = 3; //~ ERROR cannot borrow
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr
index a06b7097ee3..318b77dedcb 100644
--- a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr
+++ b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr
@@ -46,5 +46,5 @@ LL |         foo(f);
 
 error: aborting due to 5 previous errors
 
-You've got a few errors: E0499, E0504, E0507, E0596
-If you want more information on an error, try using "rustc --explain E0499"
+Some errors occurred: E0499, E0504, E0507, E0596.
+For more information about an error, try `rustc --explain E0499`.
diff --git a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr
index 8111f80690a..a18d3c55394 100644
--- a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr
+++ b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr
@@ -9,4 +9,4 @@ LL |     x.h(); //~ ERROR cannot borrow
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/borrowck-fn-in-const-b.stderr b/src/test/ui/span/borrowck-fn-in-const-b.stderr
index 1d4af884b23..4b6c62e6ec8 100644
--- a/src/test/ui/span/borrowck-fn-in-const-b.stderr
+++ b/src/test/ui/span/borrowck-fn-in-const-b.stderr
@@ -8,4 +8,4 @@ LL |         x.push(format!("this is broken"));
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr b/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr
index 6de2eecb61b..dfcd082c0c2 100644
--- a/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr
+++ b/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr
@@ -50,4 +50,4 @@ LL | }
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/borrowck-object-mutability.stderr b/src/test/ui/span/borrowck-object-mutability.stderr
index 2f1a6c63141..5bc07949a95 100644
--- a/src/test/ui/span/borrowck-object-mutability.stderr
+++ b/src/test/ui/span/borrowck-object-mutability.stderr
@@ -18,4 +18,4 @@ LL |     x.borrowed_mut(); //~ ERROR cannot borrow
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/borrowck-ref-into-rvalue.stderr b/src/test/ui/span/borrowck-ref-into-rvalue.stderr
index cf423c278e1..5de3fc4ab0a 100644
--- a/src/test/ui/span/borrowck-ref-into-rvalue.stderr
+++ b/src/test/ui/span/borrowck-ref-into-rvalue.stderr
@@ -14,4 +14,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/coerce-suggestions.stderr b/src/test/ui/span/coerce-suggestions.stderr
index 251f33b63fe..5153d809788 100644
--- a/src/test/ui/span/coerce-suggestions.stderr
+++ b/src/test/ui/span/coerce-suggestions.stderr
@@ -61,4 +61,4 @@ LL |     s = format!("foo");
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/span/destructor-restrictions.stderr b/src/test/ui/span/destructor-restrictions.stderr
index 15ddfb35240..0ca77a91f2d 100644
--- a/src/test/ui/span/destructor-restrictions.stderr
+++ b/src/test/ui/span/destructor-restrictions.stderr
@@ -10,4 +10,4 @@ LL |     }; //~^ ERROR `*a` does not live long enough
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/dropck-object-cycle.stderr b/src/test/ui/span/dropck-object-cycle.stderr
index 2a426ca3a29..7b3855917c9 100644
--- a/src/test/ui/span/dropck-object-cycle.stderr
+++ b/src/test/ui/span/dropck-object-cycle.stderr
@@ -11,4 +11,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/dropck_arr_cycle_checked.stderr b/src/test/ui/span/dropck_arr_cycle_checked.stderr
index 5e6512c06bf..44803b28154 100644
--- a/src/test/ui/span/dropck_arr_cycle_checked.stderr
+++ b/src/test/ui/span/dropck_arr_cycle_checked.stderr
@@ -66,4 +66,4 @@ LL | }
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr b/src/test/ui/span/dropck_direct_cycle_with_drop.stderr
index cf507df4e81..d20421c327f 100644
--- a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr
+++ b/src/test/ui/span/dropck_direct_cycle_with_drop.stderr
@@ -22,4 +22,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/dropck_misc_variants.stderr b/src/test/ui/span/dropck_misc_variants.stderr
index 42469018e94..af56448d406 100644
--- a/src/test/ui/span/dropck_misc_variants.stderr
+++ b/src/test/ui/span/dropck_misc_variants.stderr
@@ -21,4 +21,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/dropck_vec_cycle_checked.stderr b/src/test/ui/span/dropck_vec_cycle_checked.stderr
index f4ab3293543..63b0ab52d39 100644
--- a/src/test/ui/span/dropck_vec_cycle_checked.stderr
+++ b/src/test/ui/span/dropck_vec_cycle_checked.stderr
@@ -66,4 +66,4 @@ LL | }
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/gated-features-attr-spans.stderr b/src/test/ui/span/gated-features-attr-spans.stderr
index 87ad9312fa4..179daf83c3c 100644
--- a/src/test/ui/span/gated-features-attr-spans.stderr
+++ b/src/test/ui/span/gated-features-attr-spans.stderr
@@ -24,4 +24,4 @@ LL | #[must_use] //~ WARN is experimental
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/span/impl-wrong-item-for-trait.stderr b/src/test/ui/span/impl-wrong-item-for-trait.stderr
index ec5cfebedf9..4f1ac3b9459 100644
--- a/src/test/ui/span/impl-wrong-item-for-trait.stderr
+++ b/src/test/ui/span/impl-wrong-item-for-trait.stderr
@@ -68,5 +68,5 @@ LL | impl Debug for FooTypeForMethod {
 
 error: aborting due to 8 previous errors
 
-You've got a few errors: E0046, E0323, E0324, E0325, E0437
-If you want more information on an error, try using "rustc --explain E0046"
+Some errors occurred: E0046, E0323, E0324, E0325, E0437.
+For more information about an error, try `rustc --explain E0046`.
diff --git a/src/test/ui/span/issue-11925.stderr b/src/test/ui/span/issue-11925.stderr
index 1185dc6a0cc..bd66a5bc392 100644
--- a/src/test/ui/span/issue-11925.stderr
+++ b/src/test/ui/span/issue-11925.stderr
@@ -12,4 +12,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue-15480.stderr b/src/test/ui/span/issue-15480.stderr
index c3298a4a0b5..1d239c712fe 100644
--- a/src/test/ui/span/issue-15480.stderr
+++ b/src/test/ui/span/issue-15480.stderr
@@ -13,4 +13,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr b/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr
index ec5c7e637f4..6932134f4cd 100644
--- a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr
+++ b/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr
@@ -20,4 +20,4 @@ LL |     };
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue-23729.stderr b/src/test/ui/span/issue-23729.stderr
index d80e3352ee4..83a7671b8f9 100644
--- a/src/test/ui/span/issue-23729.stderr
+++ b/src/test/ui/span/issue-23729.stderr
@@ -8,4 +8,4 @@ LL |         impl Iterator for Recurrence {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0046"
+For more information about this error, try `rustc --explain E0046`.
diff --git a/src/test/ui/span/issue-23827.stderr b/src/test/ui/span/issue-23827.stderr
index a94debd575c..c8b55290aa0 100644
--- a/src/test/ui/span/issue-23827.stderr
+++ b/src/test/ui/span/issue-23827.stderr
@@ -8,4 +8,4 @@ LL | impl<C: Component> FnOnce<(C,)> for Prototype {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0046"
+For more information about this error, try `rustc --explain E0046`.
diff --git a/src/test/ui/span/issue-24356.stderr b/src/test/ui/span/issue-24356.stderr
index 17a25821fd4..7c599138ef3 100644
--- a/src/test/ui/span/issue-24356.stderr
+++ b/src/test/ui/span/issue-24356.stderr
@@ -8,4 +8,4 @@ LL |         impl Deref for Thing {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0046"
+For more information about this error, try `rustc --explain E0046`.
diff --git a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr b/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
index 284c07edf03..13a79035003 100644
--- a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
+++ b/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
@@ -11,4 +11,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr b/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr
index e0e10ff672a..a2e25492c19 100644
--- a/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr
+++ b/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr
@@ -30,4 +30,4 @@ LL | }
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue-24895-copy-clone-dropck.stderr b/src/test/ui/span/issue-24895-copy-clone-dropck.stderr
index 31ad51400a2..1f6c96d4a0c 100644
--- a/src/test/ui/span/issue-24895-copy-clone-dropck.stderr
+++ b/src/test/ui/span/issue-24895-copy-clone-dropck.stderr
@@ -10,4 +10,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue-25199.stderr b/src/test/ui/span/issue-25199.stderr
index fe2df9ce711..bee83b532ba 100644
--- a/src/test/ui/span/issue-25199.stderr
+++ b/src/test/ui/span/issue-25199.stderr
@@ -22,4 +22,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue-26656.stderr b/src/test/ui/span/issue-26656.stderr
index e15af193bec..98f0c90ed78 100644
--- a/src/test/ui/span/issue-26656.stderr
+++ b/src/test/ui/span/issue-26656.stderr
@@ -10,4 +10,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue-27522.stderr b/src/test/ui/span/issue-27522.stderr
index b171fde0f0f..d0611bd580f 100644
--- a/src/test/ui/span/issue-27522.stderr
+++ b/src/test/ui/span/issue-27522.stderr
@@ -9,4 +9,4 @@ LL |     fn handler(self: &SomeType); //~ ERROR invalid `self` type
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0307"
+For more information about this error, try `rustc --explain E0307`.
diff --git a/src/test/ui/span/issue-29106.stderr b/src/test/ui/span/issue-29106.stderr
index 3d7bd2232e4..23e53c9852d 100644
--- a/src/test/ui/span/issue-29106.stderr
+++ b/src/test/ui/span/issue-29106.stderr
@@ -20,4 +20,4 @@ LL |     }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue-29595.stderr b/src/test/ui/span/issue-29595.stderr
index 026d2ba41c7..15d56abca50 100644
--- a/src/test/ui/span/issue-29595.stderr
+++ b/src/test/ui/span/issue-29595.stderr
@@ -12,4 +12,4 @@ LL |     const C: Self;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/span/issue-33884.stderr b/src/test/ui/span/issue-33884.stderr
index fc79b79877a..c47d28b4562 100644
--- a/src/test/ui/span/issue-33884.stderr
+++ b/src/test/ui/span/issue-33884.stderr
@@ -10,4 +10,4 @@ LL |     stream.write_fmt(format!("message received"))
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/span/issue-34264.stderr b/src/test/ui/span/issue-34264.stderr
index bf2de0f1125..bfa81a398a4 100644
--- a/src/test/ui/span/issue-34264.stderr
+++ b/src/test/ui/span/issue-34264.stderr
@@ -45,5 +45,5 @@ LL |     bar(1, 2, 3); //~ ERROR this function takes
 
 error: aborting due to 6 previous errors
 
-You've got a few errors: E0061, E0308
-If you want more information on an error, try using "rustc --explain E0061"
+Some errors occurred: E0061, E0308.
+For more information about an error, try `rustc --explain E0061`.
diff --git a/src/test/ui/span/issue-35987.stderr b/src/test/ui/span/issue-35987.stderr
index 596f2d76da6..d3267d0cc15 100644
--- a/src/test/ui/span/issue-35987.stderr
+++ b/src/test/ui/span/issue-35987.stderr
@@ -12,5 +12,3 @@ error[E0601]: main function not found
 
 error: cannot continue compilation due to previous error
 
-You've got a few errors: E0404, E0601
-If you want more information on an error, try using "rustc --explain E0404"
diff --git a/src/test/ui/span/issue-36530.stderr b/src/test/ui/span/issue-36530.stderr
index 69dd330838d..cbec4f6b0a6 100644
--- a/src/test/ui/span/issue-36530.stderr
+++ b/src/test/ui/span/issue-36530.stderr
@@ -16,4 +16,4 @@ LL |     #![foo] //~ ERROR is currently unknown to the compiler
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/span/issue-36537.stderr b/src/test/ui/span/issue-36537.stderr
index 058e83ba4fd..73a0cf63c94 100644
--- a/src/test/ui/span/issue-36537.stderr
+++ b/src/test/ui/span/issue-36537.stderr
@@ -11,4 +11,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue-37767.stderr b/src/test/ui/span/issue-37767.stderr
index ad72a064971..5477146a551 100644
--- a/src/test/ui/span/issue-37767.stderr
+++ b/src/test/ui/span/issue-37767.stderr
@@ -57,4 +57,4 @@ LL |     fn foo(self) {}
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0034"
+For more information about this error, try `rustc --explain E0034`.
diff --git a/src/test/ui/span/issue-39018.stderr b/src/test/ui/span/issue-39018.stderr
index d300357fa0b..ee6334e8164 100644
--- a/src/test/ui/span/issue-39018.stderr
+++ b/src/test/ui/span/issue-39018.stderr
@@ -32,4 +32,4 @@ LL |     let x = "Hello " + &"World!".to_owned();
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0369"
+For more information about this error, try `rustc --explain E0369`.
diff --git a/src/test/ui/span/issue-39698.stderr b/src/test/ui/span/issue-39698.stderr
index 4222d40a12b..e8dab8dc465 100644
--- a/src/test/ui/span/issue-39698.stderr
+++ b/src/test/ui/span/issue-39698.stderr
@@ -40,4 +40,4 @@ LL |         T::T1(a, d) | T::T2(d, b) | T::T3(c) | T::T4(a) => { println!("{:?}
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0408"
+For more information about this error, try `rustc --explain E0408`.
diff --git a/src/test/ui/span/issue-40157.stderr b/src/test/ui/span/issue-40157.stderr
index cc029ae84b6..8c6d3339e98 100644
--- a/src/test/ui/span/issue-40157.stderr
+++ b/src/test/ui/span/issue-40157.stderr
@@ -12,4 +12,4 @@ LL |     {println!("{:?}", match { let foo = vec![1, 2]; foo.get(1) } { x => x }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue-42234-unknown-receiver-type.stderr b/src/test/ui/span/issue-42234-unknown-receiver-type.stderr
index 508608bd202..23315e3b76a 100644
--- a/src/test/ui/span/issue-42234-unknown-receiver-type.stderr
+++ b/src/test/ui/span/issue-42234-unknown-receiver-type.stderr
@@ -15,4 +15,4 @@ LL | |         .sum::<_>()
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/span/issue-7575.stderr b/src/test/ui/span/issue-7575.stderr
index 37e8200a308..dc2cd4c2ddc 100644
--- a/src/test/ui/span/issue-7575.stderr
+++ b/src/test/ui/span/issue-7575.stderr
@@ -67,4 +67,4 @@ LL |     fn is_str() -> bool {
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/span/issue28498-reject-ex1.stderr b/src/test/ui/span/issue28498-reject-ex1.stderr
index adbbd676615..fb6eeb4de5d 100644
--- a/src/test/ui/span/issue28498-reject-ex1.stderr
+++ b/src/test/ui/span/issue28498-reject-ex1.stderr
@@ -22,4 +22,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue28498-reject-lifetime-param.stderr b/src/test/ui/span/issue28498-reject-lifetime-param.stderr
index a701ff6eb3e..841ea5b25c8 100644
--- a/src/test/ui/span/issue28498-reject-lifetime-param.stderr
+++ b/src/test/ui/span/issue28498-reject-lifetime-param.stderr
@@ -22,4 +22,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue28498-reject-passed-to-fn.stderr b/src/test/ui/span/issue28498-reject-passed-to-fn.stderr
index 934863fa4da..2a5e34290ec 100644
--- a/src/test/ui/span/issue28498-reject-passed-to-fn.stderr
+++ b/src/test/ui/span/issue28498-reject-passed-to-fn.stderr
@@ -22,4 +22,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/issue28498-reject-trait-bound.stderr b/src/test/ui/span/issue28498-reject-trait-bound.stderr
index 4630022e9c4..6e46f67a1d5 100644
--- a/src/test/ui/span/issue28498-reject-trait-bound.stderr
+++ b/src/test/ui/span/issue28498-reject-trait-bound.stderr
@@ -22,4 +22,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/missing-unit-argument.stderr b/src/test/ui/span/missing-unit-argument.stderr
index a7417b006ad..be514fdd81c 100644
--- a/src/test/ui/span/missing-unit-argument.stderr
+++ b/src/test/ui/span/missing-unit-argument.stderr
@@ -67,4 +67,4 @@ LL |     S.generic::<()>(()); //~ ERROR this function takes
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0061"
+For more information about this error, try `rustc --explain E0061`.
diff --git a/src/test/ui/span/move-closure.stderr b/src/test/ui/span/move-closure.stderr
index 497224b7b53..1c629ee9841 100644
--- a/src/test/ui/span/move-closure.stderr
+++ b/src/test/ui/span/move-closure.stderr
@@ -9,4 +9,4 @@ LL |     let x: () = move || (); //~ ERROR mismatched types
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/span/multiline-span-E0072.stderr b/src/test/ui/span/multiline-span-E0072.stderr
index 42ec3764fff..d087a3aaabf 100644
--- a/src/test/ui/span/multiline-span-E0072.stderr
+++ b/src/test/ui/span/multiline-span-E0072.stderr
@@ -14,4 +14,4 @@ LL | | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0072"
+For more information about this error, try `rustc --explain E0072`.
diff --git a/src/test/ui/span/multiline-span-simple.stderr b/src/test/ui/span/multiline-span-simple.stderr
index e3bb8349f8a..463d5baae64 100644
--- a/src/test/ui/span/multiline-span-simple.stderr
+++ b/src/test/ui/span/multiline-span-simple.stderr
@@ -8,4 +8,4 @@ LL |     foo(1 as u32 + //~ ERROR cannot add `()` to `u32`
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/span/mut-arg-hint.stderr b/src/test/ui/span/mut-arg-hint.stderr
index 73a63aabe67..730592b3100 100644
--- a/src/test/ui/span/mut-arg-hint.stderr
+++ b/src/test/ui/span/mut-arg-hint.stderr
@@ -24,4 +24,4 @@ LL |         a.push_str("foo"); //~ ERROR cannot borrow immutable borrowed conte
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0596"
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr b/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr
index 15694106fe8..7898b066acd 100644
--- a/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr
+++ b/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr
@@ -11,4 +11,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/non-existing-module-import.stderr b/src/test/ui/span/non-existing-module-import.stderr
index ed9ae1f21b4..5518b42ac65 100644
--- a/src/test/ui/span/non-existing-module-import.stderr
+++ b/src/test/ui/span/non-existing-module-import.stderr
@@ -6,4 +6,4 @@ LL | use std::bar::{foo1, foo2}; //~ ERROR unresolved import
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0432"
+For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/span/pub-struct-field.stderr b/src/test/ui/span/pub-struct-field.stderr
index 40819e2e8ba..4d2a48aef00 100644
--- a/src/test/ui/span/pub-struct-field.stderr
+++ b/src/test/ui/span/pub-struct-field.stderr
@@ -17,4 +17,4 @@ LL |     pub(crate) bar: u8, //~ ERROR is already declared
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0124"
+For more information about this error, try `rustc --explain E0124`.
diff --git a/src/test/ui/span/range-2.stderr b/src/test/ui/span/range-2.stderr
index 6378e55f803..e2ee86ae1f5 100644
--- a/src/test/ui/span/range-2.stderr
+++ b/src/test/ui/span/range-2.stderr
@@ -22,4 +22,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/recursive-type-field.stderr b/src/test/ui/span/recursive-type-field.stderr
index 7ac63d3ca6e..74ccb74ac2b 100644
--- a/src/test/ui/span/recursive-type-field.stderr
+++ b/src/test/ui/span/recursive-type-field.stderr
@@ -29,4 +29,4 @@ LL |     x: Bar<'a>,
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0072"
+For more information about this error, try `rustc --explain E0072`.
diff --git a/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr b/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr
index c9e8a6d8f56..db47a9010e0 100644
--- a/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr
+++ b/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr
@@ -11,4 +11,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr b/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr
index 785a4718253..2b63d5bd6c7 100644
--- a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr
+++ b/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr
@@ -11,4 +11,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/regions-close-over-type-parameter-2.stderr b/src/test/ui/span/regions-close-over-type-parameter-2.stderr
index 9e8c4000d06..79c6a0be179 100644
--- a/src/test/ui/span/regions-close-over-type-parameter-2.stderr
+++ b/src/test/ui/span/regions-close-over-type-parameter-2.stderr
@@ -11,4 +11,4 @@ LL |     };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/regions-escape-loop-via-variable.stderr b/src/test/ui/span/regions-escape-loop-via-variable.stderr
index 1bc8e996d01..0ff0d76a5e4 100644
--- a/src/test/ui/span/regions-escape-loop-via-variable.stderr
+++ b/src/test/ui/span/regions-escape-loop-via-variable.stderr
@@ -11,4 +11,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/regions-escape-loop-via-vec.stderr b/src/test/ui/span/regions-escape-loop-via-vec.stderr
index 2cb8df235b4..1d4911bd5af 100644
--- a/src/test/ui/span/regions-escape-loop-via-vec.stderr
+++ b/src/test/ui/span/regions-escape-loop-via-vec.stderr
@@ -37,5 +37,5 @@ LL |         x += 1; //~ ERROR cannot assign
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0503, E0506, E0597
-If you want more information on an error, try using "rustc --explain E0503"
+Some errors occurred: E0503, E0506, E0597.
+For more information about an error, try `rustc --explain E0503`.
diff --git a/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr b/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr
index 42240509a9e..87dc0682199 100644
--- a/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr
+++ b/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr
@@ -12,4 +12,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/send-is-not-static-ensures-scoping.stderr b/src/test/ui/span/send-is-not-static-ensures-scoping.stderr
index 462c01d849b..0447b578d44 100644
--- a/src/test/ui/span/send-is-not-static-ensures-scoping.stderr
+++ b/src/test/ui/span/send-is-not-static-ensures-scoping.stderr
@@ -26,4 +26,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/send-is-not-static-std-sync-2.stderr b/src/test/ui/span/send-is-not-static-std-sync-2.stderr
index ed6363a2e33..53f4d685d0c 100644
--- a/src/test/ui/span/send-is-not-static-std-sync-2.stderr
+++ b/src/test/ui/span/send-is-not-static-std-sync-2.stderr
@@ -34,4 +34,4 @@ LL | }
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/send-is-not-static-std-sync.stderr b/src/test/ui/span/send-is-not-static-std-sync.stderr
index ffaccf010a9..066715cd5b5 100644
--- a/src/test/ui/span/send-is-not-static-std-sync.stderr
+++ b/src/test/ui/span/send-is-not-static-std-sync.stderr
@@ -57,5 +57,5 @@ LL |     drop(y); //~ ERROR cannot move out
 
 error: aborting due to 6 previous errors
 
-You've got a few errors: E0505, E0597
-If you want more information on an error, try using "rustc --explain E0505"
+Some errors occurred: E0505, E0597.
+For more information about an error, try `rustc --explain E0505`.
diff --git a/src/test/ui/span/slice-borrow.stderr b/src/test/ui/span/slice-borrow.stderr
index 3cc791a0580..503d1f72c35 100644
--- a/src/test/ui/span/slice-borrow.stderr
+++ b/src/test/ui/span/slice-borrow.stderr
@@ -13,4 +13,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/suggestion-non-ascii.stderr b/src/test/ui/span/suggestion-non-ascii.stderr
index 331d18fad54..f74d4a5caef 100644
--- a/src/test/ui/span/suggestion-non-ascii.stderr
+++ b/src/test/ui/span/suggestion-non-ascii.stderr
@@ -6,4 +6,4 @@ LL |     println!("☃{}", tup[0]); //~ ERROR cannot index into a value of type
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0608"
+For more information about this error, try `rustc --explain E0608`.
diff --git a/src/test/ui/span/type-binding.stderr b/src/test/ui/span/type-binding.stderr
index 407897bfcfe..d8bfdff142b 100644
--- a/src/test/ui/span/type-binding.stderr
+++ b/src/test/ui/span/type-binding.stderr
@@ -6,4 +6,4 @@ LL | fn homura<T: Deref<Trget = i32>>(_: T) {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0220"
+For more information about this error, try `rustc --explain E0220`.
diff --git a/src/test/ui/span/typo-suggestion.stderr b/src/test/ui/span/typo-suggestion.stderr
index 01056597013..0ac3a94e712 100644
--- a/src/test/ui/span/typo-suggestion.stderr
+++ b/src/test/ui/span/typo-suggestion.stderr
@@ -12,4 +12,4 @@ LL |     println!("Hello {}", fob); //~ ERROR cannot find value
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0425"
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr b/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr
index f9a94290603..b461f74c759 100644
--- a/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr
+++ b/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr
@@ -22,4 +22,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/vec_refs_data_with_early_death.stderr b/src/test/ui/span/vec_refs_data_with_early_death.stderr
index cdf0cd6de5c..0dd7288ce64 100644
--- a/src/test/ui/span/vec_refs_data_with_early_death.stderr
+++ b/src/test/ui/span/vec_refs_data_with_early_death.stderr
@@ -22,4 +22,4 @@ LL | }
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/span/wf-method-late-bound-regions.stderr b/src/test/ui/span/wf-method-late-bound-regions.stderr
index 30b1086bbd7..f455707366a 100644
--- a/src/test/ui/span/wf-method-late-bound-regions.stderr
+++ b/src/test/ui/span/wf-method-late-bound-regions.stderr
@@ -11,4 +11,4 @@ LL | }
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0597"
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/specialization-feature-gate-default.stderr b/src/test/ui/specialization-feature-gate-default.stderr
index 0ce10ec8184..30548bb2450 100644
--- a/src/test/ui/specialization-feature-gate-default.stderr
+++ b/src/test/ui/specialization-feature-gate-default.stderr
@@ -8,4 +8,4 @@ LL |     default fn foo(&self) {} //~ ERROR specialization is unstable
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/specialization-feature-gate-overlap.stderr b/src/test/ui/specialization-feature-gate-overlap.stderr
index 00b495dbacd..bb2d071c93d 100644
--- a/src/test/ui/specialization-feature-gate-overlap.stderr
+++ b/src/test/ui/specialization-feature-gate-overlap.stderr
@@ -9,4 +9,4 @@ LL | impl Foo for u8 { //~ ERROR E0119
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0119"
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/static-lifetime.stderr b/src/test/ui/static-lifetime.stderr
index abd82cd78ae..4fe4e569df9 100644
--- a/src/test/ui/static-lifetime.stderr
+++ b/src/test/ui/static-lifetime.stderr
@@ -13,4 +13,4 @@ LL | impl<'a, A: Clone> Arbitrary for ::std::borrow::Cow<'a, A> {} //~ ERROR lif
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0478"
+For more information about this error, try `rustc --explain E0478`.
diff --git a/src/test/ui/str-concat-on-double-ref.stderr b/src/test/ui/str-concat-on-double-ref.stderr
index 8216455ece4..d42c859598f 100644
--- a/src/test/ui/str-concat-on-double-ref.stderr
+++ b/src/test/ui/str-concat-on-double-ref.stderr
@@ -8,4 +8,4 @@ LL |     let c = a + b;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0369"
+For more information about this error, try `rustc --explain E0369`.
diff --git a/src/test/ui/str-lit-type-mismatch.stderr b/src/test/ui/str-lit-type-mismatch.stderr
index 52be4e80393..de18851636d 100644
--- a/src/test/ui/str-lit-type-mismatch.stderr
+++ b/src/test/ui/str-lit-type-mismatch.stderr
@@ -36,4 +36,4 @@ LL |     let z: &str = b"foo"; //~ ERROR mismatched types
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/struct-fields-decl-dupe.stderr b/src/test/ui/struct-fields-decl-dupe.stderr
index 272ce6b1607..b5068b4abda 100644
--- a/src/test/ui/struct-fields-decl-dupe.stderr
+++ b/src/test/ui/struct-fields-decl-dupe.stderr
@@ -8,4 +8,4 @@ LL |     foo: isize,
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0124"
+For more information about this error, try `rustc --explain E0124`.
diff --git a/src/test/ui/struct-fields-hints-no-dupe.stderr b/src/test/ui/struct-fields-hints-no-dupe.stderr
index 7c276098feb..d04d193c665 100644
--- a/src/test/ui/struct-fields-hints-no-dupe.stderr
+++ b/src/test/ui/struct-fields-hints-no-dupe.stderr
@@ -6,4 +6,4 @@ LL |         bar : 42,
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0560"
+For more information about this error, try `rustc --explain E0560`.
diff --git a/src/test/ui/struct-fields-hints.stderr b/src/test/ui/struct-fields-hints.stderr
index 6e4d3008660..6d0ec8bdf92 100644
--- a/src/test/ui/struct-fields-hints.stderr
+++ b/src/test/ui/struct-fields-hints.stderr
@@ -6,4 +6,4 @@ LL |         bar : 42,
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0560"
+For more information about this error, try `rustc --explain E0560`.
diff --git a/src/test/ui/struct-fields-too-many.stderr b/src/test/ui/struct-fields-too-many.stderr
index 8132cf687a3..01b3fe16fbb 100644
--- a/src/test/ui/struct-fields-too-many.stderr
+++ b/src/test/ui/struct-fields-too-many.stderr
@@ -8,4 +8,4 @@ LL |         bar: 0
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0560"
+For more information about this error, try `rustc --explain E0560`.
diff --git a/src/test/ui/struct-path-self-type-mismatch.stderr b/src/test/ui/struct-path-self-type-mismatch.stderr
index a038a723402..cfba3be6130 100644
--- a/src/test/ui/struct-path-self-type-mismatch.stderr
+++ b/src/test/ui/struct-path-self-type-mismatch.stderr
@@ -30,4 +30,4 @@ LL | |         }
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggest-private-fields.stderr b/src/test/ui/suggest-private-fields.stderr
index fb3d8a67569..51a96df951a 100644
--- a/src/test/ui/suggest-private-fields.stderr
+++ b/src/test/ui/suggest-private-fields.stderr
@@ -26,4 +26,4 @@ LL |         bb: 20,
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0560"
+For more information about this error, try `rustc --explain E0560`.
diff --git a/src/test/ui/suggestions/closure-immutable-outer-variable.stderr b/src/test/ui/suggestions/closure-immutable-outer-variable.stderr
index a6fda3d7987..3353e2c7291 100644
--- a/src/test/ui/suggestions/closure-immutable-outer-variable.stderr
+++ b/src/test/ui/suggestions/closure-immutable-outer-variable.stderr
@@ -8,4 +8,4 @@ LL |     foo(Box::new(move || y = false) as Box<_>); //~ ERROR cannot assign to
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0594"
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/suggestions/confuse-field-and-method/issue-18343.stderr b/src/test/ui/suggestions/confuse-field-and-method/issue-18343.stderr
index 69b2ab0eadd..b1e3105a5f9 100644
--- a/src/test/ui/suggestions/confuse-field-and-method/issue-18343.stderr
+++ b/src/test/ui/suggestions/confuse-field-and-method/issue-18343.stderr
@@ -11,4 +11,4 @@ LL |     o.closure();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/suggestions/confuse-field-and-method/issue-2392.stderr b/src/test/ui/suggestions/confuse-field-and-method/issue-2392.stderr
index 29138441a91..bd5efcd9fee 100644
--- a/src/test/ui/suggestions/confuse-field-and-method/issue-2392.stderr
+++ b/src/test/ui/suggestions/confuse-field-and-method/issue-2392.stderr
@@ -121,4 +121,4 @@ LL |             (*self.container).f3(1); //~ ERROR no method named `f3` found
 
 error: aborting due to 11 previous errors
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/suggestions/confuse-field-and-method/issue-32128.stderr b/src/test/ui/suggestions/confuse-field-and-method/issue-32128.stderr
index e405300b136..95b764b43ed 100644
--- a/src/test/ui/suggestions/confuse-field-and-method/issue-32128.stderr
+++ b/src/test/ui/suggestions/confuse-field-and-method/issue-32128.stderr
@@ -11,4 +11,4 @@ LL |     demo.example(1);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/suggestions/confuse-field-and-method/issue-33784.stderr b/src/test/ui/suggestions/confuse-field-and-method/issue-33784.stderr
index a58ea05221c..b7f13320eec 100644
--- a/src/test/ui/suggestions/confuse-field-and-method/issue-33784.stderr
+++ b/src/test/ui/suggestions/confuse-field-and-method/issue-33784.stderr
@@ -24,4 +24,4 @@ LL |     s.c_fn_ptr(); //~ ERROR no method named `c_fn_ptr` found
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/suggestions/confuse-field-and-method/private-field.stderr b/src/test/ui/suggestions/confuse-field-and-method/private-field.stderr
index 3e934ca391a..145df8b156b 100644
--- a/src/test/ui/suggestions/confuse-field-and-method/private-field.stderr
+++ b/src/test/ui/suggestions/confuse-field-and-method/private-field.stderr
@@ -9,4 +9,4 @@ LL |     let dog_age = dog.dog_age(); //~ ERROR no method
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/suggestions/conversion-methods.stderr b/src/test/ui/suggestions/conversion-methods.stderr
index b8d1c89ec37..970ccad2316 100644
--- a/src/test/ui/suggestions/conversion-methods.stderr
+++ b/src/test/ui/suggestions/conversion-methods.stderr
@@ -48,4 +48,4 @@ LL |     let _prove_piercing_earnest: Vec<usize> = &[1, 2, 3]; //~ ERROR mismatc
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/dont-suggest-dereference-on-arg.stderr b/src/test/ui/suggestions/dont-suggest-dereference-on-arg.stderr
index 9a9f64b94a7..4e2a321ffac 100644
--- a/src/test/ui/suggestions/dont-suggest-dereference-on-arg.stderr
+++ b/src/test/ui/suggestions/dont-suggest-dereference-on-arg.stderr
@@ -8,4 +8,4 @@ LL |         .filter(|&(ref a, _)| foo(a))
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0658"
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/suggestions/dont-suggest-private-trait-method.stderr b/src/test/ui/suggestions/dont-suggest-private-trait-method.stderr
index 2dfedac8be2..81ecc546a6d 100644
--- a/src/test/ui/suggestions/dont-suggest-private-trait-method.stderr
+++ b/src/test/ui/suggestions/dont-suggest-private-trait-method.stderr
@@ -9,4 +9,4 @@ LL |     T::new();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/suggestions/extern-crate-rename.stderr b/src/test/ui/suggestions/extern-crate-rename.stderr
index aefbbc79ba9..2c2723fe4c5 100644
--- a/src/test/ui/suggestions/extern-crate-rename.stderr
+++ b/src/test/ui/suggestions/extern-crate-rename.stderr
@@ -13,4 +13,4 @@ LL | extern crate m2 as m1; //~ ERROR is defined multiple times
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0259"
+For more information about this error, try `rustc --explain E0259`.
diff --git a/src/test/ui/suggestions/fn-closure-mutable-capture.stderr b/src/test/ui/suggestions/fn-closure-mutable-capture.stderr
index e46900ba49d..a58d663dc0a 100644
--- a/src/test/ui/suggestions/fn-closure-mutable-capture.stderr
+++ b/src/test/ui/suggestions/fn-closure-mutable-capture.stderr
@@ -13,4 +13,4 @@ LL |     bar(move || x = 1);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0594"
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/suggestions/for-c-in-str.stderr b/src/test/ui/suggestions/for-c-in-str.stderr
index f3130d0587c..b249df3b4ef 100644
--- a/src/test/ui/suggestions/for-c-in-str.stderr
+++ b/src/test/ui/suggestions/for-c-in-str.stderr
@@ -9,4 +9,4 @@ LL |     for c in "asdf" {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/suggestions/issue-32354-suggest-import-rename.stderr b/src/test/ui/suggestions/issue-32354-suggest-import-rename.stderr
index c9babb6a6d9..7cf7a1d15a2 100644
--- a/src/test/ui/suggestions/issue-32354-suggest-import-rename.stderr
+++ b/src/test/ui/suggestions/issue-32354-suggest-import-rename.stderr
@@ -14,4 +14,4 @@ LL | use extension2::ConstructorExtension as OtherConstructorExtension; //~ ERRO
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0252"
+For more information about this error, try `rustc --explain E0252`.
diff --git a/src/test/ui/suggestions/issue-43420-no-over-suggest.stderr b/src/test/ui/suggestions/issue-43420-no-over-suggest.stderr
index 387b9cfcf32..80bbdd11289 100644
--- a/src/test/ui/suggestions/issue-43420-no-over-suggest.stderr
+++ b/src/test/ui/suggestions/issue-43420-no-over-suggest.stderr
@@ -9,4 +9,4 @@ LL |     foo(&a); //~ ERROR mismatched types
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr b/src/test/ui/suggestions/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr
index 22c82be100c..8e2b2d845e9 100644
--- a/src/test/ui/suggestions/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr
+++ b/src/test/ui/suggestions/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr
@@ -12,4 +12,4 @@ LL | extern crate std as other_std;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0259"
+For more information about this error, try `rustc --explain E0259`.
diff --git a/src/test/ui/suggestions/issue-46756-consider-borrowing-cast-or-binexpr.stderr b/src/test/ui/suggestions/issue-46756-consider-borrowing-cast-or-binexpr.stderr
index 4d75ee0284c..e89e9dce94d 100644
--- a/src/test/ui/suggestions/issue-46756-consider-borrowing-cast-or-binexpr.stderr
+++ b/src/test/ui/suggestions/issue-46756-consider-borrowing-cast-or-binexpr.stderr
@@ -24,4 +24,4 @@ LL |     light_flows_our_war_of_mocking_words(with_tears + 4);
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/method-on-ambiguous-numeric-type.stderr b/src/test/ui/suggestions/method-on-ambiguous-numeric-type.stderr
index ddd38ca5c3c..92ad2280615 100644
--- a/src/test/ui/suggestions/method-on-ambiguous-numeric-type.stderr
+++ b/src/test/ui/suggestions/method-on-ambiguous-numeric-type.stderr
@@ -20,4 +20,4 @@ LL |     let y: f32 = 2.0;
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0689"
+For more information about this error, try `rustc --explain E0689`.
diff --git a/src/test/ui/suggestions/numeric-cast-2.stderr b/src/test/ui/suggestions/numeric-cast-2.stderr
index 84f01309bd0..3d485583717 100644
--- a/src/test/ui/suggestions/numeric-cast-2.stderr
+++ b/src/test/ui/suggestions/numeric-cast-2.stderr
@@ -18,4 +18,4 @@ LL |     let z: i32 = x + x;
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/numeric-cast.stderr b/src/test/ui/suggestions/numeric-cast.stderr
index a19ca7de4b0..4aac65ff4cb 100644
--- a/src/test/ui/suggestions/numeric-cast.stderr
+++ b/src/test/ui/suggestions/numeric-cast.stderr
@@ -904,4 +904,4 @@ LL |     foo::<i32>((-x_i8).into());
 
 error: aborting due to 134 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/return-type.stderr b/src/test/ui/suggestions/return-type.stderr
index b09615a2fa6..7d7653eee28 100644
--- a/src/test/ui/suggestions/return-type.stderr
+++ b/src/test/ui/suggestions/return-type.stderr
@@ -17,4 +17,4 @@ LL | fn bar() -> S<usize> {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/str-array-assignment.stderr b/src/test/ui/suggestions/str-array-assignment.stderr
index 352954597b1..76db882742a 100644
--- a/src/test/ui/suggestions/str-array-assignment.stderr
+++ b/src/test/ui/suggestions/str-array-assignment.stderr
@@ -44,5 +44,5 @@ LL |   let w: &str = s[..2];
 
 error: aborting due to 4 previous errors
 
-You've got a few errors: E0277, E0308
-If you want more information on an error, try using "rustc --explain E0277"
+Some errors occurred: E0277, E0308.
+For more information about an error, try `rustc --explain E0277`.
diff --git a/src/test/ui/suggestions/suggest-labels.stderr b/src/test/ui/suggestions/suggest-labels.stderr
index 1943e8c6561..671ff1a56db 100644
--- a/src/test/ui/suggestions/suggest-labels.stderr
+++ b/src/test/ui/suggestions/suggest-labels.stderr
@@ -18,4 +18,4 @@ LL |             break 'longlable; //~ ERROR use of undeclared label
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0426"
+For more information about this error, try `rustc --explain E0426`.
diff --git a/src/test/ui/suggestions/suggest-methods.stderr b/src/test/ui/suggestions/suggest-methods.stderr
index fbbd6247d56..cb352361f33 100644
--- a/src/test/ui/suggestions/suggest-methods.stderr
+++ b/src/test/ui/suggestions/suggest-methods.stderr
@@ -33,4 +33,4 @@ LL |     let _ = 63u32.count_o(); //~ ERROR no method named
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0599"
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/suggestions/try-on-option.stderr b/src/test/ui/suggestions/try-on-option.stderr
index da7f07a8b16..aee52808f1e 100644
--- a/src/test/ui/suggestions/try-on-option.stderr
+++ b/src/test/ui/suggestions/try-on-option.stderr
@@ -17,4 +17,4 @@ LL |     x?; //~ the `?` operator
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/suggestions/try-operator-on-main.stderr b/src/test/ui/suggestions/try-operator-on-main.stderr
index 2fa97d770af..7536bbcd2db 100644
--- a/src/test/ui/suggestions/try-operator-on-main.stderr
+++ b/src/test/ui/suggestions/try-operator-on-main.stderr
@@ -39,4 +39,4 @@ LL |     ()?; //~ ERROR the `?` operator can only
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-initializer.stderr b/src/test/ui/suggestions/type-ascription-instead-of-initializer.stderr
index 80d1569bf1c..3722d2a0e3f 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-initializer.stderr
+++ b/src/test/ui/suggestions/type-ascription-instead-of-initializer.stderr
@@ -15,4 +15,4 @@ LL |     let x: Vec::with_capacity(10, 20);  //~ ERROR expected type, found `10`
 
 error: aborting due to 2 previous errors
 
-If you want more information on this error, try using "rustc --explain E0061"
+For more information about this error, try `rustc --explain E0061`.
diff --git a/src/test/ui/suggestions/type-ascription-with-fn-call.stderr b/src/test/ui/suggestions/type-ascription-with-fn-call.stderr
index 4d36449d26a..78df97139b6 100644
--- a/src/test/ui/suggestions/type-ascription-with-fn-call.stderr
+++ b/src/test/ui/suggestions/type-ascription-with-fn-call.stderr
@@ -11,4 +11,4 @@ LL |     f(); //~ ERROR expected type, found function
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0573"
+For more information about this error, try `rustc --explain E0573`.
diff --git a/src/test/ui/svh-change-lit.stderr b/src/test/ui/svh-change-lit.stderr
index 588e293b255..bf018cdf829 100644
--- a/src/test/ui/svh-change-lit.stderr
+++ b/src/test/ui/svh-change-lit.stderr
@@ -11,4 +11,4 @@ LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0460"
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh-change-significant-cfg.stderr b/src/test/ui/svh-change-significant-cfg.stderr
index a57a5e7a5dd..e8926cda9e9 100644
--- a/src/test/ui/svh-change-significant-cfg.stderr
+++ b/src/test/ui/svh-change-significant-cfg.stderr
@@ -11,4 +11,4 @@ LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0460"
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh-change-trait-bound.stderr b/src/test/ui/svh-change-trait-bound.stderr
index f0e433ea894..d9824876a95 100644
--- a/src/test/ui/svh-change-trait-bound.stderr
+++ b/src/test/ui/svh-change-trait-bound.stderr
@@ -11,4 +11,4 @@ LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0460"
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh-change-type-arg.stderr b/src/test/ui/svh-change-type-arg.stderr
index bc08c8cf579..1f942cc1989 100644
--- a/src/test/ui/svh-change-type-arg.stderr
+++ b/src/test/ui/svh-change-type-arg.stderr
@@ -11,4 +11,4 @@ LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0460"
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh-change-type-ret.stderr b/src/test/ui/svh-change-type-ret.stderr
index 187ebda21ef..0d59f31ccb6 100644
--- a/src/test/ui/svh-change-type-ret.stderr
+++ b/src/test/ui/svh-change-type-ret.stderr
@@ -11,4 +11,4 @@ LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0460"
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh-change-type-static.stderr b/src/test/ui/svh-change-type-static.stderr
index c0ca2e94cea..cbfb74f59ed 100644
--- a/src/test/ui/svh-change-type-static.stderr
+++ b/src/test/ui/svh-change-type-static.stderr
@@ -11,4 +11,4 @@ LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0460"
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/svh-use-trait.stderr b/src/test/ui/svh-use-trait.stderr
index fd57ecf6c3f..612f52ba959 100644
--- a/src/test/ui/svh-use-trait.stderr
+++ b/src/test/ui/svh-use-trait.stderr
@@ -11,4 +11,4 @@ LL | extern crate utb; //~ ERROR: found possibly newer version of crate `uta` wh
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0460"
+For more information about this error, try `rustc --explain E0460`.
diff --git a/src/test/ui/switched-expectations.stderr b/src/test/ui/switched-expectations.stderr
index 0020d14f5cb..9db318735bd 100644
--- a/src/test/ui/switched-expectations.stderr
+++ b/src/test/ui/switched-expectations.stderr
@@ -9,4 +9,4 @@ LL |     let ref string: String = var; //~ ERROR mismatched types [E0308]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/token/issue-10636-2.stderr b/src/test/ui/token/issue-10636-2.stderr
index 26816ca0ca2..4b672f31d38 100644
--- a/src/test/ui/token/issue-10636-2.stderr
+++ b/src/test/ui/token/issue-10636-2.stderr
@@ -26,4 +26,4 @@ error[E0601]: main function not found
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0601"
+For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/token/issue-15980.stderr b/src/test/ui/token/issue-15980.stderr
index 4078797474e..d52368bf96a 100644
--- a/src/test/ui/token/issue-15980.stderr
+++ b/src/test/ui/token/issue-15980.stderr
@@ -24,4 +24,4 @@ LL |     let x: io::IoResult<()> = Ok(());
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0412"
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/token/issue-41155.stderr b/src/test/ui/token/issue-41155.stderr
index ece803b75dc..00155cc2873 100644
--- a/src/test/ui/token/issue-41155.stderr
+++ b/src/test/ui/token/issue-41155.stderr
@@ -16,5 +16,5 @@ error[E0601]: main function not found
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0412, E0601
-If you want more information on an error, try using "rustc --explain E0412"
+Some errors occurred: E0412, E0601.
+For more information about an error, try `rustc --explain E0412`.
diff --git a/src/test/ui/trait-alias.stderr b/src/test/ui/trait-alias.stderr
index 731ea8b8c4c..5d290e5c7fb 100644
--- a/src/test/ui/trait-alias.stderr
+++ b/src/test/ui/trait-alias.stderr
@@ -36,4 +36,4 @@ LL | trait CD = Clone + Default; //~ERROR E0645
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0645"
+For more information about this error, try `rustc --explain E0645`.
diff --git a/src/test/ui/trait-duplicate-methods.stderr b/src/test/ui/trait-duplicate-methods.stderr
index 2aec3f3377d..1dfddd937ca 100644
--- a/src/test/ui/trait-duplicate-methods.stderr
+++ b/src/test/ui/trait-duplicate-methods.stderr
@@ -10,4 +10,4 @@ LL |     fn orange(&self); //~ ERROR the name `orange` is defined multiple times
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0428"
+For more information about this error, try `rustc --explain E0428`.
diff --git a/src/test/ui/trait-method-private.stderr b/src/test/ui/trait-method-private.stderr
index f89da4d4bf2..3a625ae25a4 100644
--- a/src/test/ui/trait-method-private.stderr
+++ b/src/test/ui/trait-method-private.stderr
@@ -12,4 +12,4 @@ LL | use inner::Bar;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0624"
+For more information about this error, try `rustc --explain E0624`.
diff --git a/src/test/ui/trait-safety-fn-body.stderr b/src/test/ui/trait-safety-fn-body.stderr
index 894d0c8c3f7..432df438222 100644
--- a/src/test/ui/trait-safety-fn-body.stderr
+++ b/src/test/ui/trait-safety-fn-body.stderr
@@ -6,4 +6,4 @@ LL |         *self += 1;
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0133"
+For more information about this error, try `rustc --explain E0133`.
diff --git a/src/test/ui/trait-suggest-where-clause.stderr b/src/test/ui/trait-suggest-where-clause.stderr
index 71fa93d5e0c..abd9f5a8b73 100644
--- a/src/test/ui/trait-suggest-where-clause.stderr
+++ b/src/test/ui/trait-suggest-where-clause.stderr
@@ -65,4 +65,4 @@ LL |     mem::size_of::<[&U]>();
 
 error: aborting due to 7 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/traits-multidispatch-convert-ambig-dest.stderr b/src/test/ui/traits-multidispatch-convert-ambig-dest.stderr
index 65f2de8bad5..46c86cd767a 100644
--- a/src/test/ui/traits-multidispatch-convert-ambig-dest.stderr
+++ b/src/test/ui/traits-multidispatch-convert-ambig-dest.stderr
@@ -6,4 +6,4 @@ LL |     test(22, std::default::Default::default());
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/transmute/main.stderr b/src/test/ui/transmute/main.stderr
index d412788af5d..7f6ee749c4f 100644
--- a/src/test/ui/transmute/main.stderr
+++ b/src/test/ui/transmute/main.stderr
@@ -36,4 +36,4 @@ LL |     let x: Foo = transmute(10); //~ ERROR transmute called with types of di
 
 error: aborting due to 4 previous errors
 
-If you want more information on this error, try using "rustc --explain E0512"
+For more information about this error, try `rustc --explain E0512`.
diff --git a/src/test/ui/transmute/transmute-from-fn-item-types-error.stderr b/src/test/ui/transmute/transmute-from-fn-item-types-error.stderr
index 00723060307..1591b06f3ac 100644
--- a/src/test/ui/transmute/transmute-from-fn-item-types-error.stderr
+++ b/src/test/ui/transmute/transmute-from-fn-item-types-error.stderr
@@ -88,5 +88,5 @@ LL |     mem::transmute::<_, Option<fn()>>(Some(baz));
 
 error: aborting due to 9 previous errors
 
-You've got a few errors: E0512, E0591
-If you want more information on an error, try using "rustc --explain E0512"
+Some errors occurred: E0512, E0591.
+For more information about an error, try `rustc --explain E0512`.
diff --git a/src/test/ui/transmute/transmute-type-parameters.stderr b/src/test/ui/transmute/transmute-type-parameters.stderr
index fd9c132383c..ab0bd8fe2d8 100644
--- a/src/test/ui/transmute/transmute-type-parameters.stderr
+++ b/src/test/ui/transmute/transmute-type-parameters.stderr
@@ -54,4 +54,4 @@ LL |     let _: i32 = transmute(x);
 
 error: aborting due to 6 previous errors
 
-If you want more information on this error, try using "rustc --explain E0512"
+For more information about this error, try `rustc --explain E0512`.
diff --git a/src/test/ui/type-annotation-needed.stderr b/src/test/ui/type-annotation-needed.stderr
index 67c0698a6c2..d48891596df 100644
--- a/src/test/ui/type-annotation-needed.stderr
+++ b/src/test/ui/type-annotation-needed.stderr
@@ -12,4 +12,4 @@ LL | fn foo<T: Into<String>>(x: i32) {}
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0283"
+For more information about this error, try `rustc --explain E0283`.
diff --git a/src/test/ui/type-check-defaults.stderr b/src/test/ui/type-check-defaults.stderr
index f39b7dcb31f..a2d6e53df05 100644
--- a/src/test/ui/type-check-defaults.stderr
+++ b/src/test/ui/type-check-defaults.stderr
@@ -72,4 +72,4 @@ LL | trait ProjectionPred<T:Iterator = IntoIter<i32>> where T::Item : Add<u8> {}
 
 error: aborting due to 7 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/type-check/assignment-in-if.stderr b/src/test/ui/type-check/assignment-in-if.stderr
index 32b4315bb83..7f3ce0d2a5f 100644
--- a/src/test/ui/type-check/assignment-in-if.stderr
+++ b/src/test/ui/type-check/assignment-in-if.stderr
@@ -57,4 +57,4 @@ LL |     if (if true { x = 4 } else { x = 5 }) {
 
 error: aborting due to 5 previous errors
 
-If you want more information on this error, try using "rustc --explain E0308"
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/type-check/cannot_infer_local_or_array.stderr b/src/test/ui/type-check/cannot_infer_local_or_array.stderr
index 27679e16537..90191ae6745 100644
--- a/src/test/ui/type-check/cannot_infer_local_or_array.stderr
+++ b/src/test/ui/type-check/cannot_infer_local_or_array.stderr
@@ -8,4 +8,4 @@ LL |     let x = []; //~ ERROR type annotations needed
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/type-check/cannot_infer_local_or_vec.stderr b/src/test/ui/type-check/cannot_infer_local_or_vec.stderr
index 5c024437b77..e58a5b67c19 100644
--- a/src/test/ui/type-check/cannot_infer_local_or_vec.stderr
+++ b/src/test/ui/type-check/cannot_infer_local_or_vec.stderr
@@ -10,4 +10,4 @@ LL |     let x = vec![];
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.stderr b/src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.stderr
index 3a1b2879593..d7887216bc9 100644
--- a/src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.stderr
+++ b/src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.stderr
@@ -10,4 +10,4 @@ LL |     let (x, ) = (vec![], );
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/type-check/issue-22897.stderr b/src/test/ui/type-check/issue-22897.stderr
index 1e6830601b6..e2374809dd6 100644
--- a/src/test/ui/type-check/issue-22897.stderr
+++ b/src/test/ui/type-check/issue-22897.stderr
@@ -6,4 +6,4 @@ LL |     []; //~ ERROR type annotations needed
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/type-check/issue-40294.stderr b/src/test/ui/type-check/issue-40294.stderr
index 1eb1f8effbb..fbb7427ae3e 100644
--- a/src/test/ui/type-check/issue-40294.stderr
+++ b/src/test/ui/type-check/issue-40294.stderr
@@ -18,4 +18,4 @@ LL | trait Foo: Sized {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0283"
+For more information about this error, try `rustc --explain E0283`.
diff --git a/src/test/ui/type-check/issue-41314.stderr b/src/test/ui/type-check/issue-41314.stderr
index 95b046bf184..bcb0f9a99a7 100644
--- a/src/test/ui/type-check/issue-41314.stderr
+++ b/src/test/ui/type-check/issue-41314.stderr
@@ -14,5 +14,5 @@ LL |         X::Y { number } => {} //~ ERROR does not have a field named `number
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0026, E0027
-If you want more information on an error, try using "rustc --explain E0026"
+Some errors occurred: E0026, E0027.
+For more information about an error, try `rustc --explain E0026`.
diff --git a/src/test/ui/type-check/missing_trait_impl.stderr b/src/test/ui/type-check/missing_trait_impl.stderr
index ef02708fe53..777f16b12ce 100644
--- a/src/test/ui/type-check/missing_trait_impl.stderr
+++ b/src/test/ui/type-check/missing_trait_impl.stderr
@@ -8,4 +8,4 @@ LL |     let z = x + y; //~ ERROR binary operation `+` cannot be applied to type
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0369"
+For more information about this error, try `rustc --explain E0369`.
diff --git a/src/test/ui/type-check/unknown_type_for_closure.stderr b/src/test/ui/type-check/unknown_type_for_closure.stderr
index ce9c0dc4e40..25283f5e76b 100644
--- a/src/test/ui/type-check/unknown_type_for_closure.stderr
+++ b/src/test/ui/type-check/unknown_type_for_closure.stderr
@@ -6,4 +6,4 @@ LL |     let x = |_| {    }; //~ ERROR type annotations needed
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/type-recursive.stderr b/src/test/ui/type-recursive.stderr
index ea90feee324..c0c2cbc857a 100644
--- a/src/test/ui/type-recursive.stderr
+++ b/src/test/ui/type-recursive.stderr
@@ -11,4 +11,4 @@ LL |     foolish: t1
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0072"
+For more information about this error, try `rustc --explain E0072`.
diff --git a/src/test/ui/typeck-builtin-bound-type-parameters.stderr b/src/test/ui/typeck-builtin-bound-type-parameters.stderr
index cf4011f5dbe..221f05b9150 100644
--- a/src/test/ui/typeck-builtin-bound-type-parameters.stderr
+++ b/src/test/ui/typeck-builtin-bound-type-parameters.stderr
@@ -36,5 +36,5 @@ LL | fn foo2<'a, T:Copy<'a, U>, U>(x: T) {}
 
 error: aborting due to 6 previous errors
 
-You've got a few errors: E0107, E0244
-If you want more information on an error, try using "rustc --explain E0107"
+Some errors occurred: E0107, E0244.
+For more information about an error, try `rustc --explain E0107`.
diff --git a/src/test/ui/typeck_type_placeholder_item.stderr b/src/test/ui/typeck_type_placeholder_item.stderr
index b00fbafcd69..3f814085955 100644
--- a/src/test/ui/typeck_type_placeholder_item.stderr
+++ b/src/test/ui/typeck_type_placeholder_item.stderr
@@ -204,4 +204,4 @@ LL |         fn clone_from(&mut self, other: _) { *self = FnTest9; }
 
 error: aborting due to 34 previous errors
 
-If you want more information on this error, try using "rustc --explain E0121"
+For more information about this error, try `rustc --explain E0121`.
diff --git a/src/test/ui/typeck_type_placeholder_lifetime_1.stderr b/src/test/ui/typeck_type_placeholder_lifetime_1.stderr
index 19b308f3334..fe9566b3181 100644
--- a/src/test/ui/typeck_type_placeholder_lifetime_1.stderr
+++ b/src/test/ui/typeck_type_placeholder_lifetime_1.stderr
@@ -6,4 +6,4 @@ LL |     let c: Foo<_, _> = Foo { r: &5 };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0244"
+For more information about this error, try `rustc --explain E0244`.
diff --git a/src/test/ui/typeck_type_placeholder_lifetime_2.stderr b/src/test/ui/typeck_type_placeholder_lifetime_2.stderr
index 12712e1e88c..64ec4245466 100644
--- a/src/test/ui/typeck_type_placeholder_lifetime_2.stderr
+++ b/src/test/ui/typeck_type_placeholder_lifetime_2.stderr
@@ -6,4 +6,4 @@ LL |     let c: Foo<_, usize> = Foo { r: &5 };
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0244"
+For more information about this error, try `rustc --explain E0244`.
diff --git a/src/test/ui/ui-testing-optout.stderr b/src/test/ui/ui-testing-optout.stderr
index 1c13da57b0d..aab3399a6fc 100644
--- a/src/test/ui/ui-testing-optout.stderr
+++ b/src/test/ui/ui-testing-optout.stderr
@@ -18,4 +18,4 @@ error[E0412]: cannot find type `F` in this scope
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0412"
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/unboxed-closure-no-cyclic-sig.stderr b/src/test/ui/unboxed-closure-no-cyclic-sig.stderr
index 633ae13ca10..0c0c339286e 100644
--- a/src/test/ui/unboxed-closure-no-cyclic-sig.stderr
+++ b/src/test/ui/unboxed-closure-no-cyclic-sig.stderr
@@ -10,4 +10,4 @@ LL |     g(|_| {  }); //~ ERROR closure/generator type that references itself
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0644"
+For more information about this error, try `rustc --explain E0644`.
diff --git a/src/test/ui/unboxed-closure-sugar-wrong-trait.stderr b/src/test/ui/unboxed-closure-sugar-wrong-trait.stderr
index 8ef0828fba5..82ba4e66393 100644
--- a/src/test/ui/unboxed-closure-sugar-wrong-trait.stderr
+++ b/src/test/ui/unboxed-closure-sugar-wrong-trait.stderr
@@ -12,5 +12,5 @@ LL | fn f<F:Trait(isize) -> isize>(x: F) {}
 
 error: aborting due to 2 previous errors
 
-You've got a few errors: E0220, E0244
-If you want more information on an error, try using "rustc --explain E0220"
+Some errors occurred: E0220, E0244.
+For more information about an error, try `rustc --explain E0220`.
diff --git a/src/test/ui/unboxed-closures-infer-fn-once-move-from-projection.stderr b/src/test/ui/unboxed-closures-infer-fn-once-move-from-projection.stderr
index 3b78481504c..0062ea77c0b 100644
--- a/src/test/ui/unboxed-closures-infer-fn-once-move-from-projection.stderr
+++ b/src/test/ui/unboxed-closures-infer-fn-once-move-from-projection.stderr
@@ -11,4 +11,4 @@ LL |     foo(c);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0525"
+For more information about this error, try `rustc --explain E0525`.
diff --git a/src/test/ui/unconstrained-none.stderr b/src/test/ui/unconstrained-none.stderr
index 6fdbc8414b6..34d524abed9 100644
--- a/src/test/ui/unconstrained-none.stderr
+++ b/src/test/ui/unconstrained-none.stderr
@@ -6,4 +6,4 @@ LL |     None; //~ ERROR type annotations needed [E0282]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/unconstrained-ref.stderr b/src/test/ui/unconstrained-ref.stderr
index 7aeec39ae14..1fddf453119 100644
--- a/src/test/ui/unconstrained-ref.stderr
+++ b/src/test/ui/unconstrained-ref.stderr
@@ -6,4 +6,4 @@ LL |     S { o: &None }; //~ ERROR type annotations needed [E0282]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/union/union-derive-eq.stderr b/src/test/ui/union/union-derive-eq.stderr
index 88b33c3e96e..02fa0ca6f83 100644
--- a/src/test/ui/union/union-derive-eq.stderr
+++ b/src/test/ui/union/union-derive-eq.stderr
@@ -8,4 +8,4 @@ LL |     a: PartialEqNotEq, //~ ERROR the trait bound `PartialEqNotEq: std::cmp:
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/union/union-fields-2.stderr b/src/test/ui/union/union-fields-2.stderr
index d902ad1629c..3ea4d3426da 100644
--- a/src/test/ui/union/union-fields-2.stderr
+++ b/src/test/ui/union/union-fields-2.stderr
@@ -80,5 +80,5 @@ LL |     let U { a, .. } = u; //~ ERROR `..` cannot be used in union patterns
 
 error: aborting due to 13 previous errors
 
-You've got a few errors: E0026, E0436, E0560
-If you want more information on an error, try using "rustc --explain E0026"
+Some errors occurred: E0026, E0436, E0560.
+For more information about an error, try `rustc --explain E0026`.
diff --git a/src/test/ui/union/union-sized-field.stderr b/src/test/ui/union/union-sized-field.stderr
index 4f2d00aaa3e..fb81a7b695d 100644
--- a/src/test/ui/union/union-sized-field.stderr
+++ b/src/test/ui/union/union-sized-field.stderr
@@ -30,4 +30,4 @@ LL |     Value(T), //~ ERROR the trait bound `T: std::marker::Sized` is not sati
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/union/union-suggest-field.stderr b/src/test/ui/union/union-suggest-field.stderr
index f2ff38bd0c7..631aacb0289 100644
--- a/src/test/ui/union/union-suggest-field.stderr
+++ b/src/test/ui/union/union-suggest-field.stderr
@@ -20,5 +20,5 @@ LL |     let y = u.calculate; //~ ERROR attempted to take value of method `calcu
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0560, E0609, E0615
-If you want more information on an error, try using "rustc --explain E0560"
+Some errors occurred: E0560, E0609, E0615.
+For more information about an error, try `rustc --explain E0560`.
diff --git a/src/test/ui/unknown-language-item.stderr b/src/test/ui/unknown-language-item.stderr
index b97971c29dc..95ce5db33ae 100644
--- a/src/test/ui/unknown-language-item.stderr
+++ b/src/test/ui/unknown-language-item.stderr
@@ -6,4 +6,4 @@ LL | #[lang = "foo"]
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0522"
+For more information about this error, try `rustc --explain E0522`.
diff --git a/src/test/ui/unsafe-const-fn.stderr b/src/test/ui/unsafe-const-fn.stderr
index 43b8e36baf2..270b90ec3fc 100644
--- a/src/test/ui/unsafe-const-fn.stderr
+++ b/src/test/ui/unsafe-const-fn.stderr
@@ -6,4 +6,4 @@ LL | const VAL: u32 = dummy(0xFFFF);
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0133"
+For more information about this error, try `rustc --explain E0133`.
diff --git a/src/test/ui/unsized-enum2.stderr b/src/test/ui/unsized-enum2.stderr
index f2bfa6b8214..c05c1cfe412 100644
--- a/src/test/ui/unsized-enum2.stderr
+++ b/src/test/ui/unsized-enum2.stderr
@@ -188,4 +188,4 @@ LL |     VL{u: isize, x: Path4}, //~ ERROR `PathHelper4 + 'static: std::marker::
 
 error: aborting due to 20 previous errors
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/use-mod.stderr b/src/test/ui/use-mod.stderr
index 0a63f370d97..dcdba6fce9a 100644
--- a/src/test/ui/use-mod.stderr
+++ b/src/test/ui/use-mod.stderr
@@ -30,5 +30,5 @@ LL |     self as other_bar
 
 error: aborting due to 3 previous errors
 
-You've got a few errors: E0252, E0430, E0431
-If you want more information on an error, try using "rustc --explain E0252"
+Some errors occurred: E0252, E0430, E0431.
+For more information about an error, try `rustc --explain E0252`.
diff --git a/src/test/ui/use-nested-groups-error.stderr b/src/test/ui/use-nested-groups-error.stderr
index 64bbc7b588e..5e0fd503bc2 100644
--- a/src/test/ui/use-nested-groups-error.stderr
+++ b/src/test/ui/use-nested-groups-error.stderr
@@ -6,4 +6,4 @@ LL | use a::{b1::{C1, C2}, B2};
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0432"
+For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/variadic-ffi-3.stderr b/src/test/ui/variadic-ffi-3.stderr
index b9a84a0cd37..c7355405b2a 100644
--- a/src/test/ui/variadic-ffi-3.stderr
+++ b/src/test/ui/variadic-ffi-3.stderr
@@ -72,5 +72,5 @@ LL |         foo(1, 2, 1u16); //~ ERROR can't pass `u16` to variadic function
 
 error: aborting due to 10 previous errors
 
-You've got a few errors: E0060, E0308, E0617
-If you want more information on an error, try using "rustc --explain E0060"
+Some errors occurred: E0060, E0308, E0617.
+For more information about an error, try `rustc --explain E0060`.
diff --git a/src/test/ui/variance-unused-type-param.stderr b/src/test/ui/variance-unused-type-param.stderr
index d606c5ef6ed..b3ae91a6fa5 100644
--- a/src/test/ui/variance-unused-type-param.stderr
+++ b/src/test/ui/variance-unused-type-param.stderr
@@ -24,4 +24,4 @@ LL | enum ListCell<T> {
 
 error: aborting due to 3 previous errors
 
-If you want more information on this error, try using "rustc --explain E0392"
+For more information about this error, try `rustc --explain E0392`.
diff --git a/src/test/ui/vector-no-ann.stderr b/src/test/ui/vector-no-ann.stderr
index c3849bb82ba..90acc2f86d7 100644
--- a/src/test/ui/vector-no-ann.stderr
+++ b/src/test/ui/vector-no-ann.stderr
@@ -8,4 +8,4 @@ LL |     let _foo = Vec::new();
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0282"
+For more information about this error, try `rustc --explain E0282`.
diff --git a/src/tools/compiletest/src/json.rs b/src/tools/compiletest/src/json.rs
index 08630628b71..761d1e511d5 100644
--- a/src/tools/compiletest/src/json.rs
+++ b/src/tools/compiletest/src/json.rs
@@ -24,6 +24,7 @@ struct Diagnostic {
     level: String,
     spans: Vec<DiagnosticSpan>,
     children: Vec<Diagnostic>,
+    rendered: Option<String>,
 }
 
 #[derive(Deserialize, Clone)]
@@ -56,6 +57,25 @@ struct DiagnosticCode {
     explanation: Option<String>,
 }
 
+pub fn extract_rendered(output: &str, proc_res: &ProcRes) -> String {
+    output.lines()
+        .filter_map(|line| if line.starts_with('{') {
+            match serde_json::from_str::<Diagnostic>(line) {
+                Ok(diagnostic) => diagnostic.rendered,
+                Err(error) => {
+                    proc_res.fatal(Some(&format!("failed to decode compiler output as json: \
+                                                  `{}`\noutput: {}\nline: {}",
+                                                 error,
+                                                 line,
+                                                 output)));
+                }
+            }
+        } else {
+            None
+        })
+        .collect()
+}
+
 pub fn parse_output(file_name: &str, output: &str, proc_res: &ProcRes) -> Vec<Error> {
     output.lines()
         .flat_map(|line| parse_line(file_name, line, output, proc_res))
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 6619838cce0..953a13a3f58 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -248,7 +248,7 @@ impl<'test> TestCx<'test> {
     }
 
     fn run_cfail_test(&self) {
-        let proc_res = self.compile_test(&[]);
+        let proc_res = self.compile_test();
         self.check_if_test_should_compile(&proc_res);
         self.check_no_compiler_crash(&proc_res);
 
@@ -267,7 +267,7 @@ impl<'test> TestCx<'test> {
     }
 
     fn run_rfail_test(&self) {
-        let proc_res = self.compile_test(&[]);
+        let proc_res = self.compile_test();
 
         if !proc_res.status.success() {
             self.fatal_proc_rec("compilation failed!", &proc_res);
@@ -309,7 +309,7 @@ impl<'test> TestCx<'test> {
     }
 
     fn run_rpass_test(&self) {
-        let proc_res = self.compile_test(&[]);
+        let proc_res = self.compile_test();
 
         if !proc_res.status.success() {
             self.fatal_proc_rec("compilation failed!", &proc_res);
@@ -336,7 +336,7 @@ impl<'test> TestCx<'test> {
             return self.run_rpass_test();
         }
 
-        let mut proc_res = self.compile_test(&[]);
+        let mut proc_res = self.compile_test();
 
         if !proc_res.status.success() {
             self.fatal_proc_rec("compilation failed!", &proc_res);
@@ -578,7 +578,7 @@ impl<'test> TestCx<'test> {
         let mut cmds = commands.join("\n");
 
         // compile test file (it should have 'compile-flags:-g' in the header)
-        let compiler_run_result = self.compile_test(&[]);
+        let compiler_run_result = self.compile_test();
         if !compiler_run_result.status.success() {
             self.fatal_proc_rec("compilation failed!", &compiler_run_result);
         }
@@ -835,7 +835,7 @@ impl<'test> TestCx<'test> {
 
     fn run_debuginfo_lldb_test_no_opt(&self) {
         // compile test file (it should have 'compile-flags:-g' in the header)
-        let compile_result = self.compile_test(&[]);
+        let compile_result = self.compile_test();
         if !compile_result.status.success() {
             self.fatal_proc_rec("compilation failed!", &compile_result);
         }
@@ -1272,15 +1272,12 @@ impl<'test> TestCx<'test> {
         }
     }
 
-    fn compile_test(&self, extra_args: &[&'static str]) -> ProcRes {
+    fn compile_test(&self) -> ProcRes {
         let mut rustc = self.make_compile_args(
             &self.testpaths.file,
             TargetLocation::ThisFile(self.make_exe_name()),
         );
 
-        if !extra_args.is_empty() {
-            rustc.args(extra_args);
-        }
         rustc.arg("-L").arg(&self.aux_output_dir_name());
 
         match self.config.mode {
@@ -1626,12 +1623,14 @@ impl<'test> TestCx<'test> {
                 if self.props.error_patterns.is_empty() {
                     rustc.args(&["--error-format", "json"]);
                 }
+                if !self.props.disable_ui_testing_normalization {
+                    rustc.arg("-Zui-testing");
+                }
             }
             Ui => {
-                // In case no "--error-format" has been given in the test, we'll compile
-                // a first time to get the compiler's output then compile with
-                // "--error-format json" to check if all expected errors are actually there
-                // and that no new one appeared.
+                if !self.props.compile_flags.iter().any(|s| s.starts_with("--error-format")) {
+                    rustc.args(&["--error-format", "json"]);
+                }
                 if !self.props.disable_ui_testing_normalization {
                     rustc.arg("-Zui-testing");
                 }
@@ -2114,7 +2113,7 @@ impl<'test> TestCx<'test> {
     fn run_codegen_units_test(&self) {
         assert!(self.revision.is_none(), "revisions not relevant here");
 
-        let proc_res = self.compile_test(&[]);
+        let proc_res = self.compile_test();
 
         if !proc_res.status.success() {
             self.fatal_proc_rec("compilation failed!", &proc_res);
@@ -2505,7 +2504,7 @@ impl<'test> TestCx<'test> {
             .iter()
             .any(|s| s.contains("--error-format"));
 
-        let proc_res = self.compile_test(&[]);
+        let proc_res = self.compile_test();
         self.check_if_test_should_compile(&proc_res);
 
         let expected_stderr_path = self.expected_output_path(UI_STDERR);
@@ -2517,8 +2516,13 @@ impl<'test> TestCx<'test> {
         let normalized_stdout =
             self.normalize_output(&proc_res.stdout, &self.props.normalize_stdout);
 
-        let normalized_stderr = self.normalize_output(&proc_res.stderr,
-                                                      &self.props.normalize_stderr);
+        let stderr = if explicit {
+            proc_res.stderr.clone()
+        } else {
+            json::extract_rendered(&proc_res.stderr, &proc_res)
+        };
+
+        let normalized_stderr = self.normalize_output(&stderr, &self.props.normalize_stderr);
 
         let mut errors = 0;
         errors += self.compare_output("stdout", &normalized_stdout, &expected_stdout);
@@ -2551,7 +2555,6 @@ impl<'test> TestCx<'test> {
             }
         }
         if !explicit {
-            let proc_res = self.compile_test(&["--error-format", "json"]);
             if !expected_errors.is_empty() || !proc_res.status.success() {
                 // "// error-pattern" comments
                 self.check_expected_errors(expected_errors, &proc_res);
@@ -2563,7 +2566,7 @@ impl<'test> TestCx<'test> {
     }
 
     fn run_mir_opt_test(&self) {
-        let proc_res = self.compile_test(&[]);
+        let proc_res = self.compile_test();
 
         if !proc_res.status.success() {
             self.fatal_proc_rec("compilation failed!", &proc_res);