nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 23:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #86341 - LingMan:ret_val, r=davidtwco

Browse Source 
Stop returning a value from `report_assert_as_lint`

This function only ever returns `None`. Make that explicity by not returning a value at all.

`@rustbot` modify labels +C-cleanup +T-compiler
This commit is contained in:
Yuki Okushi 2021-06-17 05:54:58 +09:00 committed by GitHub
commit 36bf808aa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/rustc_mir/src/transform/const_prop.rs
View File

@ -528,14 +528,14 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
source_info: SourceInfo, source_info: SourceInfo,
message: &'static str, message: &'static str,
panic: AssertKind<impl std::fmt::Debug>, panic: AssertKind<impl std::fmt::Debug>,
) -> Option<()> { ) {
let lint_root = self.lint_root(source_info)?; if let Some(lint_root) = self.lint_root(source_info) {
self.tcx.struct_span_lint_hir(lint, lint_root, source_info.span, |lint| { self.tcx.struct_span_lint_hir(lint, lint_root, source_info.span, |lint| {
let mut err = lint.build(message); let mut err = lint.build(message);
err.span_label(source_info.span, format!("{:?}", panic)); err.span_label(source_info.span, format!("{:?}", panic));
err.emit() err.emit()
}); });
None }
} }
fn check_unary_op( fn check_unary_op(
@ -557,7 +557,8 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
source_info, source_info,
"this arithmetic operation will overflow", "this arithmetic operation will overflow",
AssertKind::OverflowNeg(val.to_const_int()), AssertKind::OverflowNeg(val.to_const_int()),
)?; );
return None;
} }
Some(()) Some(())
@ -602,7 +603,8 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
}, },
r.to_const_int(), r.to_const_int(),
), ),
)?; );
return None;
} }
} }
@ -617,7 +619,8 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
source_info, source_info,
"this arithmetic operation will overflow", "this arithmetic operation will overflow",
AssertKind::Overflow(op, l.to_const_int(), r.to_const_int()), AssertKind::Overflow(op, l.to_const_int(), r.to_const_int()),
)?; );
return None;
} }
} }
Some(()) Some(())