adjust const generics defaults FIXMEs to the new feature gate

lqd · lqd · commit 1fc3c4c16dde · 2021-01-01T11:01:01.000+01:00
diff --git a/compiler/rustc_ast_passes/src/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs
@@ -774,7 +774,7 @@ fn validate_generic_param_order(
                 }
                 GenericParamKind::Type { default: None } => (),
                 GenericParamKind::Lifetime => (),
-                // FIXME(const_generics:defaults)
+                // FIXME(const_generics_defaults)
                 GenericParamKind::Const { ty: _, kw_span: _, default: _ } => (),
             }
             first = false;
diff --git a/compiler/rustc_infer/src/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
@@ -958,7 +958,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                 ty::GenericParamDefKind::Type { has_default, .. } => {
                     Some((param.def_id, has_default))
                 }
-                ty::GenericParamDefKind::Const => None, // FIXME(const_generics:defaults)
+                ty::GenericParamDefKind::Const => None, // FIXME(const_generics_defaults)
             })
             .peekable();
         let has_default = {
diff --git a/compiler/rustc_metadata/src/rmeta/encoder.rs b/compiler/rustc_metadata/src/rmeta/encoder.rs
@@ -1834,7 +1834,7 @@ impl EncodeContext<'a, 'tcx> {
                         EntryKind::ConstParam,
                         true,
                     );
-                    // FIXME(const_generics:defaults)
+                    // FIXME(const_generics_defaults)
                 }
             }
         }
diff --git a/compiler/rustc_middle/src/ty/print/mod.rs b/compiler/rustc_middle/src/ty/print/mod.rs
@@ -203,7 +203,7 @@ pub trait Printer<'tcx>: Sized {
                                     self.tcx().type_of(param.def_id).subst(self.tcx(), substs),
                                 )
                     }
-                    ty::GenericParamDefKind::Const => false, // FIXME(const_generics:defaults)
+                    ty::GenericParamDefKind::Const => false, // FIXME(const_generics_defaults)
                 }
             })
             .count();
diff --git a/compiler/rustc_passes/src/stability.rs b/compiler/rustc_passes/src/stability.rs
@@ -443,7 +443,7 @@ impl<'a, 'tcx> Visitor<'tcx> for Annotator<'a, 'tcx> {
 
     fn visit_generic_param(&mut self, p: &'tcx hir::GenericParam<'tcx>) {
         let kind = match &p.kind {
-            // FIXME(const_generics:defaults)
+            // FIXME(const_generics_defaults)
             hir::GenericParamKind::Type { default, .. } if default.is_some() => {
                 AnnotationKind::Container
             }
diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs
@@ -214,7 +214,7 @@ enum ResolutionError<'a> {
     /// Error E0530: `X` bindings cannot shadow `Y`s.
     BindingShadowsSomethingUnacceptable(&'static str, Symbol, &'a NameBinding<'a>),
     /// Error E0128: type parameters with a default cannot use forward-declared identifiers.
-    ForwardDeclaredTyParam, // FIXME(const_generics:defaults)
+    ForwardDeclaredTyParam, // FIXME(const_generics_defaults)
     /// ERROR E0770: the type of const parameters must not depend on other generic parameters.
     ParamInTyOfConstParam(Symbol),
     /// constant values inside of type parameter defaults must not depend on generic parameters.
diff --git a/compiler/rustc_typeck/src/astconv/generics.rs b/compiler/rustc_typeck/src/astconv/generics.rs
@@ -387,7 +387,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                     defaults.types += has_default as usize
                 }
                 GenericParamDefKind::Const => {
-                    // FIXME(const_generics:defaults)
+                    // FIXME(const_generics_defaults)
                 }
             };
         }
