Skip to content
Permalink
Browse files

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.
  • Loading branch information...
Centril committed Sep 14, 2019
2 parents 4576668 + 094af97 commit 70d0314068adead614c0d58052f7a03e50a06386
Showing with 3 additions and 3 deletions.
  1. +2 −2 src/librustc/mir/interpret/value.rs
  2. +1 −1 src/librustc_mir/const_eval.rs
@@ -17,8 +17,8 @@ pub struct RawConst<'tcx> {
pub ty: Ty<'tcx>,
}

/// Represents a constant value in Rust. `Scalar` and `ScalarPair` are optimizations that
/// match the `LocalState` optimizations for easy conversions between `Value` and `ConstValue`.
/// Represents a constant value in Rust. `Scalar` and `Slice` are optimizations for
/// array length computations, enum discriminants and the pattern matching logic.
#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord,
RustcEncodable, RustcDecodable, Hash, HashStable)]
pub enum ConstValue<'tcx> {
@@ -589,7 +589,7 @@ pub fn const_eval_provider<'tcx>(
tcx: TyCtxt<'tcx>,
key: ty::ParamEnvAnd<'tcx, GlobalId<'tcx>>,
) -> ::rustc::mir::interpret::ConstEvalResult<'tcx> {
// see comment in const_eval_provider for what we're doing here
// see comment in const_eval_raw_provider for what we're doing here
if key.param_env.reveal == Reveal::All {
let mut key = key.clone();
key.param_env.reveal = Reveal::UserFacing;

0 comments on commit 70d0314

Please sign in to comment.
You can’t perform that action at this time.