sq: Rename module to 'sequoia-sq'.

22 files changed, 35 insertions, 35 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f0a12f5..5bd27534 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,8 +28,8 @@ bullseye:
     - cargo test --all --exclude sequoia-openpgp-ffi
     - make
     - if ! git diff --quiet Cargo.lock ; then echo "Cargo.lock changed.  Please add the change to the corresponding commit." ; false ; fi
-    - make -C tool update-usage
-    - if ! git diff --quiet tool ; then echo "Please run 'make -C tool update-usage' and commit the result." ; false ; fi
+    - make -C sq update-usage
+    - if ! git diff --quiet sq ; then echo "Please run 'make -C sq update-usage' and commit the result." ; false ; fi
     - make -C sqv update-usage
     - if ! git diff --quiet sqv ; then echo "Please run 'make -C sqv update-usage' and commit the result." ; false ; fi
     - if ! git diff --quiet ; then echo "The build changed the source.  Please investigate." ; git diff ; fi
diff --git a/Cargo.lock b/Cargo.lock
index fdd2291b..1123b177 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1950,6 +1950,29 @@ dependencies = [
 ]
 
 [[package]]
+name = "sequoia-sq"
+version = "0.19.0"
+dependencies = [
+ "anyhow",
+ "assert_cli",
+ "buffered-reader",
+ "chrono",
+ "clap",
+ "crossterm",
+ "itertools",
+ "prettytable-rs",
+ "rpassword",
+ "sequoia-autocrypt",
+ "sequoia-core",
+ "sequoia-ipc",
+ "sequoia-net",
+ "sequoia-openpgp",
+ "sequoia-store",
+ "tempfile",
+ "tokio-core",
+]
+
+[[package]]
 name = "sequoia-sqv"
 version = "0.19.0"
 dependencies = [
@@ -1981,29 +2004,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "sequoia-tool"
-version = "0.19.0"
-dependencies = [
- "anyhow",
- "assert_cli",
- "buffered-reader",
- "chrono",
- "clap",
- "crossterm",
- "itertools",
- "prettytable-rs",
- "rpassword",
- "sequoia-autocrypt",
- "sequoia-core",
- "sequoia-ipc",
- "sequoia-net",
- "sequoia-openpgp",
- "sequoia-store",
- "tempfile",
- "tokio-core",
-]
-
-[[package]]
 name = "serde"
 version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 56ae3aa3..131d0011 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,9 +11,9 @@ members = [
     "openpgp",
     "openpgp-ffi",
     "sop",
+    "sq",
     "sqv",
     "store",
-    "tool",
 ]
 
 [profile.release]
diff --git a/Makefile b/Makefile
index c32c490e..3ea4b6e8 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ doc:
 build-release:
 	$(MAKE) -Copenpgp-ffi build-release
 	$(MAKE) -Cffi build-release
-	$(MAKE) -Ctool build-release
+	$(MAKE) -Csq build-release
 	$(MAKE) -Csqv build-release
 	$(MAKE) -Csop build-release
 
@@ -107,7 +107,7 @@ build-release:
 install: build-release
 	$(MAKE) -Copenpgp-ffi install
 	$(MAKE) -Cffi install
-	$(MAKE) -Ctool install
+	$(MAKE) -Csq install
 	$(MAKE) -Csqv install
 	$(MAKE) -Csop install
 
diff --git a/README.md b/README.md
index 1282c52c..d3ee27c6 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ Using cargo
 
 To build all Sequoia components, simply execute `cargo build
 [--release] --all`.  Individual components may be built independently,
-e.g. to build `sq`, run `cargo build [--release] -p sequoia-tool`, or
+e.g. to build `sq`, run `cargo build [--release] -p sequoia-sq`, or
 build `sequoia-openpgp-ffi` to build a shared object with the C API.
 
 Using the Makefile
diff --git a/guide/src/chapter_00.md b/guide/src/chapter_00.md
index e4967939..aef1cbc9 100644
--- a/guide/src/chapter_00.md
+++ b/guide/src/chapter_00.md
@@ -90,7 +90,7 @@ tool:
 $ git clone https://gitlab.com/sequoia-pgp/sequoia.git
 ...
 $ cd sequoia
-$ cargo build -p sequoia-tool
+$ cargo build -p sequoia-sq
 ...
 $ target/debug/sq
 sq 0.1.0
diff --git a/guide/src/lib.rs b/guide/src/lib.rs
index e1e33403..c1760d02 100644
--- a/guide/src/lib.rs
+++ b/guide/src/lib.rs
@@ -12,7 +12,7 @@ For more inspiration, see our various [examples] and our
 command-line frontends [sq] and [sqv].
 
 [examples]: https://gitlab.com/sequoia-pgp/sequoia/tree/master/openpgp/examples
-[sq]: https://gitlab.com/sequoia-pgp/sequoia/tree/master/tool
+[sq]: https://gitlab.com/sequoia-pgp/sequoia/tree/master/sq
 [sqv]: https://gitlab.com/sequoia-pgp/sequoia/tree/master/sqv
 
 Happy climbing!
diff --git a/tool/Cargo.toml b/sq/Cargo.toml
index ada5b3fe..9023b02b 100644
--- a/tool/Cargo.toml
+++ b/sq/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sequoia-tool"
+name = "sequoia-sq"
 description = "Command-line frontends for Sequoia"
 version = "0.19.0"
 authors = [
diff --git a/tool/Makefile b/sq/Makefile
index 44428c96..8b7e11c1 100644
--- a/tool/Makefile
+++ b/sq/Makefile
@@ -19,7 +19,7 @@ all: src/sq-usage.rs
 .PHONY: build-release
 build-release:
 	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
-	    $(CARGO) build $(CARGO_FLAGS) --release --package sequoia-tool
+	    $(CARGO) build $(CARGO_FLAGS) --release --package sequoia-sq
 	$(MAKE) -C../store build-release
 
 .PHONY: install
diff --git a/tool/build.rs b/sq/build.rs
index b7d3147d..b7d3147d 100644
--- a/tool/build.rs
+++ b/sq/build.rs
diff --git a/tool/make-usage.sh b/sq/make-usage.sh
index 7bcbfcf2..7bcbfcf2 100644
--- a/tool/make-usage.sh
+++ b/sq/make-usage.sh
diff --git a/tool/src/commands/decrypt.rs b/sq/src/commands/decrypt.rs
index 07adabe6..07adabe6 100644
--- a/tool/src/commands/decrypt.rs
+++ b/sq/src/commands/decrypt.rs
diff --git a/tool/src/commands/dump.rs b/sq/src/commands/dump.rs
index 6f35f56d..6f35f56d 100644
--- a/tool/src/commands/dump.rs
+++ b/sq/src/commands/dump.rs
diff --git a/tool/src/commands/inspect.rs b/sq/src/commands/inspect.rs
index e275c261..e275c261 100644
--- a/tool/src/commands/inspect.rs
+++ b/sq/src/commands/inspect.rs
diff --git a/tool/src/commands/key.rs b/sq/src/commands/key.rs
index dc1df48a..dc1df48a 100644
--- a/tool/src/commands/key.rs
+++ b/sq/src/commands/key.rs
diff --git a/tool/src/commands/mod.rs b/sq/src/commands/mod.rs
index 6415e2cf..6415e2cf 100644
--- a/tool/src/commands/mod.rs
+++ b/sq/src/commands/mod.rs
diff --git a/tool/src/commands/sign.rs b/sq/src/commands/sign.rs
index 41691af0..41691af0 100644
--- a/tool/src/commands/sign.rs
+++ b/sq/src/commands/sign.rs
diff --git a/tool/src/sq-usage.rs b/sq/src/sq-usage.rs
index 05814ced..05814ced 100644
--- a/tool/src/sq-usage.rs
+++ b/sq/src/sq-usage.rs
diff --git a/tool/src/sq.rs b/sq/src/sq.rs
index 31107e93..31107e93 100644
--- a/tool/src/sq.rs
+++ b/sq/src/sq.rs
diff --git a/tool/src/sq_cli.rs b/sq/src/sq_cli.rs
index 93b15bac..5bb5f80b 100644
--- a/tool/src/sq_cli.rs
+++ b/sq/src/sq_cli.rs
@@ -2,7 +2,7 @@
 ///
 /// If you change this file, please rebuild `sq`, run `make -C tool
 /// update-usage`, and commit the resulting changes to
-/// `tool/src/sq-usage.rs`.
+/// `sq/src/sq-usage.rs`.
 
 use clap::{App, Arg, ArgGroup, SubCommand, AppSettings};
 
diff --git a/tool/tests/sq-sign.rs b/sq/tests/sq-sign.rs
index f75d5b9e..f75d5b9e 100644
--- a/tool/tests/sq-sign.rs
+++ b/sq/tests/sq-sign.rs
diff --git a/sqv/src/sqv_cli.rs b/sqv/src/sqv_cli.rs
index ee4eebc1..a351cead 100644
--- a/sqv/src/sqv_cli.rs
+++ b/sqv/src/sqv_cli.rs
@@ -2,7 +2,7 @@
 ///
 /// If you change this file, please rebuild `sqv`, run `make -C tool
 /// update-usage`, and commit the resulting changes to
-/// `tool/src/sqv-usage.rs`.
+/// `sqv/src/sqv-usage.rs`.
 
 use clap::{App, Arg, AppSettings};