diff options
| author | Christian Poveda <christianpoveda@protonmail.com> | 2019-11-30 12:25:45 -0500 |
|---|---|---|
| committer | Christian Poveda <christianpoveda@protonmail.com> | 2019-11-30 12:25:45 -0500 |
| commit | 2ced9d96e7b70237daa69bd8d421f0421d57e676 (patch) | |
| tree | 6c10aad9e7c966ba77fdba9fe0432f40dd13a1ec /src/librustc_mir | |
| parent | d7c09f7e1e446390ed3f02ed576a1efce5279b96 (diff) | |
| download | rust-2ced9d96e7b70237daa69bd8d421f0421d57e676.tar.gz rust-2ced9d96e7b70237daa69bd8d421f0421d57e676.zip | |
Merge match branches
Diffstat (limited to 'src/librustc_mir')
| -rw-r--r-- | src/librustc_mir/transform/check_consts/validation.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/librustc_mir/transform/check_consts/validation.rs b/src/librustc_mir/transform/check_consts/validation.rs index 7b26ba58e61..829d9ee6faf 100644 --- a/src/librustc_mir/transform/check_consts/validation.rs +++ b/src/librustc_mir/transform/check_consts/validation.rs @@ -560,15 +560,12 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> { trace!("visit_statement: statement={:?} location={:?}", statement, location); match statement.kind { - StatementKind::Assign(..) => { + StatementKind::Assign(..) | StatementKind::SetDiscriminant { .. } => { self.super_statement(statement, location); } StatementKind::FakeRead(FakeReadCause::ForMatchedPlace, _) => { self.check_op(ops::IfOrMatch); } - StatementKind::SetDiscriminant { .. } => { - self.super_statement(statement, location) - } // FIXME(eddyb) should these really do nothing? StatementKind::FakeRead(..) | StatementKind::StorageLive(_) | |