Skip to content

Commit 4c349bf

Browse files
committed
Remove vpl and fix compilation issues on Ubuntu
1 parent 24a58e1 commit 4c349bf

90 files changed

Lines changed: 17 additions & 29811 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# In topological order of dependencies
2-
PROJECTS = vest polyfill parser vpl chain test
2+
PROJECTS = chain parser polyfill rspec_test test vest
33

44
.PHONY: debug
55
debug:

‎chain/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ DOMAINS = github.com google.com outlook.com slack.com verus.rs
1717
.PHONY: test-policy-%
1818
test-policy-%: target/debug/chain
1919
# For each domain in DOMAINS, remove the suffix, then find the corresponding pem
20-
@for domain in $(DOMAINS); do \
20+
@set -e; \
21+
for domain in $(DOMAINS); do \
2122
pem_file=tests/chains/$${domain%%.*}.pem; \
2223
printf "[$*] $$domain: "; \
2324
echo "target/debug/chain $*-hammurabi tests/roots.pem $$pem_file $$domain -t $(TEST_TIME) -s"; \
24-
(target/debug/chain \
25+
target/debug/chain \
2526
$*-hammurabi \
2627
tests/roots.pem \
2728
$$pem_file \
2829
$$domain \
2930
-t $(TEST_TIME) \
30-
-s) \
31-
|| (echo "failed"; exit 1); \
31+
-s; \
3232
done

‎dep.mk‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,17 @@ rust-deps-%: $(foreach dep,$(CARGO_DEPS),force-target/%/lib$(dep).rlib)
3636
# Bulid each dependency in VERUS_DEPS
3737
.PHONY: verus-deps-%
3838
verus-deps-%:
39-
@for dep in $(VERUS_DEPS); do \
40-
pushd ../$$dep; \
39+
@set -e; \
40+
for dep in $(VERUS_DEPS); do \
41+
cd ../$$dep; \
4142
echo "Building Verus dependency $$dep"; \
4243
rlib=target/$*/lib$$dep.rlib; \
43-
make $$rlib || (echo "Fail to compile dependency $$dep"; exit 1) && \
44+
make $$rlib; \
4445
if [ ! -f $$rlib ] || [ ! -f $$rlib.verusdata ]; then \
4546
echo "Cannot find external Verus library $$rlib (or $$rlib.verusdata)"; \
4647
exit 1; \
47-
fi && \
48-
popd; \
48+
fi; \
49+
cd -; \
4950
done
5051

5152
# The main verus command to run for TARGET
@@ -61,7 +62,10 @@ VERUS_COMMAND = \
6162
--crate-name $(NAME) \
6263
$(if $(filter %.rlib,$@),--crate-type=lib,) \
6364
-L dependency=target/$*/deps \
64-
$(foreach dep,$(CARGO_DEPS),--extern $(subst -,_,$(dep))=$(firstword $(wildcard target/$*/deps/lib$(subst -,_,$(dep))-*.rlib) $(wildcard target/$*/deps/lib$(dep)-*.dylib))) \
65+
$(foreach dep,$(CARGO_DEPS),--extern $(subst -,_,$(dep))=$(firstword \
66+
$(wildcard target/$*/deps/lib$(subst -,_,$(dep))-*.rlib) \
67+
$(wildcard target/$*/deps/lib$(subst -,_,$(dep))-*.so) \
68+
$(wildcard target/$*/deps/lib$(subst -,_,$(dep))-*.dylib))) \
6569
$(foreach dep,$(VERUS_DEPS),-L dependency=../$(dep)/target/$*/deps) \
6670
$(foreach dep,$(VERUS_DEPS),-L dependency=../$(dep)/target/$*) \
6771
$(foreach dep,$(VERUS_DEPS),--extern $(dep)=../$(dep)/target/$*/lib$(dep).rlib --import $(dep)=../$(dep)/target/$*/lib$(dep).rlib.verusdata) \

‎macros/Cargo.lock‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎parser/src/common/mod.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ mod default;
1717
mod eq;
1818
mod unreachable;
1919
mod cached;
20-
mod base64;
2120

2221
pub use depend::*;
2322
pub use repeat::*;
@@ -34,7 +33,6 @@ pub use default::*;
3433
pub use eq::*;
3534
pub use unreachable::*;
3635
pub use cached::*;
37-
pub use base64::*;
3836

3937
pub use macros::View;
4038
pub use macros::PolyfillClone;

‎rust-toolchain.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[toolchain]
2+
channel = "1.76.0"

‎vest/src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![crate_name = "vest"]
22
#![crate_type = "lib"]
3-
#![warn(missing_docs)]
43
//! Vest is a *formally verified* library for parsing and serializing binary data, using combinators.
54
//!
65
//! # Background

0 commit comments

Comments
 (0)