Skip to content

Commit c601ade

Browse files
oli-obkoli-obk
committed
Refactor away the need for some descr methods.
Instead we use `Display` impls and their `alternate` render scheme to decide whether we want backticks or not.
1 parent 92b41ee commit c601ade

File tree

5 files changed

+32
-38
lines changed
  • compiler
    • rustc_const_eval/src/transform/check_consts
    • rustc_hir/src
    • rustc_infer/src/infer/error_reporting
    • rustc_middle/src/ty
    • rustc_trait_selection/src/traits/error_reporting

5 files changed

+32
-38
lines changed

‎compiler/rustc_const_eval/src/transform/check_consts/ops.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ impl<'tcx> NonConstOp<'tcx> for Coroutine {
372372
ccx: &ConstCx<'_, 'tcx>,
373373
span: Span,
374374
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
375-
let msg = format!("{}s are not allowed in {}s", self.0.descr(), ccx.const_kind());
375+
let msg = format!("{:#}s are not allowed in {}s", self.0, ccx.const_kind());
376376
if let hir::CoroutineKind::Async(hir::CoroutineSource::Block) = self.0 {
377377
ccx.tcx.sess.create_feature_err(
378378
errors::UnallowedOpInConstContext { span, msg },

‎compiler/rustc_hir/src/hir.rs

+12-23
Original file line numberDiff line numberDiff line change
@@ -1520,21 +1520,19 @@ pub enum CoroutineKind {
15201520
impl fmt::Display for CoroutineKind {
15211521
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
15221522
match self {
1523-
CoroutineKind::Async(k) => fmt::Display::fmt(k, f),
1523+
CoroutineKind::Async(k) => {
1524+
if f.alternate() {
1525+
f.write_str("`async` ")?;
1526+
} else {
1527+
f.write_str("async ")?
1528+
}
1529+
k.fmt(f)
1530+
}
15241531
CoroutineKind::Coroutine => f.write_str("coroutine"),
15251532
}
15261533
}
15271534
}
15281535

1529-
impl CoroutineKind {
1530-
pub fn descr(&self) -> &'static str {
1531-
match self {
1532-
CoroutineKind::Async(ask) => ask.descr(),
1533-
CoroutineKind::Coroutine => "coroutine",
1534-
}
1535-
}
1536-
}
1537-
15381536
/// In the case of a coroutine created as part of an async/gen construct,
15391537
/// which kind of async/gen construct caused it to be created?
15401538
///
@@ -1555,21 +1553,12 @@ pub enum CoroutineSource {
15551553

15561554
impl fmt::Display for CoroutineSource {
15571555
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
1558-
f.write_str(match self {
1559-
CoroutineSource::Block => "async block",
1560-
CoroutineSource::Closure => "async closure body",
1561-
CoroutineSource::Fn => "async fn body",
1562-
})
1563-
}
1564-
}
1565-
1566-
impl CoroutineSource {
1567-
pub fn descr(&self) -> &'static str {
15681556
match self {
1569-
CoroutineSource::Block => "`async` block",
1570-
CoroutineSource::Closure => "`async` closure body",
1571-
CoroutineSource::Fn => "`async` fn body",
1557+
CoroutineSource::Block => "block",
1558+
CoroutineSource::Closure => "closure body",
1559+
CoroutineSource::Fn => "fn body",
15721560
}
1561+
.fmt(f)
15731562
}
15741563
}
15751564

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs

+11-10
Original file line numberDiff line numberDiff line change
@@ -1584,14 +1584,13 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
15841584
target: &str,
15851585
types: &FxIndexMap<TyCategory, FxIndexSet<Span>>,
15861586
) {
1587-
for (key, values) in types.iter() {
1587+
for (kind, values) in types.iter() {
15881588
let count = values.len();
1589-
let kind = key.descr();
15901589
for &sp in values {
15911590
err.span_label(
15921591
sp,
15931592
format!(
1594-
"{}{} {}{}",
1593+
"{}{} {:#}{}",
15951594
if count == 1 { "the " } else { "one of the " },
15961595
target,
15971596
kind,
@@ -2952,17 +2951,19 @@ pub enum TyCategory {
29522951
Foreign,
29532952
}
29542953

2955-
impl TyCategory {
2956-
fn descr(&self) -> &'static str {
2954+
impl fmt::Display for TyCategory {
2955+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
29572956
match self {
2958-
Self::Closure => "closure",
2959-
Self::Opaque => "opaque type",
2960-
Self::OpaqueFuture => "future",
2961-
Self::Coroutine(gk) => gk.descr(),
2962-
Self::Foreign => "foreign type",
2957+
Self::Closure => "closure".fmt(f),
2958+
Self::Opaque => "opaque type".fmt(f),
2959+
Self::OpaqueFuture => "future".fmt(f),
2960+
Self::Coroutine(gk) => gk.fmt(f),
2961+
Self::Foreign => "foreign type".fmt(f),
29632962
}
29642963
}
2964+
}
29652965

2966+
impl TyCategory {
29662967
pub fn from_ty(tcx: TyCtxt<'_>, ty: Ty<'_>) -> Option<(Self, DefId)> {
29672968
match *ty.kind() {
29682969
ty::Closure(def_id, _) => Some((Self::Closure, def_id)),

‎compiler/rustc_middle/src/ty/error.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,9 @@ impl<'tcx> Ty<'tcx> {
241241
}
242242
ty::Dynamic(..) => "trait object".into(),
243243
ty::Closure(..) => "closure".into(),
244-
ty::Coroutine(def_id, ..) => tcx.coroutine_kind(def_id).unwrap().descr().into(),
244+
ty::Coroutine(def_id, ..) => {
245+
format!("{:#}", tcx.coroutine_kind(def_id).unwrap()).into()
246+
}
245247
ty::CoroutineWitness(..) => "coroutine witness".into(),
246248
ty::Infer(ty::TyVar(_)) => "inferred type".into(),
247249
ty::Infer(ty::IntVar(_)) => "integer".into(),
@@ -299,7 +301,9 @@ impl<'tcx> Ty<'tcx> {
299301
ty::FnPtr(_) => "fn pointer".into(),
300302
ty::Dynamic(..) => "trait object".into(),
301303
ty::Closure(..) => "closure".into(),
302-
ty::Coroutine(def_id, ..) => tcx.coroutine_kind(def_id).unwrap().descr().into(),
304+
ty::Coroutine(def_id, ..) => {
305+
format!("{:#}", tcx.coroutine_kind(def_id).unwrap()).into()
306+
}
303307
ty::CoroutineWitness(..) => "coroutine witness".into(),
304308
ty::Tuple(..) => "tuple".into(),
305309
ty::Placeholder(..) => "higher-ranked type".into(),

‎compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2995,11 +2995,11 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
29952995
let sp = self.tcx.def_span(def_id);
29962996

29972997
// Special-case this to say "async block" instead of `[static coroutine]`.
2998-
let kind = tcx.coroutine_kind(def_id).unwrap().descr();
2998+
let kind = tcx.coroutine_kind(def_id).unwrap();
29992999
err.span_note(
30003000
sp,
30013001
with_forced_trimmed_paths!(format!(
3002-
"required because it's used within this {kind}",
3002+
"required because it's used within this {kind:#}",
30033003
)),
30043004
)
30053005
}

0 commit comments

Comments
 (0)