diff options
| author | bors <bors@rust-lang.org> | 2020-06-05 11:11:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-05 11:11:26 +0000 |
| commit | 84ec8238b14b4cf89e82eae11907b59629baff2c (patch) | |
| tree | 663eaea0128817e74861767f19eb284cd16b2ff0 /src/tools | |
| parent | 219380d840877de97b0e17674be7212ebc929d51 (diff) | |
| parent | 71393422495b8d3c7a6e4ded3e64adaec45dca6d (diff) | |
| download | rust-84ec8238b14b4cf89e82eae11907b59629baff2c.tar.gz rust-84ec8238b14b4cf89e82eae11907b59629baff2c.zip | |
Auto merge of #72957 - Mark-Simulacrum:bootstrap-bump, r=sfackler
Bump bootstrap compiler to 1.45 Pretty standard update.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clippy/clippy_lints/src/write.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/clippy/clippy_lints/src/write.rs b/src/tools/clippy/clippy_lints/src/write.rs index dfa6223f1b9..37fbc2bad46 100644 --- a/src/tools/clippy/clippy_lints/src/write.rs +++ b/src/tools/clippy/clippy_lints/src/write.rs @@ -279,13 +279,13 @@ impl EarlyLintPass for Write { if let (Some(fmt_str), expr) = self.check_tts(cx, &mac.args.inner_tokens(), true) { if fmt_str.symbol == Symbol::intern("") { let mut applicability = Applicability::MachineApplicable; - let suggestion = expr.map_or_else( - move || { + let suggestion = match expr { + Some(expr) => snippet_with_applicability(cx, expr.span, "v", &mut applicability), + None => { applicability = Applicability::HasPlaceholders; Cow::Borrowed("v") }, - move |expr| snippet_with_applicability(cx, expr.span, "v", &mut applicability), - ); + }; span_lint_and_sugg( cx, |
