Skip to content

Commit

Permalink
librustc_lint: use bug!(), span_bug!()
Browse files Browse the repository at this point in the history
  • Loading branch information
ben0x539 committed Mar 31, 2016
1 parent 065dcd0 commit cc8159b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/librustc_lint/bad_style.rs
Expand Up @@ -30,7 +30,7 @@ pub enum MethodLateContext {
pub fn method_context(cx: &LateContext, id: ast::NodeId, span: Span) -> MethodLateContext {
let def_id = cx.tcx.map.local_def_id(id);
match cx.tcx.impl_or_trait_items.borrow().get(&def_id) {
None => cx.sess().span_bug(span, "missing method descriptor?!"),
None => span_bug!(span, "missing method descriptor?!"),
Some(item) => match item.container() {
ty::TraitContainer(..) => MethodLateContext::TraitDefaultImpl,
ty::ImplContainer(cid) => {
Expand Down
14 changes: 7 additions & 7 deletions src/librustc_lint/types.rs
Expand Up @@ -181,7 +181,7 @@ impl LateLintPass for TypeLimits {
return;
}
}
_ => panic!()
_ => bug!()
};
},
ty::TyUint(t) => {
Expand All @@ -195,7 +195,7 @@ impl LateLintPass for TypeLimits {
// _v is u8, within range by definition
ast::LitKind::Byte(_v) => return,
ast::LitKind::Int(v, _) => v,
_ => panic!()
_ => bug!()
};
if lit_val < min || lit_val > max {
cx.span_lint(OVERFLOWING_LITERALS, e.span,
Expand All @@ -212,7 +212,7 @@ impl LateLintPass for TypeLimits {
Err(_) => return
}
}
_ => panic!()
_ => bug!()
};
if lit_val < min || lit_val > max {
cx.span_lint(OVERFLOWING_LITERALS, e.span,
Expand All @@ -233,7 +233,7 @@ impl LateLintPass for TypeLimits {
hir::BiGt => v >= min && v < max,
hir::BiGe => v > min && v <= max,
hir::BiEq | hir::BiNe => v >= min && v <= max,
_ => panic!()
_ => bug!()
}
}

Expand Down Expand Up @@ -319,7 +319,7 @@ impl LateLintPass for TypeLimits {
ast::LitKind::Int(v, ast::LitIntType::Unsuffixed) => v as i64,
_ => return true
},
_ => panic!()
_ => bug!()
};
is_valid(norm_binop, lit_val, min, max)
}
Expand All @@ -330,7 +330,7 @@ impl LateLintPass for TypeLimits {
ast::LitKind::Int(v, _) => v,
_ => return true
},
_ => panic!()
_ => bug!()
};
is_valid(norm_binop, lit_val, min, max)
}
Expand Down Expand Up @@ -589,7 +589,7 @@ impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {
ty::TyParam(..) | ty::TyInfer(..) | ty::TyError |
ty::TyClosure(..) | ty::TyProjection(..) |
ty::TyFnDef(..) => {
panic!("Unexpected type in foreign function")
bug!("Unexpected type in foreign function")
}
}
}
Expand Down

0 comments on commit cc8159b

Please sign in to comment.