Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an optional Soufflé backend #179

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ master ]
pull_request:

jobs:
rustfmt:
name: Check formatting
Expand Down Expand Up @@ -56,11 +56,18 @@ jobs:
strategy:
matrix:
rust: [beta, nightly]
features: [[], ['polonius-souffle']]
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1

- name: Install Souffle
if: contains(matrix.features, 'polonius-souffle')
run: |
wget https://github.com/ecstatic-morse/souffle/releases/download/2.0.2-alpha/souffle-2.0.2-Linux.deb
sudo apt install ./souffle-2.0.2-Linux.deb

- name: Install rust toolchain
uses: actions-rs/toolchain@v1
with:
Expand All @@ -69,7 +76,11 @@ jobs:
override: true

- name: Build polonius
run: cargo build
run: cargo build --features "${{ join(matrix.features) }}"

- name: Execute tests for all crates in the workspace (except `polonius-souffle`)
run: cargo test --all --exclude polonius-souffle --features "${{ join(matrix.features) }}"

- name: Execute tests for all crates in the workspace
run: cargo test --all
- name: Execute tests for `polonius-souffle`
if: contains(matrix.features, 'polonius-souffle')
run: cargo test -p polonius-souffle
221 changes: 221 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,22 @@ version = "0.7.0"
authors = ["The Rust Project Developers", "Polonius Developers"]
description = "Core definition for the Rust borrow checker"
license = "Apache-2.0/MIT"
repository = "https://github.com/rust-lang/polonius"
repository = "https://github.com/rust-lang-nursery/polonius"
readme = "README.md"
keywords = ["compiler", "borrowck", "datalog"]
edition = "2018"
resolver = "2"

[dev-dependencies]
diff = "0.1.0"
polonius-parser = { path = "./polonius-parser" }

[dependencies]
rustc-hash = "1.0.0"
polonius-engine = { path = "./polonius-engine" }
log = "0.4"
petgraph = "0.4.13"
pico-args = "0.2"
rustc-hash = "1.0.0"
polonius-engine = { path = "polonius-engine" }
polonius-souffle = { path = "polonius-souffle", optional = true }
log = "0.4"
petgraph = "0.4.13"
pico-args = "0.2"

[workspace]
3 changes: 3 additions & 0 deletions polonius-engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ license = "Apache-2.0/MIT"
repository = "https://github.com/rust-lang-nursery/polonius"
readme = "README.md"
keywords = ["compiler", "borrowck", "datalog"]
resolver = "2"

[dependencies]
datafrog = "2.0.0"
polonius-facts = { path = "../polonius-facts" }
polonius-souffle = { path = "../polonius-souffle", optional = true }
rustc-hash = "1.0.0"
log = "0.4"
Loading