Skip to content

Consistently use 'supertrait'. - #89453

Merged
bors merged 1 commit into
rust-lang:masterfrom
waywardmonkeys:consistent-supertrait-usage
Oct 4, 2021
Merged

Consistently use 'supertrait'.#89453
bors merged 1 commit into
rust-lang:masterfrom
waywardmonkeys:consistent-supertrait-usage

Conversation

@waywardmonkeys

Copy link
Copy Markdown
Contributor

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.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nagisa

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 2, 2021
@rust-log-analyzer

This comment has been minimized.

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.
@waywardmonkeys
waywardmonkeysforce-pushed the consistent-supertrait-usage branch from e39c62b to 058a21dCompareOctober 2, 2021 01:06
@nagisa

Copy link
Copy Markdown
Member

There are a ton of prior art of "super" and especially "sub" being combined into a single word (cf. subset, superset, subtext, supernormal...) so this seems… right?

There are a fair number of uses of super type around too, though.

@waywardmonkeys

Copy link
Copy Markdown
ContributorAuthor

The reference also defines it as supertrait and subtrait and uses that consistently in all but one spot, which I've also submitted a PR for.

I also looked at which usage had more steam in this repo and it was the supertrait form. :)

@nagisa

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Oct 2, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 058a21d has been approved by nagisa

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 2, 2021
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 3, 2021
…t-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.
@ManishearthManishearth mentioned this pull request Oct 3, 2021
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 4, 2021
…t-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.
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 4, 2021
…t-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.
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 4, 2021
…ingjubilee
Rollup of 13 pull requests
Successful merges:
- rust-lang#83655 ([aarch64] add target feature outline-atomics)
- rust-lang#87091 (implement advance_(back_)_by on more iterators)
- rust-lang#88451 (Fix an ICE caused by type mismatch errors being ignored)
- rust-lang#88452 (VecDeque: improve performance for From<[T; N]>)
- rust-lang#89400 (Improve wording of `map_or_else` docs)
- rust-lang#89407 (Recommend running `cargo clean` in E0514 output)
- rust-lang#89443 (Include the length in BTree hashes)
- rust-lang#89444 (rustdoc: use slice::contains instead of open-coding it)
- rust-lang#89447 (Improve error message for missing angle brackets in `[_]::method`)
- rust-lang#89453 (Consistently use 'supertrait'.)
- rust-lang#89483 (Practice diagnostic message convention)
- rust-lang#89500 (Fix ICE with buffered lint referring to AST node deleted by everybody_loops)
- rust-lang#89508 (Stabilize `const_panic`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 2bc89ce into rust-lang:masterOct 4, 2021
@rustbotrustbot added this to the 1.57.0 milestone Oct 4, 2021
@waywardmonkeys
waywardmonkeys deleted the consistent-supertrait-usage branch August 21, 2023 13:14
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@waywardmonkeys@rust-highfive@rust-log-analyzer@nagisa@bors@rustbot