OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #76760 - matthiaskrgr:clippy_lazy_eval, r=varkor

Browse Source 
don't lazily evaluate some trivial values for Option::None replacements (clippy::unnecessary_lazy_evaluations)
This commit is contained in:
Tyler Mandry 2020-09-16 12:24:23 -07:00 committed by GitHub
commit 6e0131cd5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats 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();