Make the compiler compile 😅

Author: arora-aman

compiler/rustc_interface/src/util.rs

@@ -120,8 +120,14 @@ pub fn scoped_thread<F: FnOnce() -> R + Send, R: Send>(cfg: thread::Builder, f:
     let result_ptr = Ptr(&mut result as *mut _ as *mut ());
 
     let thread = cfg.spawn(move || {
-        let run = unsafe { (*(run.0 as *mut Option<F>)).take().unwrap() };
-        let result = unsafe { &mut *(result_ptr.0 as *mut Option<R>) };
+        let run = unsafe {
+            let x = run;
+            (*(x.0 as *mut Option<F>)).take().unwrap()
+        };
+        let result = unsafe {
+            let x = result_ptr;
+            &mut *(x.0 as *mut Option<R>)
+        };
         *result = Some(run());
     });
 

compiler/rustc_typeck/src/expr_use_visitor.rs

@@ -405,6 +405,7 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> {
         };
 
         let with_place = return_if_err!(self.mc.cat_expr(&with_expr));
+        self.delegate_consume(&with_place, with_place.hir_id);
 
         // Select just those fields of the `with`
         // expression that will actually be used
@@ -531,6 +532,8 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> {
 
         let tcx = self.tcx();
         let ExprUseVisitor { ref mc, body_owner: _, ref mut delegate } = *self;
+        delegate.borrow(discr_place, discr_place.hir_id, ty::ImmBorrow);
+
         return_if_err!(mc.cat_pattern(discr_place.clone(), pat, |place, pat| {
             if let PatKind::Binding(_, canonical_id, ..) = pat.kind {
                 debug!("walk_pat: binding place={:?} pat={:?}", place, pat,);