Skip to content

Commit b74fae2

Browse files
committed
Rename disabled_nightly_feature to disabled_nightly_features
1 parent a49a8eb commit b74fae2

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ impl<'tcx> NonConstOp<'tcx> for FnCallNonConst<'tcx> {
298298
));
299299

300300
if let Some(feature) = feature {
301-
ccx.tcx.disabled_nightly_feature(
301+
ccx.tcx.disabled_nightly_features(
302302
&mut err,
303303
body.source.def_id().as_local().map(|local| ccx.tcx.local_def_id_to_hir_id(local)),
304304
[(String::new(), feature)],

compiler/rustc_hir_analysis/src/astconv/generics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fn generic_arg_mismatch_err(
4141
if let GenericParamDefKind::Const { .. } = param.kind {
4242
if matches!(arg, GenericArg::Type(hir::Ty { kind: hir::TyKind::Infer, .. })) {
4343
err.help("const arguments cannot yet be inferred with `_`");
44-
tcx.disabled_nightly_feature(
44+
tcx.disabled_nightly_features(
4545
&mut err,
4646
param.def_id.as_local().map(|local| tcx.local_def_id_to_hir_id(local)),
4747
[(String::new(), sym::generic_arg_infer)],

compiler/rustc_hir_analysis/src/check/wfcheck.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ fn check_param_wf(tcx: TyCtxt<'_>, param: &hir::GenericParam<'_>) -> Result<(),
999999
Ok(..) => true,
10001000
};
10011001
if may_suggest_feature {
1002-
tcx.disabled_nightly_feature(
1002+
tcx.disabled_nightly_features(
10031003
&mut diag,
10041004
Some(param.hir_id),
10051005
[(

compiler/rustc_hir_typeck/src/method/probe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,7 @@ impl<'tcx> Pick<'tcx> {
14201420
}
14211421
_ => {}
14221422
}
1423-
tcx.disabled_nightly_feature(
1423+
tcx.disabled_nightly_features(
14241424
lint,
14251425
Some(scope_expr_id),
14261426
self.unstable_candidates.iter().map(|(candidate, feature)| {

compiler/rustc_middle/src/ty/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2184,7 +2184,7 @@ impl<'tcx> TyCtxt<'tcx> {
21842184
None
21852185
}
21862186

2187-
pub fn disabled_nightly_feature<E: rustc_errors::EmissionGuarantee>(
2187+
pub fn disabled_nightly_features<E: rustc_errors::EmissionGuarantee>(
21882188
self,
21892189
diag: &mut Diag<'_, E>,
21902190
hir_id: Option<HirId>,

compiler/rustc_passes/src/check_const.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ impl<'tcx> CheckConstVisitor<'tcx> {
155155
//
156156
// FIXME(ecstaticmorse): Maybe this could be incorporated into `feature_err`? This
157157
// is a pretty narrow case, however.
158-
tcx.disabled_nightly_feature(
158+
tcx.disabled_nightly_features(
159159
&mut err,
160160
def_id.map(|id| tcx.local_def_id_to_hir_id(id)),
161161
missing_secondary.into_iter().map(|gate| (String::new(), *gate)),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3471,7 +3471,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
34713471
}
34723472
ObligationCauseCode::TrivialBound => {
34733473
err.help("see issue #48214");
3474-
tcx.disabled_nightly_feature(
3474+
tcx.disabled_nightly_features(
34753475
err,
34763476
Some(tcx.local_def_id_to_hir_id(body_id)),
34773477
[(String::new(), sym::trivial_bounds)],

0 commit comments

Comments
 (0)