Auto merge of servo#27335 - jdm:rustup, r=asajeffrey

Update to 7/20 nightly rustc.
pcwalton · Jul 27, 2020 · d25b57c · d25b57c
2 parents 5a8023d + b7f0612
commit d25b57c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -1 +1 @@
-nightly-2020-07-06
+nightly-2020-07-27