diff --git a/compiler/rustc_typeck/src/astconv/mod.rs b/compiler/rustc_typeck/src/astconv/mod.rs
@@ -486,7 +486,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                     }
                     GenericParamDefKind::Const => {
                         let ty = tcx.at(self.span).type_of(param.def_id);
-                        // FIXME(const_generics:defaults)
+                        // FIXME(const_generics_defaults)
                         if infer_args {
                             // No const parameters were provided, we can infer all.
                             self.astconv.ct_infer(ty, Some(param), self.span).into()
diff --git a/compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs b/compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs
@@ -1376,7 +1376,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         }
                     }
                     GenericParamDefKind::Const => {
-                        // FIXME(const_generics:defaults)
+                        // FIXME(const_generics_defaults)
                         // No const parameters were provided, we have to infer them.
                         self.fcx.var_for_def(self.span, param)
                     }
diff --git a/compiler/rustc_typeck/src/check/wfcheck.rs b/compiler/rustc_typeck/src/check/wfcheck.rs
@@ -785,7 +785,7 @@ fn check_where_clauses<'tcx, 'fcx>(
             }
 
             GenericParamDefKind::Const => {
-                // FIXME(const_generics:defaults)
+                // FIXME(const_generics_defaults)
                 fcx.tcx.mk_param_from_def(param)
             }
         }
diff --git a/compiler/rustc_typeck/src/collect.rs b/compiler/rustc_typeck/src/collect.rs
@@ -228,7 +228,7 @@ impl Visitor<'tcx> for CollectItemTypesVisitor<'tcx> {
                 hir::GenericParamKind::Const { .. } => {
                     let def_id = self.tcx.hir().local_def_id(param.hir_id);
                     self.tcx.ensure().type_of(def_id);
-                    // FIXME(const_generics:defaults)
+                    // FIXME(const_generics_defaults)
                 }
             }
         }
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
@@ -612,7 +612,7 @@ impl Clean<GenericParamDef> for hir::GenericParam<'_> {
                 GenericParamDefKind::Const {
                     did: cx.tcx.hir().local_def_id(self.hir_id).to_def_id(),
                     ty: ty.clean(cx),
-                    // FIXME(const_generics_defaults): add `default` field here to the docs
+                    // FIXME(const_generics_defaults): add `default` field here for docs
                 },
             ),
         };
@@ -1386,7 +1386,7 @@ fn clean_qpath(hir_ty: &hir::Ty<'_>, cx: &DocContext<'_>) -> Type {
                                 if let Some(ct) = const_ {
                                     ct_substs.insert(const_param_def_id.to_def_id(), ct.clean(cx));
                                 }
-                                // FIXME(const_generics:defaults)
+                                // FIXME(const_generics_defaults)
                                 indices.consts += 1;
                             }
                         }
diff --git a/src/test/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.rs b/src/test/ui/const-generics/params-in-ct-in-ty-param-lazy-norm.rs
@@ -7,7 +7,7 @@ struct Foo<T, U = [u8; std::mem::size_of::<T>()]>(T, U);
 //[full]~^ ERROR constant values inside of type parameter defaults
 //[min]~^^ ERROR generic parameters may not be used in const operations
 
-// FIXME(const_generics:defaults): We still don't know how to we deal with type defaults.
+// FIXME(const_generics_defaults): We still don't know how to deal with type defaults.
 struct Bar<T = [u8; N], const N: usize>(T);
 //~^ ERROR constant values inside of type parameter defaults
 //~| ERROR type parameters with a default

Original file line number	Diff line number	Diff line change
`@@ -774,7 +774,7 @@ fn validate_generic_param_order(`
`774`	`774`	`}`
`775`	`775`	`GenericParamKind::Type { default: None } => (),`
`776`	`776`	`GenericParamKind::Lifetime => (),`
`777`		`- // FIXME(const_generics:defaults)`
	`777`	`+ // FIXME(const_generics_defaults)`
`778`	`778`	`GenericParamKind::Const { ty: _, kw_span: _, default: _ } => (),`
`779`	`779`	`}`
`780`	`780`	`first = false;`
Original file line number	Diff line number	Diff line change
`@@ -958,7 +958,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {`
`958`	`958`	`ty::GenericParamDefKind::Type { has_default, .. } => {`
`959`	`959`	`Some((param.def_id, has_default))`
`960`	`960`	`}`
`961`		`- ty::GenericParamDefKind::Const => None, // FIXME(const_generics:defaults)`
	`961`	`+ ty::GenericParamDefKind::Const => None, // FIXME(const_generics_defaults)`
