Rename disabled_nightly_feature to disabled_nightly_features

rust-lang · Mar 18, 2024 · b74fae2 · b74fae2
1 parent a49a8eb
commit b74fae2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/compiler/rustc_const_eval/src/transform/check_consts/ops.rs b/compiler/rustc_const_eval/src/transform/check_consts/ops.rs
@@ -298,7 +298,7 @@ impl<'tcx> NonConstOp<'tcx> for FnCallNonConst<'tcx> {
         ));
 
         if let Some(feature) = feature {
-            ccx.tcx.disabled_nightly_feature(
+            ccx.tcx.disabled_nightly_features(
                 &mut err,
                 body.source.def_id().as_local().map(|local| ccx.tcx.local_def_id_to_hir_id(local)),
                 [(String::new(), feature)],

diff --git a/compiler/rustc_hir_analysis/src/astconv/generics.rs b/compiler/rustc_hir_analysis/src/astconv/generics.rs
@@ -41,7 +41,7 @@ fn generic_arg_mismatch_err(
     if let GenericParamDefKind::Const { .. } = param.kind {
         if matches!(arg, GenericArg::Type(hir::Ty { kind: hir::TyKind::Infer, .. })) {
             err.help("const arguments cannot yet be inferred with `_`");
-            tcx.disabled_nightly_feature(
+            tcx.disabled_nightly_features(
                 &mut err,
                 param.def_id.as_local().map(|local| tcx.local_def_id_to_hir_id(local)),
                 [(String::new(), sym::generic_arg_infer)],

diff --git a/compiler/rustc_hir_analysis/src/check/wfcheck.rs b/compiler/rustc_hir_analysis/src/check/wfcheck.rs
@@ -999,7 +999,7 @@ fn check_param_wf(tcx: TyCtxt<'_>, param: &hir::GenericParam<'_>) -> Result<(),
                     Ok(..) => true,
                 };
                 if may_suggest_feature {
-                    tcx.disabled_nightly_feature(
+                    tcx.disabled_nightly_features(
                         &mut diag,
                         Some(param.hir_id),
                         [(

diff --git a/compiler/rustc_hir_typeck/src/method/probe.rs b/compiler/rustc_hir_typeck/src/method/probe.rs
@@ -1420,7 +1420,7 @@ impl<'tcx> Pick<'tcx> {
                     }
                     _ => {}
                 }
-                tcx.disabled_nightly_feature(
+                tcx.disabled_nightly_features(
                     lint,
                     Some(scope_expr_id),
                     self.unstable_candidates.iter().map(|(candidate, feature)| {

diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs
@@ -2184,7 +2184,7 @@ impl<'tcx> TyCtxt<'tcx> {
         None
     }
 
-    pub fn disabled_nightly_feature<E: rustc_errors::EmissionGuarantee>(
+    pub fn disabled_nightly_features<E: rustc_errors::EmissionGuarantee>(
         self,
         diag: &mut Diag<'_, E>,
         hir_id: Option<HirId>,

diff --git a/compiler/rustc_passes/src/check_const.rs b/compiler/rustc_passes/src/check_const.rs
@@ -155,7 +155,7 @@ impl<'tcx> CheckConstVisitor<'tcx> {
                 //
                 // FIXME(ecstaticmorse): Maybe this could be incorporated into `feature_err`? This
                 // is a pretty narrow case, however.
-                tcx.disabled_nightly_feature(
+                tcx.disabled_nightly_features(
                     &mut err,
                     def_id.map(|id| tcx.local_def_id_to_hir_id(id)),
                     missing_secondary.into_iter().map(|gate| (String::new(), *gate)),

diff --git a/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
@@ -3471,7 +3471,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
             }
             ObligationCauseCode::TrivialBound => {
                 err.help("see issue #48214");
-                tcx.disabled_nightly_feature(
+                tcx.disabled_nightly_features(
                     err,
                     Some(tcx.local_def_id_to_hir_id(body_id)),
                     [(String::new(), sym::trivial_bounds)],