Skip to content

Commit bbf07c0

Browse files
borsbors
committed
Auto merge of #83333 - Dylan-DPC:rollup-0rdt6sz, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #82707 (const_evaluatable_checked: Stop eagerly erroring in `is_const_evaluatable`) - #83040 (extract `ConstKind::Unevaluated` into a struct) - #83280 (Fix pluralization in keyword docs) - #83289 (Move some tests to more reasonable directories - 5) - #83306 (Extend `proc_macro_back_compat` lint to `js-sys`) - #83327 (Extend comment in `UsedLocals::visit_lhs`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents ed4005d + 69f6a19 commit bbf07c0

File tree

94 files changed

+436
-295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+436
-295
lines changed

‎compiler/rustc_codegen_cranelift/src/constant.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ pub(crate) fn check_constants(fx: &mut FunctionCx<'_, '_, '_>) -> bool {
4545
};
4646
match const_.val {
4747
ConstKind::Value(_) => {}
48-
ConstKind::Unevaluated(def, ref substs, promoted) => {
48+
ConstKind::Unevaluated(unevaluated) => {
4949
if let Err(err) =
50-
fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), def, substs, promoted, None)
50+
fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), unevaluated, None)
5151
{
5252
all_constants_ok = false;
5353
match err {
@@ -122,14 +122,14 @@ pub(crate) fn codegen_constant<'tcx>(
122122
};
123123
let const_val = match const_.val {
124124
ConstKind::Value(const_val) => const_val,
125-
ConstKind::Unevaluated(def, ref substs, promoted) if fx.tcx.is_static(def.did) => {
125+
ConstKind::Unevaluated(ty::Unevaluated { def, substs, promoted }) if fx.tcx.is_static(def.did) => {
126126
assert!(substs.is_empty());
127127
assert!(promoted.is_none());
128128

129129
return codegen_static_ref(fx, def.did, fx.layout_of(const_.ty)).to_cvalue(fx);
130130
}
131-
ConstKind::Unevaluated(def, ref substs, promoted) => {
132-
match fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), def, substs, promoted, None) {
131+
ConstKind::Unevaluated(unevaluated) => {
132+
match fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), unevaluated, None) {
133133
Ok(const_val) => const_val,
134134
Err(_) => {
135135
span_bug!(constant.span, "erroneous constant not captured by required_consts");

‎compiler/rustc_codegen_ssa/src/mir/constant.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
3030
mir::ConstantKind::Val(val, _) => return Ok(val),
3131
};
3232
match ct.val {
33-
ty::ConstKind::Unevaluated(def, substs, promoted) => self
33+
ty::ConstKind::Unevaluated(ct) => self
3434
.cx
3535
.tcx()
36-
.const_eval_resolve(ty::ParamEnv::reveal_all(), def, substs, promoted, None)
36+
.const_eval_resolve(ty::ParamEnv::reveal_all(), ct, None)
3737
.map_err(|err| {
3838
self.cx.tcx().sess.span_err(constant.span, "erroneous constant encountered");
3939
err

‎compiler/rustc_expand/src/proc_macro_server.rs

+30-4
Original file line numberDiff line numberDiff line change
@@ -739,9 +739,8 @@ fn ident_name_compatibility_hack(
739739

740740
let time_macros_impl =
741741
macro_name == sym::impl_macros && matches_prefix("time-macros-impl", "lib.rs");
742-
if time_macros_impl
743-
|| (macro_name == sym::arrays && matches_prefix("js-sys", "lib.rs"))
744-
{
742+
let js_sys = macro_name == sym::arrays && matches_prefix("js-sys", "lib.rs");
743+
if time_macros_impl || js_sys {
745744
let snippet = source_map.span_to_snippet(orig_span);
746745
if snippet.as_deref() == Ok("$name") {
747746
if time_macros_impl {
@@ -754,8 +753,35 @@ fn ident_name_compatibility_hack(
754753
"the `time-macros-impl` crate will stop compiling in futures version of Rust. \
755754
Please update to the latest version of the `time` crate to avoid breakage".to_string())
756755
);
756+
return Some((*ident, *is_raw));
757+
}
758+
if js_sys {
759+
if let Some(c) = path
760+
.components()
761+
.flat_map(|c| c.as_os_str().to_str())
762+
.find(|c| c.starts_with("js-sys"))
763+
{
764+
let mut version = c.trim_start_matches("js-sys-").split(".");
765+
if version.next() == Some("0")
766+
&& version.next() == Some("3")
767+
&& version
768+
.next()
769+
.and_then(|c| c.parse::<u32>().ok())
770+
.map_or(false, |v| v < 40)
771+
{
772+
rustc.sess.buffer_lint_with_diagnostic(
773+
&PROC_MACRO_BACK_COMPAT,
774+
orig_span,
775+
ast::CRATE_NODE_ID,
776+
"using an old version of `js-sys`",
777+
BuiltinLintDiagnostics::ProcMacroBackCompat(
778+
"older versions of the `js-sys` crate will stop compiling in future versions of Rust; \
779+
please update to `js-sys` v0.3.40 or above".to_string())
780+
);
781+
return Some((*ident, *is_raw));
782+
}
783+
}
757784
}
758-
return Some((*ident, *is_raw));
759785
}
760786
}
761787

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use rustc_hir::def_id::{DefId, LocalDefId};
1818
use rustc_middle::infer::canonical::{Canonical, CanonicalVarValues};
1919
use rustc_middle::infer::unify_key::{ConstVarValue, ConstVariableValue};
2020
use rustc_middle::infer::unify_key::{ConstVariableOrigin, ConstVariableOriginKind, ToType};
21-
use rustc_middle::mir;
2221
use rustc_middle::mir::interpret::EvalToConstValueResult;
2322
use rustc_middle::traits::select;
2423
use rustc_middle::ty::error::{ExpectedFound, TypeError, UnconstrainedNumeric};
@@ -1499,9 +1498,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
14991498
pub fn const_eval_resolve(
15001499
&self,
15011500
param_env: ty::ParamEnv<'tcx>,
1502-
def: ty::WithOptConstParam<DefId>,
1503-
substs: SubstsRef<'tcx>,
1504-
promoted: Option<mir::Promoted>,
1501+
ty::Unevaluated { def, substs, promoted }: ty::Unevaluated<'tcx>,
15051502
span: Option<Span>,
15061503
) -> EvalToConstValueResult<'tcx> {
15071504
let mut original_values = OriginalQueryValues::default();
@@ -1510,7 +1507,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
15101507
let (param_env, substs) = canonical.value;
15111508
// The return value is the evaluated value which doesn't contain any reference to inference
15121509
// variables, thus we don't need to substitute back the original values.
1513-
self.tcx.const_eval_resolve(param_env, def, substs, promoted, span)
1510+
self.tcx.const_eval_resolve(param_env, ty::Unevaluated { def, substs, promoted }, span)
15141511
}
15151512

15161513
/// If `typ` is a type variable of some kind, resolve it one level

‎compiler/rustc_middle/src/mir/abstract_const.rs

+17
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,20 @@ pub enum Node<'tcx> {
1818
UnaryOp(mir::UnOp, NodeId),
1919
FunctionCall(NodeId, &'tcx [NodeId]),
2020
}
21+
22+
#[derive(Debug, Copy, Clone, PartialEq, Eq, HashStable, TyEncodable, TyDecodable)]
23+
pub enum NotConstEvaluatable {
24+
Error(rustc_errors::ErrorReported),
25+
MentionsInfer,
26+
MentionsParam,
27+
}
28+
29+
impl From<rustc_errors::ErrorReported> for NotConstEvaluatable {
30+
fn from(e: rustc_errors::ErrorReported) -> NotConstEvaluatable {
31+
NotConstEvaluatable::Error(e)
32+
}
33+
}
34+
35+
TrivialTypeFoldableAndLiftImpls! {
36+
NotConstEvaluatable,
37+
}

‎compiler/rustc_middle/src/mir/interpret/queries.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::{ErrorHandled, EvalToConstValueResult, GlobalId};
22

33
use crate::mir;
4-
use crate::ty::subst::{InternalSubsts, SubstsRef};
4+
use crate::ty::subst::InternalSubsts;
55
use crate::ty::{self, TyCtxt};
66
use rustc_hir::def_id::DefId;
77
use rustc_span::Span;
@@ -35,14 +35,12 @@ impl<'tcx> TyCtxt<'tcx> {
3535
pub fn const_eval_resolve(
3636
self,
3737
param_env: ty::ParamEnv<'tcx>,
38-
def: ty::WithOptConstParam<DefId>,
39-
substs: SubstsRef<'tcx>,
40-
promoted: Option<mir::Promoted>,
38+
ct: ty::Unevaluated<'tcx>,
4139
span: Option<Span>,
4240
) -> EvalToConstValueResult<'tcx> {
43-
match ty::Instance::resolve_opt_const_arg(self, param_env, def, substs) {
41+
match ty::Instance::resolve_opt_const_arg(self, param_env, ct.def, ct.substs) {
4442
Ok(Some(instance)) => {
45-
let cid = GlobalId { instance, promoted };
43+
let cid = GlobalId { instance, promoted: ct.promoted };
4644
self.const_eval_global_id(param_env, cid, span)
4745
}
4846
Ok(None) => Err(ErrorHandled::TooGeneric),

‎compiler/rustc_middle/src/traits/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub mod specialization_graph;
99
mod structural_impls;
1010

1111
use crate::infer::canonical::Canonical;
12-
use crate::mir::interpret::ErrorHandled;
12+
use crate::mir::abstract_const::NotConstEvaluatable;
1313
use crate::ty::subst::SubstsRef;
1414
use crate::ty::{self, AdtKind, Ty, TyCtxt};
1515

@@ -398,7 +398,7 @@ pub enum SelectionError<'tcx> {
398398
ty::error::TypeError<'tcx>,
399399
),
400400
TraitNotObjectSafe(DefId),
401-
ConstEvalFailure(ErrorHandled),
401+
NotConstEvaluatable(NotConstEvaluatable),
402402
Overflow,
403403
}
404404

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,18 @@ impl<'tcx> Const<'tcx> {
9898
let name = tcx.hir().name(hir_id);
9999
ty::ConstKind::Param(ty::ParamConst::new(index, name))
100100
}
101-
_ => ty::ConstKind::Unevaluated(
102-
def.to_global(),
103-
InternalSubsts::identity_for_item(tcx, def.did.to_def_id()),
104-
None,
105-
),
101+
_ => ty::ConstKind::Unevaluated(ty::Unevaluated {
102+
def: def.to_global(),
103+
substs: InternalSubsts::identity_for_item(tcx, def.did.to_def_id()),
104+
promoted: None,
105+
}),
106106
};
107107

108108
tcx.mk_const(ty::Const { val, ty })
109109
}
110110

111-
#[inline]
112111
/// Interns the given value as a constant.
112+
#[inline]
113113
pub fn from_value(tcx: TyCtxt<'tcx>, val: ConstValue<'tcx>, ty: Ty<'tcx>) -> &'tcx Self {
114114
tcx.mk_const(Self { val: ConstKind::Value(val), ty })
115115
}

‎compiler/rustc_middle/src/ty/consts/kind.rs

+14-5
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,18 @@ use rustc_macros::HashStable;
1212
use rustc_target::abi::Size;
1313

1414
use super::ScalarInt;
15+
/// An unevaluated, potentially generic, constant.
16+
#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, TyEncodable, TyDecodable)]
17+
#[derive(Hash, HashStable)]
18+
pub struct Unevaluated<'tcx> {
19+
pub def: ty::WithOptConstParam<DefId>,
20+
pub substs: SubstsRef<'tcx>,
21+
pub promoted: Option<Promoted>,
22+
}
1523

1624
/// Represents a constant in Rust.
17-
#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, TyEncodable, TyDecodable, Hash)]
18-
#[derive(HashStable)]
25+
#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, TyEncodable, TyDecodable)]
26+
#[derive(Hash, HashStable)]
1927
pub enum ConstKind<'tcx> {
2028
/// A const generic parameter.
2129
Param(ty::ParamConst),
@@ -31,7 +39,7 @@ pub enum ConstKind<'tcx> {
3139

3240
/// Used in the HIR by using `Unevaluated` everywhere and later normalizing to one of the other
3341
/// variants when the code is monomorphic enough for that.
34-
Unevaluated(ty::WithOptConstParam<DefId>, SubstsRef<'tcx>, Option<Promoted>),
42+
Unevaluated(Unevaluated<'tcx>),
3543

3644
/// Used to hold computed value.
3745
Value(ConstValue<'tcx>),
@@ -102,7 +110,7 @@ impl<'tcx> ConstKind<'tcx> {
102110
tcx: TyCtxt<'tcx>,
103111
param_env: ParamEnv<'tcx>,
104112
) -> Option<Result<ConstValue<'tcx>, ErrorReported>> {
105-
if let ConstKind::Unevaluated(def, substs, promoted) = self {
113+
if let ConstKind::Unevaluated(Unevaluated { def, substs, promoted }) = self {
106114
use crate::mir::interpret::ErrorHandled;
107115

108116
// HACK(eddyb) this erases lifetimes even though `const_eval_resolve`
@@ -132,7 +140,8 @@ impl<'tcx> ConstKind<'tcx> {
132140
let (param_env, substs) = param_env_and_substs.into_parts();
133141
// try to resolve e.g. associated constants to their definition on an impl, and then
134142
// evaluate the const.
135-
match tcx.const_eval_resolve(param_env, def, substs, promoted, None) {
143+
match tcx.const_eval_resolve(param_env, ty::Unevaluated { def, substs, promoted }, None)
144+
{
136145
// NOTE(eddyb) `val` contains no lifetimes/types/consts,
137146
// and we use the original type, so nothing from `substs`
138147
// (which may be identity substs, see above),

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,7 @@ impl FlagComputation {
270270
fn add_const(&mut self, c: &ty::Const<'_>) {
271271
self.add_ty(c.ty);
272272
match c.val {
273-
ty::ConstKind::Unevaluated(_, substs, _) => {
274-
self.add_substs(substs);
275-
self.add_flags(TypeFlags::HAS_CT_PROJECTION);
276-
}
273+
ty::ConstKind::Unevaluated(unevaluated) => self.add_unevaluated_const(unevaluated),
277274
ty::ConstKind::Infer(infer) => {
278275
self.add_flags(TypeFlags::STILL_FURTHER_SPECIALIZABLE);
279276
match infer {
@@ -297,6 +294,11 @@ impl FlagComputation {
297294
}
298295
}
299296

297+
fn add_unevaluated_const(&mut self, ct: ty::Unevaluated<'tcx>) {
298+
self.add_substs(ct.substs);
299+
self.add_flags(TypeFlags::HAS_CT_PROJECTION);
300+
}
301+
300302
fn add_existential_projection(&mut self, projection: &ty::ExistentialProjection<'_>) {
301303
self.add_substs(projection.substs);
302304
self.add_ty(projection.ty);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pub use rustc_type_ir::*;
5555

5656
pub use self::binding::BindingMode;
5757
pub use self::binding::BindingMode::*;
58-
pub use self::consts::{Const, ConstInt, ConstKind, InferConst, ScalarInt, ValTree};
58+
pub use self::consts::{Const, ConstInt, ConstKind, InferConst, ScalarInt, Unevaluated, ValTree};
5959
pub use self::context::{
6060
tls, CanonicalUserType, CanonicalUserTypeAnnotation, CanonicalUserTypeAnnotations,
6161
CtxtInterners, DelaySpanBugEmitted, FreeRegionInfo, GeneratorInteriorTypeCause, GlobalCtxt,

‎compiler/rustc_middle/src/ty/print/pretty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ pub trait PrettyPrinter<'tcx>:
915915
}
916916

917917
match ct.val {
918-
ty::ConstKind::Unevaluated(def, substs, promoted) => {
918+
ty::ConstKind::Unevaluated(ty::Unevaluated { def, substs, promoted }) => {
919919
if let Some(promoted) = promoted {
920920
p!(print_value_path(def.did, substs));
921921
p!(write("::{:?}", promoted));

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

+13-11
Original file line numberDiff line numberDiff line change
@@ -531,24 +531,26 @@ pub fn super_relate_consts<R: TypeRelation<'tcx>>(
531531
check_const_value_eq(relation, a_val, b_val, a, b)?
532532
}
533533

534-
(
535-
ty::ConstKind::Unevaluated(a_def, a_substs, None),
536-
ty::ConstKind::Unevaluated(b_def, b_substs, None),
537-
) if tcx.features().const_evaluatable_checked && !relation.visit_ct_substs() => {
538-
tcx.try_unify_abstract_consts(((a_def, a_substs), (b_def, b_substs)))
534+
(ty::ConstKind::Unevaluated(au), ty::ConstKind::Unevaluated(bu))
535+
if tcx.features().const_evaluatable_checked && !relation.visit_ct_substs() =>
536+
{
537+
tcx.try_unify_abstract_consts(((au.def, au.substs), (bu.def, bu.substs)))
539538
}
540539

541540
// While this is slightly incorrect, it shouldn't matter for `min_const_generics`
542541
// and is the better alternative to waiting until `const_evaluatable_checked` can
543542
// be stabilized.
544-
(
545-
ty::ConstKind::Unevaluated(a_def, a_substs, a_promoted),
546-
ty::ConstKind::Unevaluated(b_def, b_substs, b_promoted),
547-
) if a_def == b_def && a_promoted == b_promoted => {
543+
(ty::ConstKind::Unevaluated(au), ty::ConstKind::Unevaluated(bu))
544+
if au.def == bu.def && au.promoted == bu.promoted =>
545+
{
548546
let substs =
549-
relation.relate_with_variance(ty::Variance::Invariant, a_substs, b_substs)?;
547+
relation.relate_with_variance(ty::Variance::Invariant, au.substs, bu.substs)?;
550548
return Ok(tcx.mk_const(ty::Const {
551-
val: ty::ConstKind::Unevaluated(a_def, substs, a_promoted),
549+
val: ty::ConstKind::Unevaluated(ty::Unevaluated {
550+
def: au.def,
551+
substs,
552+
promoted: au.promoted,
553+
}),
552554
ty: a.ty,
553555
}));
554556
}

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -1031,8 +1031,12 @@ impl<'tcx> TypeFoldable<'tcx> for ty::ConstKind<'tcx> {
10311031
match self {
10321032
ty::ConstKind::Infer(ic) => ty::ConstKind::Infer(ic.fold_with(folder)),
10331033
ty::ConstKind::Param(p) => ty::ConstKind::Param(p.fold_with(folder)),
1034-
ty::ConstKind::Unevaluated(did, substs, promoted) => {
1035-
ty::ConstKind::Unevaluated(did, substs.fold_with(folder), promoted)
1034+
ty::ConstKind::Unevaluated(ty::Unevaluated { def, substs, promoted }) => {
1035+
ty::ConstKind::Unevaluated(ty::Unevaluated {
1036+
def,
1037+
substs: substs.fold_with(folder),
1038+
promoted,
1039+
})
10361040
}
10371041
ty::ConstKind::Value(_)
10381042
| ty::ConstKind::Bound(..)
@@ -1045,7 +1049,7 @@ impl<'tcx> TypeFoldable<'tcx> for ty::ConstKind<'tcx> {
10451049
match *self {
10461050
ty::ConstKind::Infer(ic) => ic.visit_with(visitor),
10471051
ty::ConstKind::Param(p) => p.visit_with(visitor),
1048-
ty::ConstKind::Unevaluated(_, substs, _) => substs.visit_with(visitor),
1052+
ty::ConstKind::Unevaluated(ct) => ct.substs.visit_with(visitor),
10491053
ty::ConstKind::Value(_)
10501054
| ty::ConstKind::Bound(..)
10511055
| ty::ConstKind::Placeholder(_)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ fn push_inner<'tcx>(stack: &mut TypeWalkerStack<'tcx>, parent: GenericArg<'tcx>)
195195
| ty::ConstKind::Value(_)
196196
| ty::ConstKind::Error(_) => {}
197197

198-
ty::ConstKind::Unevaluated(_, substs, _) => {
199-
stack.extend(substs.iter().rev());
198+
ty::ConstKind::Unevaluated(ct) => {
199+
stack.extend(ct.substs.iter().rev());
200200
}
201201
}
202202
}

‎compiler/rustc_mir/src/borrow_check/type_check/mod.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -316,14 +316,12 @@ impl<'a, 'b, 'tcx> Visitor<'tcx> for TypeVerifier<'a, 'b, 'tcx> {
316316
let tcx = self.tcx();
317317
let maybe_uneval = match constant.literal {
318318
ConstantKind::Ty(ct) => match ct.val {
319-
ty::ConstKind::Unevaluated(def, substs, promoted) => {
320-
Some((def, substs, promoted))
321-
}
319+
ty::ConstKind::Unevaluated(uv) => Some(uv),
322320
_ => None,
323321
},
324322
_ => None,
325323
};
326-
if let Some((def, substs, promoted)) = maybe_uneval {
324+
if let Some(ty::Unevaluated { def, substs, promoted }) = maybe_uneval {
327325
if let Some(promoted) = promoted {
328326
let check_err = |verifier: &mut TypeVerifier<'a, 'b, 'tcx>,
329327
promoted: &Body<'tcx>,

0 commit comments

Comments
 (0)