about summary refs log tree commit diff
path: root/compiler/rustc_driver/src
diff options
context:
space:
mode:
authorJubilee <46493976+workingjubilee@users.noreply.github.com>2021-10-04 13:58:14 -0700
committerGitHub <noreply@github.com>2021-10-04 13:58:14 -0700
commit2bc89ce0bf2fff897ccbf89c6e7aee71681d7cc1 (patch)
tree3dd424f2714be4d2b878e9009fb2288675102c44 /compiler/rustc_driver/src
parent08dd4148f1cdc0ba7fd6729def893bb08e0cd84d (diff)
parent058a21d5cf65021f3f468b445d003dbba74054db (diff)
downloadrust-2bc89ce0bf2fff897ccbf89c6e7aee71681d7cc1.tar.gz
rust-2bc89ce0bf2fff897ccbf89c6e7aee71681d7cc1.zip
Rollup merge of #89453 - waywardmonkeys:consistent-supertrait-usage, r=nagisa
Consistently use 'supertrait'.

A subset of places referred to 'super-trait', so this changes them
to all use 'supertrait'. This matches 'supertype' and some other
usages. An exception is 'auto-trait' which is consistently used
in that manner.
Diffstat (limited to 'compiler/rustc_driver/src')
-rw-r--r--compiler/rustc_driver/src/pretty.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_driver/src/pretty.rs b/compiler/rustc_driver/src/pretty.rs
index e52eef0fcbd..8e8bea9525d 100644
--- a/compiler/rustc_driver/src/pretty.rs
+++ b/compiler/rustc_driver/src/pretty.rs
@@ -88,7 +88,7 @@ trait PrinterSupport: pprust::PpAnn {
     /// Produces the pretty-print annotation object.
     ///
     /// (Rust does not yet support upcasting from a trait object to
-    /// an object for one of its super-traits.)
+    /// an object for one of its supertraits.)
     fn pp_ann(&self) -> &dyn pprust::PpAnn;
 }
 
@@ -104,7 +104,7 @@ trait HirPrinterSupport<'hir>: pprust_hir::PpAnn {
     /// Produces the pretty-print annotation object.
     ///
     /// (Rust does not yet support upcasting from a trait object to
-    /// an object for one of its super-traits.)
+    /// an object for one of its supertraits.)
     fn pp_ann(&self) -> &dyn pprust_hir::PpAnn;
 }