replace all unreachable! and panic! calls with bug!
#47
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -44,22 +44,25 @@ impl<'a> CompilerCalls<'a> for MiriCompilerCalls { | |||
| fn extract_str(lit: &syntax::ast::Lit) -> syntax::parse::token::InternedString { | |||
| match lit.node { | |||
| syntax::ast::LitKind::Str(ref s, _) => s.clone(), | |||
| _ => panic!("attribute values need to be strings"), | |||
| _ => bug!("attribute values need to be strings"), | |||
There was a problem hiding this comment.
This should actually be a span_err, because it is a miri user fault, not miri progrmmer fault.
There was a problem hiding this comment.
I don't think the parser ever yields something other than a LitKind::Str. Rustc will error and abort long before we reach this.
There was a problem hiding this comment.
#[memory_size=true] should give LitKind::Bool for the value.
There was a problem hiding this comment.
@oli-obk It turns out this changed in a recent nightly. Beta still bails on non-string literals in attributes, but nightly accepts them if you use #![feature(attr_literals)].
| @@ -49,8 +49,7 @@ pub fn binary_op<'tcx>(bin_op: mir::BinOp, left: PrimVal, right: PrimVal) -> Eva | |||
| BitOr => $v($l | $r), | |||
|
|
|||
| // these have already been handled | |||
| Shl => bug!("`<<` operation should already have been handled"), | |||
| Shr => bug!("`>>` operation should already have been handled"), | |||
| Shl | Shr => bug!("`bin_op` operation should already have been handled", bin_op.to_hir_binop().as_str()), | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #32
I didn't touch the
unimplemented!, since these probably need to go away by being implememented before moving miri into rustc.