`962`	`962`	`})`
`963`	`963`	`.peekable();`
`964`	`964`	`let has_default = {`
Original file line number	Diff line number	Diff line change
`@@ -1834,7 +1834,7 @@ impl EncodeContext<'a, 'tcx> {`
`1834`	`1834`	`EntryKind::ConstParam,`
`1835`	`1835`	`true,`
`1836`	`1836`	`);`
`1837`		`- // FIXME(const_generics:defaults)`
	`1837`	`+ // FIXME(const_generics_defaults)`
`1838`	`1838`	`}`
`1839`	`1839`	`}`
`1840`	`1840`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ pub trait Printer<'tcx>: Sized {`
`203`	`203`	`self.tcx().type_of(param.def_id).subst(self.tcx(), substs),`
`204`	`204`	`)`
`205`	`205`	`}`
`206`		`- ty::GenericParamDefKind::Const => false, // FIXME(const_generics:defaults)`
	`206`	`+ ty::GenericParamDefKind::Const => false, // FIXME(const_generics_defaults)`
`207`	`207`	`}`
`208`	`208`	`})`
`209`	`209`	`.count();`
Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ impl<'a, 'tcx> Visitor<'tcx> for Annotator<'a, 'tcx> {`
`443`	`443`
`444`	`444`	`fn visit_generic_param(&mut self, p: &'tcx hir::GenericParam<'tcx>) {`
`445`	`445`	`let kind = match &p.kind {`
`446`		`- // FIXME(const_generics:defaults)`
	`446`	`+ // FIXME(const_generics_defaults)`
`447`	`447`	`hir::GenericParamKind::Type { default, .. } if default.is_some() => {`
`448`	`448`	`AnnotationKind::Container`
`449`	`449`	`}`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {`
`387`	`387`	`defaults.types += has_default as usize`
`388`	`388`	`}`
`389`	`389`	`GenericParamDefKind::Const => {`
`390`		`- // FIXME(const_generics:defaults)`
	`390`	`+ // FIXME(const_generics_defaults)`
`391`	`391`	`}`
`392`	`392`	`};`
`393`	`393`	`}`
Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {`
`486`	`486`	`}`
`487`	`487`	`GenericParamDefKind::Const => {`
`488`	`488`	`let ty = tcx.at(self.span).type_of(param.def_id);`
`489`		`- // FIXME(const_generics:defaults)`
	`489`	`+ // FIXME(const_generics_defaults)`
`490`	`490`	`if infer_args {`
`491`	`491`	`// No const parameters were provided, we can infer all.`
`492`	`492`	`self.astconv.ct_infer(ty, Some(param), self.span).into()`
Original file line number	Diff line number	Diff line change
`@@ -1376,7 +1376,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`1376`	`1376`	`}`
`1377`	`1377`	`}`
`1378`	`1378`	`GenericParamDefKind::Const => {`
`1379`		`- // FIXME(const_generics:defaults)`
	`1379`	`+ // FIXME(const_generics_defaults)`
`1380`	`1380`	`// No const parameters were provided, we have to infer them.`
`1381`	`1381`	`self.fcx.var_for_def(self.span, param)`
`1382`	`1382`	`}`
Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,7 @@ fn check_where_clauses<'tcx, 'fcx>(`
`785`	`785`	`}`
`786`	`786`
`787`	`787`	`GenericParamDefKind::Const => {`
`788`		`- // FIXME(const_generics:defaults)`
	`788`	`+ // FIXME(const_generics_defaults)`
`789`	`789`	`fcx.tcx.mk_param_from_def(param)`
`790`	`790`	`}`
`791`	`791`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ impl Visitor<'tcx> for CollectItemTypesVisitor<'tcx> {`
`228`	`228`	`hir::GenericParamKind::Const { .. } => {`
`229`	`229`	`let def_id = self.tcx.hir().local_def_id(param.hir_id);`
`230`	`230`	`self.tcx.ensure().type_of(def_id);`
`231`		`- // FIXME(const_generics:defaults)`
	`231`	`+ // FIXME(const_generics_defaults)`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`	`}`