Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0614c08

Browse files
committedJun 30, 2020
Auto merge of #5751 - flip1995:rustup, r=Manishearth,flip1995
Rustup cc rust-lang/rust#73743 r? @Manishearth changelog: none
2 parents 88fec89 + d1ab534 commit 0614c08

File tree

111 files changed

+414
-419
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+414
-419
lines changed
 

‎.github/workflows/clippy_bors.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,15 +232,15 @@ jobs:
232232
matrix:
233233
integration:
234234
- 'rust-lang/cargo'
235-
# FIXME: re-enable once fmt_macros is renamed in RLS
236-
# - 'rust-lang/rls'
235+
- 'rust-lang/rls'
237236
- 'rust-lang/chalk'
238237
- 'rust-lang/rustfmt'
239238
- 'Marwes/combine'
240239
- 'Geal/nom'
241240
- 'rust-lang/stdarch'
242241
- 'serde-rs/serde'
243-
- 'chronotope/chrono'
242+
# FIXME: chrono currently cannot be compiled with `--all-targets`
243+
# - 'chronotope/chrono'
244244
- 'hyperium/hyper'
245245
- 'rust-random/rand'
246246
- 'rust-lang/futures-rs'

‎clippy_lints/src/arithmetic.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Arithmetic {
8686
_ => (),
8787
}
8888

89-
let (l_ty, r_ty) = (cx.tables.expr_ty(l), cx.tables.expr_ty(r));
89+
let (l_ty, r_ty) = (cx.tables().expr_ty(l), cx.tables().expr_ty(r));
9090
if l_ty.peel_refs().is_integral() && r_ty.peel_refs().is_integral() {
9191
span_lint(cx, INTEGER_ARITHMETIC, expr.span, "integer arithmetic detected");
9292
self.expr_span = Some(expr.span);
@@ -96,8 +96,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Arithmetic {
9696
}
9797
},
9898
hir::ExprKind::Unary(hir::UnOp::UnNeg, arg) => {
99-
let ty = cx.tables.expr_ty(arg);
100-
if constant_simple(cx, cx.tables, expr).is_none() {
99+
let ty = cx.tables().expr_ty(arg);
100+
if constant_simple(cx, cx.tables(), expr).is_none() {
101101
if ty.is_integral() {
102102
span_lint(cx, INTEGER_ARITHMETIC, expr.span, "integer arithmetic detected");
103103
self.expr_span = Some(expr.span);

0 commit comments

Comments
 (0)
Please sign in to comment.