From 0e4259a827787b5e9f50e2b5e78dbdff510b8e2a Mon Sep 17 00:00:00 2001
From: mcarton <cartonmartin+git@gmail.com>
Date: Tue, 22 Dec 2015 00:48:50 +0100
Subject: [PATCH 1/2] Remove duplicated if_let_chain! macro definition
---
src/utils.rs | 46 ----------------------------------------------
1 file changed, 46 deletions(-)
diff --git a/src/utils.rs b/src/utils.rs
index 5e1671b709c..92b1cb1cd3a 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -370,52 +370,6 @@ pub fn is_adjusted(cx: &LateContext, e: &Expr) -> bool {
cx.tcx.tables.borrow().adjustments.get(&e.id).is_some()
}
-/// Produce a nested chain of if-lets and ifs from the patterns:
-///
-/// if_let_chain! {
-/// [
-/// Some(y) = x,
-/// y.len() == 2,
-/// Some(z) = y,
-/// ],
-/// {
-/// block
-/// }
-/// }
-///
-/// becomes
-///
-/// if let Some(y) = x {
-/// if y.len() == 2 {
-/// if let Some(z) = y {
-/// block
-/// }
-/// }
-/// }
-#[macro_export]
-macro_rules! if_let_chain {
- ([let $pat:pat = $expr:expr, $($tt:tt)+], $block:block) => {
- if let $pat = $expr {
- if_let_chain!{ [$($tt)+], $block }
- }
- };
- ([let $pat:pat = $expr:expr], $block:block) => {
- if let $pat = $expr {
- $block
- }
- };
- ([$expr:expr, $($tt:tt)+], $block:block) => {
- if $expr {
- if_let_chain!{ [$($tt)+], $block }
- }
- };
- ([$expr:expr], $block:block) => {
- if $expr {
- $block
- }
- };
-}
-
pub struct LimitStack {
stack: Vec<u64>,
}
From 934ead14b566a80785ea1e647b2a3c5f747cf92e Mon Sep 17 00:00:00 2001
From: mcarton <cartonmartin+git@gmail.com>
Date: Tue, 22 Dec 2015 00:51:15 +0100
Subject: [PATCH 2/2] Fix typo
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5147595ab54..7d52e10f867 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -28,7 +28,7 @@ how this syntax structure is encoded in the AST, it is recommended to run `rustc
example of the structure and compare with the
[nodes in the AST docs](http://manishearth.github.io/rust-internals-docs/syntax/ast/). Usually
the lint will end up to be a nested series of matches and ifs,
-[like so](https://github.com/Manishearth/rust-clippy/blob/de5ccdfab68a5e37689f3c950ed1532ba9d652a0/src/misc.rs#L34)
+[like so](https://github.com/Manishearth/rust-clippy/blob/de5ccdfab68a5e37689f3c950ed1532ba9d652a0/src/misc.rs#L34).
T-middle issues can be more involved and require verifying types. The
[`middle::ty`](http://manishearth.github.io/rust-internals-docs/rustc/middle/ty) module contains a