Skip to content

Commit 8bf6142

Browse files
committed
Auto merge of rust-lang#2994 - RalfJung:rustup, r=RalfJung
Rustup
2 parents e6f9a2b + 18a32e5 commit 8bf6142

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

clippy_lints/src/doc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ fn check_code(cx: &LateContext<'_>, text: &str, edition: Edition, span: Span) {
729729
false,
730730
TerminalUrl::No,
731731
);
732-
let handler = Handler::with_emitter(false, None, Box::new(emitter), None);
732+
let handler = Handler::with_emitter(Box::new(emitter)).disable_warnings();
733733
let sess = ParseSess::with_span_handler(handler, sm);
734734

735735
let mut parser = match maybe_new_parser_from_source_str(&sess, filename, code) {

clippy_lints/src/methods/bytecount.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub(super) fn check<'tcx>(
4545
let haystack = if let ExprKind::MethodCall(path, receiver, [], _) =
4646
filter_recv.kind {
4747
let p = path.ident.name;
48-
if p == sym::iter || p == sym!(iter_mut) {
48+
if p == sym::iter || p == sym::iter_mut {
4949
receiver
5050
} else {
5151
filter_recv

0 commit comments

Comments
 (0)