Auto merge of rust-lang#5938 - ebroto:sync-from-rust, r=ebroto

Rustup

r? @ghost

changelog: none

Author: bors

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)
 }