From b7f061280761671dbe7c41fbede60c9b2b88488b Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 20 Jul 2020 15:06:46 -0400 Subject: [PATCH] Update to 7/27 nightly rustc. --- components/script_plugins/lib.rs | 4 ++-- rust-toolchain | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs index 2d38ed27510..79d1a5282ef 100644 --- a/components/script_plugins/lib.rs +++ b/components/script_plugins/lib.rs @@ -315,7 +315,7 @@ impl<'a, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'tcx> { let cx = self.cx; let require_rooted = |cx: &LateContext, in_new_function: bool, subexpr: &hir::Expr| { - let ty = cx.tables().expr_ty(&subexpr); + let ty = cx.typeck_results().expr_ty(&subexpr); if is_unrooted_ty(&self.symbols, cx, ty, in_new_function) { cx.lint(UNROOTED_MUST_ROOT, |lint| { lint.build(&format!("Expression of type {:?} must be rooted", ty)) @@ -357,7 +357,7 @@ impl<'a, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'tcx> { match pat.kind { hir::PatKind::Binding(hir::BindingAnnotation::Unannotated, ..) | hir::PatKind::Binding(hir::BindingAnnotation::Mutable, ..) => { - let ty = cx.tables().pat_ty(pat); + let ty = cx.typeck_results().pat_ty(pat); if is_unrooted_ty(&self.symbols, cx, ty, self.in_new_function) { cx.lint(UNROOTED_MUST_ROOT, |lint| { lint.build(&format!("Expression of type {:?} must be rooted", ty)) diff --git a/rust-toolchain b/rust-toolchain index c7d76b9e059..40973dae63e 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2020-07-06 +nightly-2020-07-27