Merge pull request #2480 from GaloisInc/crucible-T1445-submodule-bump

Bump `crucible`, `mir-json` submodule to bring in custom DST support

Author: RyanGlScott

crux-mir-comp/test/symb_eval/cryptol/basic_err_fewer_args.good

@@ -5,6 +5,6 @@ failures:
 ---- basic_err_fewer_args/<DISAMB>::test[0] counterexamples ----
 [Crux] Found counterexample for verification goal
 [Crux]   test/symb_eval/cryptol/basic_err_fewer_args.rs:8:35: 8:65: error: in basic_err_fewer_args/<DISAMB>::test[0]
-[Crux]   error loading "addByte": not enough arguments: Cryptol function signature [8] -> [8] -> [8] has 2 arguments, but Rust signature (u8, u8, u8) -> u8 [RustAbi]  requires 3
+[Crux]   error loading "addByte": not enough arguments: Cryptol function signature [8] -> [8] -> [8] has 2 arguments, but Rust signature (u8, u8, u8) -> u8 [RustAbi] requires 3
 
 [Crux] Overall status: Invalid.

deps/crucible

@@ -1360,7 +1360,6 @@ data FnSigView = FnSigView {
     _fsvarg_tys    :: ![TyView]
   , _fsvreturn_ty  :: !TyView
   , _fsvabi        :: Mir.Abi
-  , _fsvspreadarg  :: Maybe Int
   }
   deriving Eq
 
@@ -1423,8 +1422,8 @@ substsView (Mir.Substs tys) = SubstsView (map tyView tys)
 
 -- | Convert a 'Mir.FnSig' value to a 'FnSigView' value.
 fnSigView :: Mir.FnSig -> FnSigView
-fnSigView (Mir.FnSig argTys retTy abi spreadarg) =
-  FnSigView (map tyView argTys) (tyView retTy) abi spreadarg
+fnSigView (Mir.FnSig argTys retTy abi) =
+  FnSigView (map tyView argTys) (tyView retTy) abi
 
 -- | Read the value out of a 'MaybeType' expression that is assumed to be
 -- assigned to a value. If this assumption does not hold (i.e., if the value is

deps/mir-json

@@ -275,7 +275,7 @@ tyToShape col = go
     goRef ty ty' mutbl | Some tpr <- tyToRepr col ty' = Some $ RefShape ty ty' mutbl tpr
 
     goFnPtr :: M.Ty -> M.FnSig -> Some TypeShape
-    goFnPtr ty (M.FnSig args ret _abi _spread) =
+    goFnPtr ty (M.FnSig args ret _abi) =
         tyListToCtx col args $ \argsr  ->
         tyToReprCont col ret $ \retr ->
            Some (FnPtrShape ty argsr retr)