bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

don't lazily evaulate some trivial values for Option::None replacements (clippy::unnecessary_lazy_evaluations)

Browse source
This commit is contained in:
Matthias Krüger 2020-09-15 23:10:24 +02:00
parent f567287f9f
commit 0e3414248a
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_lint/src/builtin.rs
View file

@ -961,7 +961,7 @@ fn warn_if_doc(cx: &EarlyContext<'_>, node_span: Span, node_kind: &str, attrs: &
continue; continue;
} }
let span = sugared_span.take().unwrap_or_else(|| attr.span); let span = sugared_span.take().unwrap_or(attr.span);
if attr.is_doc_comment() || cx.sess().check_name(attr, sym::doc) { if attr.is_doc_comment() || cx.sess().check_name(attr, sym::doc) {
cx.struct_span_lint(UNUSED_DOC_COMMENTS, span, |lint| { cx.struct_span_lint(UNUSED_DOC_COMMENTS, span, |lint| {

4
compiler/rustc_metadata/src/native_libs.rs
View file

@ -170,7 +170,7 @@ impl Collector<'tcx> {
feature_err( feature_err(
&self.tcx.sess.parse_sess, &self.tcx.sess.parse_sess,
sym::static_nobundle, sym::static_nobundle,
span.unwrap_or_else(|| rustc_span::DUMMY_SP), span.unwrap_or(rustc_span::DUMMY_SP),
"kind=\"static-nobundle\" is unstable", "kind=\"static-nobundle\" is unstable",
) )
.emit(); .emit();
@ -179,7 +179,7 @@ impl Collector<'tcx> {
feature_err( feature_err(
&self.tcx.sess.parse_sess, &self.tcx.sess.parse_sess,
sym::raw_dylib, sym::raw_dylib,
span.unwrap_or_else(|| rustc_span::DUMMY_SP), span.unwrap_or(rustc_span::DUMMY_SP),
"kind=\"raw-dylib\" is unstable", "kind=\"raw-dylib\" is unstable",
) )
.emit(); .emit();

5
compiler/rustc_mir/src/dataflow/move_paths/builder.rs
View file

@ -480,10 +480,7 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
}; };
let base_ty = base_place.ty(self.builder.body, self.builder.tcx).ty; let base_ty = base_place.ty(self.builder.body, self.builder.tcx).ty;
let len: u64 = match base_ty.kind() { let len: u64 = match base_ty.kind() {
ty::Array(_, size) => { ty::Array(_, size) => size.eval_usize(self.builder.tcx, self.builder.param_env),
let length: u64 = size.eval_usize(self.builder.tcx, self.builder.param_env);
length
}
_ => bug!("from_end: false slice pattern of non-array type"), _ => bug!("from_end: false slice pattern of non-array type"),
}; };
for offset in from..to { for offset in from..to {