about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-08-21 23:10:59 +0000
committerbors <bors@rust-lang.org>2020-08-21 23:10:59 +0000
commit1a26dbff22adaa80f967db15960766794cafff0e (patch)
treea33e08981fee50eed95cf9206a2d533c271af392
parent410461191393e2339e79b33fa8baf4650b905db0 (diff)
parent146e352db4eade947f6f358cd38c308e95783d7b (diff)
downloadrust-1a26dbff22adaa80f967db15960766794cafff0e.tar.gz
rust-1a26dbff22adaa80f967db15960766794cafff0e.zip
Auto merge of #5938 - ebroto:sync-from-rust, r=ebroto
Rustup

r? @ghost

changelog: none
-rw-r--r--clippy_lints/src/unnested_or_patterns.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/clippy_lints/src/unnested_or_patterns.rs b/clippy_lints/src/unnested_or_patterns.rs
index d73662f4936..7f4f16f8faf 100644
--- a/clippy_lints/src/unnested_or_patterns.rs
+++ b/clippy_lints/src/unnested_or_patterns.rs
@@ -340,6 +340,7 @@ fn take_pat(from: &mut Pat) -> Pat {
         id: DUMMY_NODE_ID,
         kind: Wild,
         span: DUMMY_SP,
+        tokens: None,
     };
     mem::replace(from, dummy)
 }