mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small fixes to comments

Browse Source
This commit is contained in:
Dylan MacKenzie 2019-11-07 10:02:01 -08:00
parent 281e898ecf
commit eff83e5f49
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustc_passes/check_const.rs
View File

@ -1,5 +1,6 @@
//! This pass checks the HIR bodies in a const context (e.g., `const`, `static`, `const fn`) for //! This pass checks HIR bodies that may be evaluated at compile-time (e.g., `const`, `static`,
//! structured control flow (e.g. `if`, `while`), which is forbidden in a const context. //! `const fn`) for structured control flow (e.g. `if`, `while`), which is forbidden in a const
//! context.
//! //!
//! By the time the MIR const-checker runs, these high-level constructs have been lowered to //! By the time the MIR const-checker runs, these high-level constructs have been lowered to
//! control-flow primitives (e.g., `Goto`, `SwitchInt`), making it tough to properly attribute //! control-flow primitives (e.g., `Goto`, `SwitchInt`), making it tough to properly attribute
@ -98,7 +99,7 @@ impl<'tcx> CheckConstVisitor<'tcx> {
span_err!(self.sess, span, E0744, "`{}` is not allowed in a `{}`", bad_op, const_kind); span_err!(self.sess, span, E0744, "`{}` is not allowed in a `{}`", bad_op, const_kind);
} }
/// Saves the parent `const_kind` before visiting a nested `Body` and restores it afterwards. /// Saves the parent `const_kind` before calling `f` and restores it afterwards.
fn recurse_into(&mut self, kind: Option<ConstKind>, f: impl FnOnce(&mut Self)) { fn recurse_into(&mut self, kind: Option<ConstKind>, f: impl FnOnce(&mut Self)) {
let parent_kind = self.const_kind; let parent_kind = self.const_kind;
self.const_kind = kind; self.const_kind = kind;
@ -124,7 +125,7 @@ impl<'tcx> Visitor<'tcx> for CheckConstVisitor<'tcx> {
fn visit_expr(&mut self, e: &'tcx hir::Expr) { fn visit_expr(&mut self, e: &'tcx hir::Expr) {
match &e.kind { match &e.kind {
// Skip these checks if the current item is not const. // Skip the following checks if we are not currently in a const context.
_ if self.const_kind.is_none() => {} _ if self.const_kind.is_none() => {}
hir::ExprKind::Loop(_, _, source) => { hir::ExprKind::Loop(_, _, source) => {