Rollup merge of #118245 - fee1-dead-contrib:span-tilde-const, r=compiler-errors

compiler-errors · web-flow · commit b5d336ffaecd · 2023-11-24T07:29:13.000-08:00
Add `Span` to `TraitBoundModifier`

This improves diagnostics for the message "`~const` is not allowed here", and also fixes the span that we use when desugaring `~const Tr` into `Tr&lt;host&gt;` in effects desugaring.
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
@@ -301,7 +301,7 @@ pub enum TraitBoundModifier {
     Maybe,
 
     /// `~const Trait`
-    MaybeConst,
+    MaybeConst(Span),
 
     /// `~const !Trait`
     //
@@ -317,8 +317,7 @@ pub enum TraitBoundModifier {
 impl TraitBoundModifier {
     pub fn to_constness(self) -> Const {
         match self {
-            // FIXME(effects) span
-            Self::MaybeConst => Const::Yes(DUMMY_SP),
+            Self::MaybeConst(span) => Const::Yes(span),
             _ => Const::No,
         }
     }
@@ -3155,7 +3154,7 @@ mod size_asserts {
     static_assert_size!(ForeignItem, 96);
     static_assert_size!(ForeignItemKind, 24);
     static_assert_size!(GenericArg, 24);
-    static_assert_size!(GenericBound, 56);
+    static_assert_size!(GenericBound, 64);
     static_assert_size!(Generics, 40);
     static_assert_size!(Impl, 136);
     static_assert_size!(Item, 136);
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
@@ -1369,7 +1369,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                             GenericBound::Trait(
                                 ty,
                                 modifier @ (TraitBoundModifier::None
-                                | TraitBoundModifier::MaybeConst
+                                | TraitBoundModifier::MaybeConst(_)
                                 | TraitBoundModifier::Negative),
                             ) => {
                                 Some(this.lower_poly_trait_ref(ty, itctx, modifier.to_constness()))
@@ -2227,7 +2227,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
     fn lower_trait_bound_modifier(&mut self, f: TraitBoundModifier) -> hir::TraitBoundModifier {
         match f {
             TraitBoundModifier::None => hir::TraitBoundModifier::None,
-            TraitBoundModifier::MaybeConst => hir::TraitBoundModifier::MaybeConst,
+            TraitBoundModifier::MaybeConst(_) => hir::TraitBoundModifier::MaybeConst,
 
             TraitBoundModifier::Negative => {
                 if self.tcx.features().negative_bounds {
diff --git a/compiler/rustc_ast_passes/src/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs
@@ -1203,7 +1203,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                 (BoundKind::TraitObject, TraitBoundModifier::Maybe) => {
                     self.err_handler().emit_err(errors::OptionalTraitObject { span: poly.span });
                 }
-                (_, TraitBoundModifier::MaybeConst)
+                (_, &TraitBoundModifier::MaybeConst(span))
                     if let Some(reason) = &self.disallow_tilde_const =>
                 {
                     let reason = match reason {
@@ -1224,8 +1224,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                         }
                         DisallowTildeConstContext::Item => errors::TildeConstReason::Item,
                     };
-                    self.err_handler()
-                        .emit_err(errors::TildeConstDisallowed { span: bound.span(), reason });
+                    self.err_handler().emit_err(errors::TildeConstDisallowed { span, reason });
                 }
                 (_, TraitBoundModifier::MaybeConstMaybe) => {
                     self.err_handler().emit_err(errors::OptionalConstExclusive {
diff --git a/compiler/rustc_ast_pretty/src/pprust/state.rs b/compiler/rustc_ast_pretty/src/pprust/state.rs
@@ -1515,7 +1515,7 @@ impl<'a> State<'a> {
                         TraitBoundModifier::Maybe => {
                             self.word("?");
                         }
-                        TraitBoundModifier::MaybeConst => {
+                        TraitBoundModifier::MaybeConst(_) => {
                             self.word_space("~const");
                         }
                         TraitBoundModifier::MaybeConstNegative => {
diff --git a/compiler/rustc_expand/src/build.rs b/compiler/rustc_expand/src/build.rs
@@ -4,7 +4,7 @@ use rustc_ast::{self as ast, AttrVec, BlockCheckMode, Expr, LocalKind, PatKind,
 use rustc_ast::{attr, token, util::literal};
 use rustc_span::source_map::Spanned;
 use rustc_span::symbol::{kw, sym, Ident, Symbol};
-use rustc_span::Span;
+use rustc_span::{Span, DUMMY_SP};
 use thin_vec::{thin_vec, ThinVec};
 
 impl<'a> ExtCtxt<'a> {
@@ -135,7 +135,7 @@ impl<'a> ExtCtxt<'a> {
         ast::GenericBound::Trait(
             self.poly_trait_ref(path.span, path),
             if is_const {
-                ast::TraitBoundModifier::MaybeConst
+                ast::TraitBoundModifier::MaybeConst(DUMMY_SP)
             } else {
                 ast::TraitBoundModifier::None
             },
diff --git a/compiler/rustc_parse/src/parser/ty.rs b/compiler/rustc_parse/src/parser/ty.rs
@@ -37,7 +37,7 @@ impl BoundModifiers {
             (BoundPolarity::Positive, None) => TraitBoundModifier::None,
             (BoundPolarity::Negative(_), None) => TraitBoundModifier::Negative,
             (BoundPolarity::Maybe(_), None) => TraitBoundModifier::Maybe,
-            (BoundPolarity::Positive, Some(_)) => TraitBoundModifier::MaybeConst,
+            (BoundPolarity::Positive, Some(sp)) => TraitBoundModifier::MaybeConst(sp),
             (BoundPolarity::Negative(_), Some(_)) => TraitBoundModifier::MaybeConstNegative,
             (BoundPolarity::Maybe(_), Some(_)) => TraitBoundModifier::MaybeConstMaybe,
         }
diff --git a/src/tools/rustfmt/src/types.rs b/src/tools/rustfmt/src/types.rs
@@ -546,7 +546,7 @@ impl Rewrite for ast::GenericBound {
                     ast::TraitBoundModifier::Maybe => poly_trait_ref
                         .rewrite(context, shape.offset_left(1)?)
                         .map(|s| format!("?{}", s)),
-                    ast::TraitBoundModifier::MaybeConst => poly_trait_ref
+                    ast::TraitBoundModifier::MaybeConst(_) => poly_trait_ref
                         .rewrite(context, shape.offset_left(7)?)
                         .map(|s| format!("~const {}", s)),
                     ast::TraitBoundModifier::MaybeConstMaybe => poly_trait_ref
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type-const-bound-usage.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type-const-bound-usage.stderr
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
   --> $DIR/assoc-type-const-bound-usage.rs:7:17
    |
 LL |     type Assoc: ~const Foo;
-   |                 ^^^^^^^^^^
+   |                 ^^^^^^
    |
    = note: this item cannot have `~const` trait bounds
 
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type.stderr
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
   --> $DIR/assoc-type.rs:17:15
    |
 LL |     type Bar: ~const std::ops::Add;
-   |               ^^^^^^^^^^^^^^^^^^^^
+   |               ^^^^^^
    |
    = note: this item cannot have `~const` trait bounds
 
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-bound-on-not-const-associated-fn.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-bound-on-not-const-associated-fn.stderr
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
   --> $DIR/const-bound-on-not-const-associated-fn.rs:9:40
    |
 LL |     fn do_something_else() where Self: ~const MyTrait;
-   |                                        ^^^^^^^^^^^^^^
+   |                                        ^^^^^^
    |
 note: this function is not `const`, so it cannot have `~const` trait bounds
   --> $DIR/const-bound-on-not-const-associated-fn.rs:9:8
@@ -14,7 +14,7 @@ error: `~const` is not allowed here
   --> $DIR/const-bound-on-not-const-associated-fn.rs:20:32
    |
 LL |     pub fn foo(&self) where T: ~const MyTrait {
-   |                                ^^^^^^^^^^^^^^
+   |                                ^^^^^^
    |
 note: this function is not `const`, so it cannot have `~const` trait bounds
   --> $DIR/const-bound-on-not-const-associated-fn.rs:20:12
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.precise.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.precise.stderr
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
   --> $DIR/const-drop.rs:67:38
    |
 LL |     pub struct ConstDropWithBound<T: ~const SomeTrait>(pub core::marker::PhantomData<T>);
-   |                                      ^^^^^^^^^^^^^^^^
+   |                                      ^^^^^^
    |
    = note: this item cannot have `~const` trait bounds
 
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.stock.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.stock.stderr
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
   --> $DIR/const-drop.rs:67:38
    |
 LL |     pub struct ConstDropWithBound<T: ~const SomeTrait>(pub core::marker::PhantomData<T>);
-   |                                      ^^^^^^^^^^^^^^^^
+   |                                      ^^^^^^
    |
    = note: this item cannot have `~const` trait bounds
 
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.nn.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.nn.stderr
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
   --> $DIR/super-traits-fail-2.rs:11:12
    |
 LL | trait Bar: ~const Foo {}
-   |            ^^^^^^^^^^
+   |            ^^^^^^
    |
 note: this trait is not a `#[const_trait]`, so it cannot have `~const` trait bounds
   --> $DIR/super-traits-fail-2.rs:11:1
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.yn.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.yn.stderr
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
   --> $DIR/super-traits-fail-2.rs:11:12
    |
 LL | trait Bar: ~const Foo {}
-   |            ^^^^^^^^^^
+   |            ^^^^^^
    |
 note: this trait is not a `#[const_trait]`, so it cannot have `~const` trait bounds
   --> $DIR/super-traits-fail-2.rs:11:1
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.nn.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.nn.stderr
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
   --> $DIR/super-traits-fail-3.rs:13:12
    |
 LL | trait Bar: ~const Foo {}
-   |            ^^^^^^^^^^
+   |            ^^^^^^
    |
 note: this trait is not a `#[const_trait]`, so it cannot have `~const` trait bounds
   --> $DIR/super-traits-fail-3.rs:13:1
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.yn.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.yn.stderr
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
   --> $DIR/super-traits-fail-3.rs:13:12
    |
 LL | trait Bar: ~const Foo {}
-   |            ^^^^^^^^^^
+   |            ^^^^^^
    |
 note: this trait is not a `#[const_trait]`, so it cannot have `~const` trait bounds
   --> $DIR/super-traits-fail-3.rs:13:1
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-and-const-params.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-and-const-params.stderr
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
   --> $DIR/tilde-const-and-const-params.rs:9:15
    |
 LL |     fn add<A: ~const Add42>(self) -> Foo<{ A::add(N) }> {
-   |               ^^^^^^^^^^^^
+   |               ^^^^^^
    |
 note: this function is not `const`, so it cannot have `~const` trait bounds
   --> $DIR/tilde-const-and-const-params.rs:9:8
@@ -14,7 +14,7 @@ error: `~const` is not allowed here
   --> $DIR/tilde-const-and-const-params.rs:27:11
    |
 LL | fn bar<A: ~const Add42, const N: usize>(_: Foo<N>) -> Foo<{ A::add(N) }> {
-   |           ^^^^^^^^^^^^
+   |           ^^^^^^
    |
 note: this function is not `const`, so it cannot have `~const` trait bounds
   --> $DIR/tilde-const-and-const-params.rs:27:4
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-invalid-places.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-invalid-places.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause.stderr
diff --git a/tests/ui/stats/hir-stats.stderr b/tests/ui/stats/hir-stats.stderr

Original file line number	Diff line number	Diff line change
`@@ -1203,7 +1203,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {`
`1203`	`1203`	`(BoundKind::TraitObject, TraitBoundModifier::Maybe) => {`
`1204`	`1204`	`self.err_handler().emit_err(errors::OptionalTraitObject { span: poly.span });`
`1205`	`1205`	`}`
`1206`		`- (_, TraitBoundModifier::MaybeConst)`
	`1206`	`+ (_, &TraitBoundModifier::MaybeConst(span))`
`1207`	`1207`	`if let Some(reason) = &self.disallow_tilde_const =>`
`1208`	`1208`	`{`
`1209`	`1209`	`let reason = match reason {`
`@@ -1224,8 +1224,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {`
`1224`	`1224`	`}`
`1225`	`1225`	`DisallowTildeConstContext::Item => errors::TildeConstReason::Item,`
`1226`	`1226`	`};`
`1227`		`- self.err_handler()`
`1228`		`- .emit_err(errors::TildeConstDisallowed { span: bound.span(), reason });`
	`1227`	`+ self.err_handler().emit_err(errors::TildeConstDisallowed { span, reason });`
`1229`	`1228`	`}`
`1230`	`1229`	`(_, TraitBoundModifier::MaybeConstMaybe) => {`
`1231`	`1230`	`self.err_handler().emit_err(errors::OptionalConstExclusive {`
Original file line number	Diff line number	Diff line change
`@@ -1515,7 +1515,7 @@ impl<'a> State<'a> {`
`1515`	`1515`	`TraitBoundModifier::Maybe => {`
`1516`	`1516`	`self.word("?");`
`1517`	`1517`	`}`
`1518`		`- TraitBoundModifier::MaybeConst => {`
	`1518`	`+ TraitBoundModifier::MaybeConst(_) => {`
`1519`	`1519`	`self.word_space("~const");`
`1520`	`1520`	`}`
`1521`	`1521`	`TraitBoundModifier::MaybeConstNegative => {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ impl BoundModifiers {`
`37`	`37`	`(BoundPolarity::Positive, None) => TraitBoundModifier::None,`
`38`	`38`	`(BoundPolarity::Negative(_), None) => TraitBoundModifier::Negative,`
`39`	`39`	`(BoundPolarity::Maybe(_), None) => TraitBoundModifier::Maybe,`
`40`		`- (BoundPolarity::Positive, Some(_)) => TraitBoundModifier::MaybeConst,`
	`40`	`+ (BoundPolarity::Positive, Some(sp)) => TraitBoundModifier::MaybeConst(sp),`
`41`	`41`	`(BoundPolarity::Negative(_), Some(_)) => TraitBoundModifier::MaybeConstNegative,`
`42`	`42`	`(BoundPolarity::Maybe(_), Some(_)) => TraitBoundModifier::MaybeConstMaybe,`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
`2`	`2`	`--> $DIR/assoc-type-const-bound-usage.rs:7:17`
`3`	`3`	`\|`
`4`	`4`	`LL \| type Assoc: ~const Foo;`
`5`		`- \| ^^^^^^^^^^`
	`5`	`+ \| ^^^^^^`
`6`	`6`	`\|`
`7`	`7`	= note: this item cannot have `~const` trait bounds
`8`	`8`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
`2`	`2`	`--> $DIR/assoc-type.rs:17:15`
`3`	`3`	`\|`
`4`	`4`	`LL \| type Bar: ~const std::ops::Add;`
`5`		`- \| ^^^^^^^^^^^^^^^^^^^^`
	`5`	`+ \| ^^^^^^`
`6`	`6`	`\|`
`7`	`7`	= note: this item cannot have `~const` trait bounds
`8`	`8`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
`2`	`2`	`--> $DIR/const-bound-on-not-const-associated-fn.rs:9:40`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn do_something_else() where Self: ~const MyTrait;`
`5`		`- \| ^^^^^^^^^^^^^^`
	`5`	`+ \| ^^^^^^`
`6`	`6`	`\|`
`7`	`7`	note: this function is not `const`, so it cannot have `~const` trait bounds
`8`	`8`	`--> $DIR/const-bound-on-not-const-associated-fn.rs:9:8`
@@ -14,7 +14,7 @@ error: `~const` is not allowed here
`14`	`14`	`--> $DIR/const-bound-on-not-const-associated-fn.rs:20:32`
`15`	`15`	`\|`
`16`	`16`	`LL \| pub fn foo(&self) where T: ~const MyTrait {`
`17`		`- \| ^^^^^^^^^^^^^^`
	`17`	`+ \| ^^^^^^`
`18`	`18`	`\|`
`19`	`19`	note: this function is not `const`, so it cannot have `~const` trait bounds
`20`	`20`	`--> $DIR/const-bound-on-not-const-associated-fn.rs:20:12`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
`2`	`2`	`--> $DIR/const-drop.rs:67:38`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub struct ConstDropWithBound<T: ~const SomeTrait>(pub core::marker::PhantomData<T>);`
`5`		`- \| ^^^^^^^^^^^^^^^^`
	`5`	`+ \| ^^^^^^`
`6`	`6`	`\|`
`7`	`7`	= note: this item cannot have `~const` trait bounds
`8`	`8`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
`2`	`2`	`--> $DIR/super-traits-fail-2.rs:11:12`
`3`	`3`	`\|`
`4`	`4`	`LL \| trait Bar: ~const Foo {}`
`5`		`- \| ^^^^^^^^^^`
	`5`	`+ \| ^^^^^^`
`6`	`6`	`\|`
`7`	`7`	note: this trait is not a `#[const_trait]`, so it cannot have `~const` trait bounds
`8`	`8`	`--> $DIR/super-traits-fail-2.rs:11:1`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
`2`	`2`	`--> $DIR/super-traits-fail-3.rs:13:12`
`3`	`3`	`\|`
`4`	`4`	`LL \| trait Bar: ~const Foo {}`
`5`		`- \| ^^^^^^^^^^`
	`5`	`+ \| ^^^^^^`
`6`	`6`	`\|`
`7`	`7`	note: this trait is not a `#[const_trait]`, so it cannot have `~const` trait bounds
`8`	`8`	`--> $DIR/super-traits-fail-3.rs:13:1`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error: `~const` is not allowed here
`2`	`2`	`--> $DIR/tilde-const-and-const-params.rs:9:15`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn add<A: ~const Add42>(self) -> Foo<{ A::add(N) }> {`
`5`		`- \| ^^^^^^^^^^^^`
	`5`	`+ \| ^^^^^^`
`6`	`6`	`\|`
`7`	`7`	note: this function is not `const`, so it cannot have `~const` trait bounds
`8`	`8`	`--> $DIR/tilde-const-and-const-params.rs:9:8`
@@ -14,7 +14,7 @@ error: `~const` is not allowed here
`14`	`14`	`--> $DIR/tilde-const-and-const-params.rs:27:11`
`15`	`15`	`\|`
`16`	`16`	`LL \| fn bar<A: ~const Add42, const N: usize>(_: Foo<N>) -> Foo<{ A::add(N) }> {`
`17`		`- \| ^^^^^^^^^^^^`
	`17`	`+ \| ^^^^^^`
`18`	`18`	`\|`
`19`	`19`	note: this function is not `const`, so it cannot have `~const` trait bounds
`20`	`20`	`--> $DIR/tilde-const-and-const-params.rs:27:4`