squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Apply suggestions from code review

Browse source 
Co-authored-by: Wesley Wiser <wwiser@gmail.com>
This commit is contained in:
Oliver Scherer 2020-08-20 16:56:19 +02:00 committed by GitHub
parent f0bae6726f
commit dcc202723a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_middle/mir/mod.rs
View file

@ -77,14 +77,14 @@ impl<'tcx> HasLocalDecls<'tcx> for Body<'tcx> {
/// dialects forbid certain variants or values in certain phases. /// dialects forbid certain variants or values in certain phases.
/// ///
/// Note: Each phase's validation checks all invariants of the *previous* phases' dialects. A phase /// Note: Each phase's validation checks all invariants of the *previous* phases' dialects. A phase
/// that changes the dialect documents what invariants must be uphelpd *after* that phase finishes. /// that changes the dialect documents what invariants must be upheld *after* that phase finishes.
/// ///
/// Warning: ordering of variants is significant. /// Warning: ordering of variants is significant.
#[derive(Copy, Clone, TyEncodable, TyDecodable, Debug, PartialEq, Eq, PartialOrd, Ord)] #[derive(Copy, Clone, TyEncodable, TyDecodable, Debug, PartialEq, Eq, PartialOrd, Ord)]
#[derive(HashStable)] #[derive(HashStable)]
pub enum MirPhase { pub enum MirPhase {
Build = 0, Build = 0,
// FIXME: it's unclear whether we still need this phase (and its corresponding query). // FIXME(oli-obk): it's unclear whether we still need this phase (and its corresponding query).
// We used to have this for pre-miri MIR based const eval. // We used to have this for pre-miri MIR based const eval.
Const = 1, Const = 1,
/// This phase checks the MIR for promotable elements and takes them out of the main MIR body /// This phase checks the MIR for promotable elements and takes them out of the main MIR body

2
src/librustc_mir/transform/const_prop.rs
View file

@ -857,7 +857,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
if let Some(Some(alloc)) = alloc { if let Some(Some(alloc)) = alloc {
// Assign entire constant in a single statement. // Assign entire constant in a single statement.
// We can't use aggregates, as we are post-aggregate-lowering. // We can't use aggregates, as we run after the aggregate-lowering `MirPhase`.
*rval = Rvalue::Use(Operand::Constant(Box::new(Constant { *rval = Rvalue::Use(Operand::Constant(Box::new(Constant {
span: source_info.span, span: source_info.span,
user_ty: None, user_ty: None,