diff options
| -rw-r--r-- | components/net/image_cache.rs | 2 | ||||
| -rw-r--r-- | components/net/lib.rs | 2 | ||||
| -rw-r--r-- | components/net_traits/image/base.rs | 2 | ||||
| -rw-r--r-- | components/net_traits/lib.rs | 2 | ||||
| -rw-r--r-- | components/script_plugins/unrooted_must_root.rs | 15 | ||||
| -rw-r--r-- | rust-commit-hash | 2 |
6 files changed, 9 insertions, 16 deletions
diff --git a/components/net/image_cache.rs b/components/net/image_cache.rs index b8467e5a461..ebf31d2f5a1 100644 --- a/components/net/image_cache.rs +++ b/components/net/image_cache.rs @@ -99,7 +99,7 @@ fn is_image_opaque(format: webrender_traits::ImageFormat, bytes: &[u8]) -> bool fn premultiply(data: &mut [u8]) { let length = data.len(); - for i in (0..length).step_by(4) { + for i in Iterator::step_by(0..length, 4) { let b = data[i + 0] as u32; let g = data[i + 1] as u32; let r = data[i + 2] as u32; diff --git a/components/net/lib.rs b/components/net/lib.rs index 8f15def3948..f96a6fbf2c0 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -4,7 +4,7 @@ #![deny(unsafe_code)] #![feature(box_syntax)] -#![feature(step_by)] +#![feature(iterator_step_by)] extern crate base64; extern crate brotli; diff --git a/components/net_traits/image/base.rs b/components/net_traits/image/base.rs index cae3cce8dde..a52ed0e717b 100644 --- a/components/net_traits/image/base.rs +++ b/components/net_traits/image/base.rs @@ -42,7 +42,7 @@ pub struct ImageMetadata { fn byte_swap_and_premultiply(data: &mut [u8]) { let length = data.len(); - for i in (0..length).step_by(4) { + for i in Iterator::step_by(0..length, 4) { let r = data[i + 2]; let g = data[i + 1]; let b = data[i + 0]; diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index e1403386d54..42808737db8 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #![feature(box_syntax)] -#![feature(step_by)] +#![feature(iterator_step_by)] #![deny(unsafe_code)] diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs index 844eb9b87e6..ca7c70aeb75 100644 --- a/components/script_plugins/unrooted_must_root.rs +++ b/components/script_plugins/unrooted_must_root.rs @@ -140,16 +140,16 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { if !in_derive_expn(span) { let def_id = cx.tcx.hir.local_def_id(id); - let ty = cx.tcx.type_of(def_id); + let sig = cx.tcx.type_of(def_id).fn_sig(); - for (arg, ty) in decl.inputs.iter().zip(ty.fn_args().0.iter()) { + for (arg, ty) in decl.inputs.iter().zip(sig.inputs().0.iter()) { if is_unrooted_ty(cx, ty, false) { cx.span_lint(UNROOTED_MUST_ROOT, arg.span, "Type must be rooted") } } if !in_new_function { - if is_unrooted_ty(cx, ty.fn_ret().0, false) { + if is_unrooted_ty(cx, sig.output().0, false) { cx.span_lint(UNROOTED_MUST_ROOT, decl.output.span(), "Type must be rooted") } } @@ -218,15 +218,8 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> { visit::walk_pat(self, pat); } - fn visit_fn(&mut self, kind: visit::FnKind<'tcx>, decl: &'tcx hir::FnDecl, - body: hir::BodyId, span: codemap::Span, id: ast::NodeId) { - if let visit::FnKind::Closure(_) = kind { - visit::walk_fn(self, kind, decl, body, span, id); - } - } + fn visit_ty(&mut self, _: &'tcx hir::Ty) {} - fn visit_foreign_item(&mut self, _: &'tcx hir::ForeignItem) {} - fn visit_ty(&mut self, _: &'tcx hir::Ty) { } fn nested_visit_map<'this>(&'this mut self) -> hir::intravisit::NestedVisitorMap<'this, 'tcx> { hir::intravisit::NestedVisitorMap::OnlyBodies(&self.cx.tcx.hir) } diff --git a/rust-commit-hash b/rust-commit-hash index ac9c5bcdd55..1299a854db2 100644 --- a/rust-commit-hash +++ b/rust-commit-hash @@ -1 +1 @@ -03bed655142dd5e42ba4539de53b3663d8a123e0 +6165203c48420c6f77ea22113eb4ff66931410c3 |