Skip to content

Commit b3e3e69

Browse files
authored
Merge branch 'master' into afromher_rust2
2 parents 409c23c + 2d9c097 commit b3e3e69

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
};
77

88
outputs = { self, fstar, flake-utils, nixpkgs }:
9-
flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
9+
flake-utils.lib.eachDefaultSystem (system:
1010
let
1111
fstarPackages = fstar.packages.${system};
1212
pkgs = import nixpkgs { inherit system; };

lib/AstToMiniRust.ml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,12 @@ and translate_expr_with_type (env: env) (e: Ast.expr) (t_ret: MiniRust.typ): env
767767
let env, e2 = translate_expr env e2 in
768768
env, MethodCall (e1, ["split_at"], [ e2 ])
769769

770+
| EApp ({ node = ETApp ({ node = EQualified (["Pulse"; "Lib"; "Slice"], "subslice"); _ }, [], [], [_]); _ }, [e1; e2; e3]) ->
771+
let env, e1 = translate_expr env e1 in
772+
let env, e2 = translate_expr env e2 in
773+
let env, e3 = translate_expr env e3 in
774+
env, Borrow (Shared, Index (e1, Range (Some e2, Some e3, false)))
775+
770776
| EApp ({ node = ETApp ({ node = EQualified (["Pulse"; "Lib"; "Slice"], "copy"); _ }, [], [], _); _ }, [e1; e2]) ->
771777
let env, e1 = translate_expr env e1 in
772778
let env, e2 = translate_expr env e2 in

misc/cl-wrapper.bat

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
@echo off
22

3-
IF NOT "%VS150COMNTOOLS%"=="" (
3+
REM Crazy rules in batch mean we need this and also using !varsall! in
4+
REM the first block below to get the updated value for the variable.
5+
setlocal EnableDelayedExpansion
6+
7+
IF exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
8+
REM Tip: if you start seeing "The input line is too long", while debugging
9+
REM this script, restart your shell, vcvarsall just keeps stupidly expanding
10+
REM some env variables
11+
FOR /F "tokens=*" %%i IN ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find **/vcvarsall.bat') DO set varsall=%%i
12+
call "!varsall!" amd64
13+
) ELSE IF NOT "%VS150COMNTOOLS%"=="" (
414
call "%VS150COMNTOOLS%/../../VC/vcvarsall.bat" amd64
515
) ELSE IF NOT "%VS140COMNTOOLS%"=="" (
616
call "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" amd64

0 commit comments

Comments
 (0)