Skip to content

Commit

Permalink
Merge branch 'master' into franziskus/allow_array_field_assign
Browse files Browse the repository at this point in the history
  • Loading branch information
msprotz authored Oct 14, 2024
2 parents b8f4b17 + 59a3a41 commit 4137a2e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion krmllib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ FSTAR = $(RUNLIM) $(FSTAR_EXE) $(FSTAR_OPTIONS) --cache_checked_modules --cache_
# location of ulib.
ROOTS = $(wildcard *.fst) $(wildcard *.fsti) $(wildcard ../runtime/*.fst) \
FStar.UInt128.fst FStar.Date.fsti \
FStar.HyperStack.IO.fst FStar.IO.fst FStar.Int.Cast.Full.fst \
FStar.HyperStack.IO.fst FStar.IO.fsti FStar.Int.Cast.Full.fst \
FStar.Bytes.fsti FStar.Dyn.fsti LowStar.Printf.fst LowStar.Endianness.fst

.PHONY: clean clean-c
Expand Down
1 change: 1 addition & 0 deletions test/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.cache
.depend
.output
*.exe
2 changes: 1 addition & 1 deletion test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ WasmTrap.wasm-test: NEGATIVE = true
echo 'fn main () { let r = main_ (); if r != 0 { println!("main_ returned: {}\\n", r); panic!() } }' >> $@

%.rust-test: $(OUTPUT_DIR)/%.rs
rustc $< && ./$*
rustc $< -o $*.exe && ./$*.exe

rust: $(RUST_FILES) $(patsubst Rust%.fst,rust%.rust-test,$(filter-out Rust1.fst Rust2.fst Rust3.fst,$(wildcard Rust*.fst)))

Expand Down

0 comments on commit 4137a2e

Please sign in to comment.