Skip to content

Commit 48dfbdd

Browse files
committedSep 5, 2023
prepare for release
1 parent bbba21f commit 48dfbdd

File tree

9 files changed

+41
-17
lines changed

9 files changed

+41
-17
lines changed
 

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/target
2-
/derive/target
3-
/derive/Cargo.lock
2+
/proc/target
3+
/proc/Cargo.lock

‎Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version = "0.2.0"
55
edition = "2021"
66
license = "MIT"
77
description = "A multi-objective MaxSAT solver."
8-
keyworks = ["solver", "multi-objective optimization", "maxsat"]
8+
keywords = ["solver", "multi-objective", "maxsat"]
99
repository = "https://github.com/chrjabs/scuttle"
1010
readme = "README.md"
1111

@@ -21,16 +21,16 @@ concolor-clap = { optional = true, version = "0.1.0" }
2121
termcolor = { optional = true, version = "1.2.0" }
2222
atty = { optional = true, version = "0.2.14" }
2323
signal-hook = { optional = true, version = "0.3.15" }
24-
scuttle_derive = { path = "./derive" }
24+
scuttle-proc = { version = "0.1", path = "./proc" }
2525

2626
[build-dependencies]
2727
rustsat-cadical = { version = "0.1", path = "../rustsat/cadical", features = ["v1-7-1"] }
2828

2929
[features]
3030
default = ["build-binary", "phasing", "sol-tightening"]
31-
oracle-term = ["scuttle_derive/oracle-term"]
32-
phasing = ["scuttle_derive/phasing"]
33-
sol-tightening = ["scuttle_derive/sol-tightening"]
31+
oracle-term = ["scuttle-proc/oracle-term"]
32+
phasing = ["scuttle-proc/phasing"]
33+
sol-tightening = ["scuttle-proc/sol-tightening"]
3434
build-binary = [
3535
"dep:clap",
3636
"dep:concolor-clap",

‎derive/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[package]
2-
name = "scuttle_derive"
2+
name = "scuttle-proc"
33
authors = ["Christoph Jabs <christoph.jabs@helsinki.fi>"]
44
license = "MIT"
5-
description = "Procedural derive macros for scuttle"
6-
keyworks = ["solver", "multi-objective optimization", "maxsat"]
5+
description = "Procedural macros for scuttle. These macros are not intended to be used outside of scuttle."
6+
keywords = ["solver", "multi-objective optimization", "maxsat"]
77
repository = "https://github.com/chrjabs/scuttle"
88
version = "0.1.0"
99
edition = "2021"

‎proc/Cargo.toml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[package]
2+
name = "scuttle-proc"
3+
authors = ["Christoph Jabs <christoph.jabs@helsinki.fi>"]
4+
license = "MIT"
5+
description = "Procedural macros for scuttle. This crate is not intended to be used outside of scuttle."
6+
keywords = ["solver", "multi-objective", "maxsat"]
7+
repository = "https://github.com/chrjabs/scuttle"
8+
version = "0.1.0"
9+
edition = "2021"
10+
11+
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
12+
13+
[lib]
14+
proc-macro = true
15+
16+
[dependencies]
17+
syn = "2.0"
18+
quote = "1.0"
19+
darling = "0.20"
20+
21+
[features]
22+
oracle-term = []
23+
phasing = []
24+
sol-tightening = []

‎derive/src/lib.rs ‎proc/src/lib.rs

File renamed without changes.

‎src/solver.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustsat::{
88
solvers::{ControlSignal, SolveIncremental, SolverResult},
99
types::{Assignment, Clause, Lit, LitIter, RsHashMap, TernaryVal, Var, WLitIter},
1010
};
11-
use scuttle_derive::oracle_bounds;
11+
use scuttle_proc::oracle_bounds;
1212

1313
use crate::{
1414
options::EnumOptions,

‎src/solver/lowerbounding.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use rustsat::{
1414
solvers::{ControlSignal, SolveIncremental, SolveStats, SolverResult, SolverStats},
1515
types::{Assignment, Clause, Lit},
1616
};
17-
use scuttle_derive::{oracle_bounds, KernelFunctions, Solve};
17+
use scuttle_proc::{oracle_bounds, KernelFunctions, Solve};
1818

1919
use crate::{
2020
types::ParetoFront, EncodingStats, ExtendedSolveStats, KernelFunctions, Limits, Options, Phase,

‎src/solver/pminimal.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use rustsat::{
2727
solvers::{ControlSignal, SolveIncremental, SolveStats, SolverResult, SolverStats},
2828
types::{Assignment, Clause},
2929
};
30-
use scuttle_derive::{oracle_bounds, KernelFunctions, Solve};
30+
use scuttle_proc::{oracle_bounds, KernelFunctions, Solve};
3131

3232
use super::{default_blocking_clause, Objective, SolverKernel};
3333

0 commit comments

Comments
 (0)
Please sign in to comment.