Merge branch 'version-1.1'

ufmg-smite · Aug 29, 2023 · 5d817d8 · 5d817d8
2 parents ab8239f + 13bf580
commit 5d817d8
Show file tree

Hide file tree

Showing 57 changed files with 3,564 additions and 1,662 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: setup
-      run: rustup default 1.67 && rustup component add clippy
+      run: rustup default 1.72 && rustup component add clippy
     - name: lint
       run: cargo clippy --version && cargo clippy --all-targets --all-features --tests --no-deps -- -D warnings
     - name: build
@@ -18,14 +18,14 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: setup
-      run: rustup default 1.67
+      run: rustup default 1.72
     - name: test
       run: cargo --version && cargo test --release
   format:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
     - name: setup
-      run: rustup default 1.67 && rustup component add rustfmt
+      run: rustup default 1.72 && rustup component add rustfmt
     - name: check formatting
       run: cargo fmt --version && cargo fmt --check
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
 members = ["carcara", "cli", "test-generator"]
+resolver = "2"
 
 [profile.release]
 debug = 1