Skip to content

Commit 70d0314

Browse files
authored
Rollup merge of rust-lang#64116 - ZeGentzy:patch-1, r=oli-obk
Fix minor typo in docs. This comment is prolly refering to the comment in [const_eval_raw_provider](https://github.com/rust-lang/rust/pull/64116/files#diff-e0b58bb6712edaa8595ad7237542c958R616), not itself.
2 parents 4576668 + 094af97 commit 70d0314

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/librustc/mir/interpret/value.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ pub struct RawConst<'tcx> {
1717
pub ty: Ty<'tcx>,
1818
}
1919

20-
/// Represents a constant value in Rust. `Scalar` and `ScalarPair` are optimizations that
21-
/// match the `LocalState` optimizations for easy conversions between `Value` and `ConstValue`.
20+
/// Represents a constant value in Rust. `Scalar` and `Slice` are optimizations for
21+
/// array length computations, enum discriminants and the pattern matching logic.
2222
#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord,
2323
RustcEncodable, RustcDecodable, Hash, HashStable)]
2424
pub enum ConstValue<'tcx> {

src/librustc_mir/const_eval.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ pub fn const_eval_provider<'tcx>(
589589
tcx: TyCtxt<'tcx>,
590590
key: ty::ParamEnvAnd<'tcx, GlobalId<'tcx>>,
591591
) -> ::rustc::mir::interpret::ConstEvalResult<'tcx> {
592-
// see comment in const_eval_provider for what we're doing here
592+
// see comment in const_eval_raw_provider for what we're doing here
593593
if key.param_env.reveal == Reveal::All {
594594
let mut key = key.clone();
595595
key.param_env.reveal = Reveal::UserFacing;

0 commit comments

Comments
 (0)