src/stris.rs

@@ -19,7 +19,7 @@
 
 use std::{
 	env::args,
-	process::ExitCode,
+	process::ExitCode
 };
 
 extern crate getopt;
@@ -30,7 +30,7 @@ use sysexits::EX_USAGE;
 
 struct Reqs {
 	ascii: bool, blank: bool, cntrl: bool, digit: bool, lower: bool,
-	upper: bool, inuse: bool, extra: String
+	upper: bool, inuse: bool, extra: String::default()
 }
 
 fn usage(s: &str) -> ExitCode {

tests/bonsai/str.mk

@@ -7,19 +7,14 @@
 
 .PRAGMA: command_comment
 
-.PHONY: stris_tests
-stris_tests: stris_help stris_7 stris_b
+.PHONY: str_tests
+str_tests: str_help str_isalpha
 
-.PHONY: stris_help
-stris_help: $(BIN)/stris
-	! $(BIN)/stris -h
+.PHONY: str_help
+str_help: $(BIN)/str
+	! $(BIN)/str -h
 
-.PHONY: stris_7
-stris_7: $(BIN)/stris
-	$(BIN)/stris   -7 !1Aa' '
-	! $(BIN)/stris -7 今日は
-
-.PHONY: stris_b
-stris_b: $(BIN)/stris
-	$(BIN)/stris   -b "$(printf ' \t\v\r\n')"
-	! $(BIN)/stris -b !1Aa
+.PHONY: str_isalpha
+str_isalpha: $(BIN)/str
+	$(BIN)/str   isalpha c
+	! $(BIN)/str isalpha 3