summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2022-09-09 06:24:48 +0000
committerLars Wirzenius <liw@liw.fi>2022-09-09 06:24:48 +0000
commitd37a9703ac7959bde32505794bab07130b73af94 (patch)
treef932eb9c132ae4fc3f515a63a223d909287ccd88
parent0882db906ecae363e62f440923778280b2e780bb (diff)
parent60192604e815dc4c9cf1dbab44b6c78c1a9833f7 (diff)
downloadclab-d37a9703ac7959bde32505794bab07130b73af94.tar.gz
Merge branch 'fixes' into 'main'
fix things so ./check passes again See merge request larswirzenius/clab!11
-rwxr-xr-xcheck6
-rw-r--r--clab.md14
-rw-r--r--clab.subplot13
-rw-r--r--src/main.rs5
4 files changed, 17 insertions, 21 deletions
diff --git a/check b/check
index aaad3cf..c8e8b46 100755
--- a/check
+++ b/check
@@ -23,11 +23,11 @@ $hideok cargo build --all-targets
got_cargo_cmd fmt && $hideok cargo fmt -- --check
$hideok cargo test
-subplot docgen clab.md -o clab.html
-subplot docgen clab.md -o clab.pdf
+subplot docgen clab.subplot -o clab.html
+subplot docgen clab.subplot -o clab.pdf
target="$(cargo metadata --format-version=1 | python3 -c 'import sys, json; o = json.load(sys.stdin); print(o["target_directory"])')"
-subplot codegen clab.md -o test.py
+subplot codegen clab.subplot -o test.py
rm -f test.log
if [ "$(id -un)" = root ]; then
echo Not running tests as root.
diff --git a/clab.md b/clab.md
index e817b43..c80fdcb 100644
--- a/clab.md
+++ b/clab.md
@@ -1,17 +1,3 @@
----
-title: "clab; &ndash; command line address book"
-author: Lars Wirzenius
-bindings:
-- subplot/clab.yaml
-- lib/files.yaml
-- lib/runcmd.yaml
-impls:
- python:
- - subplot/clab.py
- - lib/files.py
- - lib/runcmd.py
-...
-
# Introduction
`clab` is a command line address book application. It has no
diff --git a/clab.subplot b/clab.subplot
new file mode 100644
index 0000000..0673c4e
--- /dev/null
+++ b/clab.subplot
@@ -0,0 +1,13 @@
+title: "clab; &ndash; command line address book"
+author: Lars Wirzenius
+markdowns:
+- clab.md
+bindings:
+- subplot/clab.yaml
+- lib/files.yaml
+- lib/runcmd.yaml
+impls:
+ python:
+ - subplot/clab.py
+ - lib/files.py
+ - lib/runcmd.py
diff --git a/src/main.rs b/src/main.rs
index ec62374..6317fd0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -152,10 +152,7 @@ impl ConfigCommand {
}
#[derive(Debug, StructOpt)]
-struct LintCommand {
- #[structopt(parse(from_os_str))]
- filenames: Vec<PathBuf>,
-}
+struct LintCommand {}
impl LintCommand {
fn run(&self, _opt: &Opt, _book: &AddressBook) {}