Skip to content

Commit b14114f

Browse files
authored
Merge pull request #1084 from Manishearth/rustup
Rustup to rustc 1.12.0-nightly (f93aaf8 2016-07-09) and bump to 0.0.79
2 parents 1f7d7d7 + 62ddefc commit b14114f

File tree

6 files changed

+9
-10
lines changed

6 files changed

+9
-10
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4-
## 0.0.79 — ?
4+
## 0.0.79 — 2016-07-10
5+
* Rustup to *rustc 1.12.0-nightly (f93aaf84c 2016-07-09)*
56
* Major suggestions refactoring
67

78
## 0.0.78 — 2016-07-02

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "clippy"
3-
version = "0.0.78"
3+
version = "0.0.79"
44
authors = [
55
"Manish Goregaokar <[email protected]>",
66
"Andre Bogus <[email protected]>",
@@ -25,7 +25,7 @@ test = false
2525

2626
[dependencies]
2727
# begin automatic update
28-
clippy_lints = { version = "0.0.78", path = "clippy_lints" }
28+
clippy_lints = { version = "0.0.79", path = "clippy_lints" }
2929
# end automatic update
3030

3131
[dev-dependencies]

clippy_lints/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "clippy_lints"
33
# begin automatic update
4-
version = "0.0.78"
4+
version = "0.0.79"
55
# end automatic update
66
authors = [
77
"Manish Goregaokar <[email protected]>",

clippy_lints/src/copies.rs

-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ fn bindings<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, pat: &Pat) -> HashMap<Interned
253253
}
254254
}
255255
PatKind::Lit(..) |
256-
PatKind::QPath(..) |
257256
PatKind::Range(..) |
258257
PatKind::Wild |
259258
PatKind::Path(..) => (),

clippy_lints/src/matches.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ fn check_single_match_opt_like(cx: &LateContext, ex: &Expr, arms: &[Arm], expr:
202202
path.to_string()
203203
}
204204
PatKind::Binding(BindByValue(MutImmutable), ident, None) => ident.node.to_string(),
205-
PatKind::Path(ref path) => path.to_string(),
205+
PatKind::Path(None, ref path) => path.to_string(),
206206
_ => return,
207207
};
208208

clippy_lints/src/utils/hir.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,10 @@ impl<'a, 'tcx: 'a> SpanlessEq<'a, 'tcx> {
148148
(&PatKind::Binding(ref lb, ref li, ref lp), &PatKind::Binding(ref rb, ref ri, ref rp)) => {
149149
lb == rb && li.node.as_str() == ri.node.as_str() && both(lp, rp, |l, r| self.eq_pat(l, r))
150150
}
151-
(&PatKind::Path(ref l), &PatKind::Path(ref r)) => self.eq_path(l, r),
152-
(&PatKind::Lit(ref l), &PatKind::Lit(ref r)) => self.eq_expr(l, r),
153-
(&PatKind::QPath(ref ls, ref lp), &PatKind::QPath(ref rs, ref rp)) => {
154-
self.eq_qself(ls, rs) && self.eq_path(lp, rp)
151+
(&PatKind::Path(ref ql, ref l), &PatKind::Path(ref qr, ref r)) => {
152+
both(ql, qr, |ql, qr| self.eq_qself(ql, qr)) && self.eq_path(l, r)
155153
}
154+
(&PatKind::Lit(ref l), &PatKind::Lit(ref r)) => self.eq_expr(l, r),
156155
(&PatKind::Tuple(ref l, ls), &PatKind::Tuple(ref r, rs)) => {
157156
ls == rs && over(l, r, |l, r| self.eq_pat(l, r))
158157
}

0 commit comments

Comments
 (0)