moving (chibi strings) to (chibi string) in conjunction with R7RS vote to prefer singular form of module names

lib/chibi/process.sld

@@ -16,7 +16,7 @@
           signal/tty-output wait/no-hang
           call-with-process-io
           process->string process->string-list process->output+error)
-  (import (scheme) (chibi io) (chibi strings) (chibi filesystem))
+  (import (scheme) (chibi io) (chibi string) (chibi filesystem))
   (cond-expand (threads (import (srfi 18))) (else #f))
   (include-shared "process")
   (include "process.scm"))

lib/chibi/repl.sld

@@ -2,7 +2,7 @@
 (define-library (chibi repl)
   (export repl)
   (import (scheme) (only (meta) load-module)
-          (chibi ast) (chibi strings) (chibi io)
+          (chibi ast) (chibi string) (chibi io)
           (chibi process) (chibi term edit-line)
           (srfi 1) (srfi 18) (srfi 38) (srfi 95) (srfi 98))
   (include "repl.scm"))

lib/chibi/string.sld

@@ -1,5 +1,5 @@
 
-(define-library (chibi strings)
+(define-library (chibi string)
   (export
    string-cursor-start string-cursor-end string-cursor-ref
    string-cursor<? string-cursor<=? string-cursor>? string-cursor>=?
@@ -12,4 +12,4 @@
    string-fold string-fold-right string-map string-for-each
    string-contains make-string-searcher)
   (import (scheme) (chibi ast) (chibi char-set base))
-  (include "strings.scm"))
+  (include "string.scm"))

lib/scheme/base.sld

@@ -2,7 +2,7 @@
 (define-library (scheme base)
   (import (except (scheme) equal?)
           (rename (chibi equiv) (equiv? equal?))
-          (only (chibi strings) string-map string-for-each)
+          (only (chibi string) string-map string-for-each)
           (chibi io)
           (rename (only (chibi ast)
                         exception? exception-message exception-irritants)

tests/string-tests.scm

@@ -1,7 +1,7 @@
 
 (cond-expand
  (modules (import (only (chibi test) test-begin test test-end)
-                  (chibi strings)))
+                  (chibi string)))
  (else #f))
 
 (test-begin "strings")

tools/extract-case-offsets.scm

@@ -15,7 +15,7 @@
 ;;                        "char-downcase-offsets"
 ;;   -o <output-file>   - the output file, defaults to stdout
 
-(import (scheme) (srfi 1) (srfi 69) (srfi 95) (chibi io) (chibi strings)
+(import (scheme) (srfi 1) (srfi 69) (srfi 95) (chibi io) (chibi string)
         (chibi iset) (chibi iset optimize))
 
 (define (warn . args)

tools/extract-unicode-props.scm

@@ -28,7 +28,7 @@
 ;; in the data/ current directory, unless overridden with the --data or
 ;; --derived options.
 
-(import (scheme) (chibi io) (chibi strings))
+(import (scheme) (chibi io) (chibi string))
 
 (define (warn . args)
   (let ((err (current-error-port)))

tools/optimize-char-sets.scm

@@ -9,7 +9,7 @@
 ;; char-sets to stdout.
 
 (import (scheme) (srfi 1) (srfi 69)
-        (chibi io) (chibi strings) (chibi modules)
+        (chibi io) (chibi string) (chibi modules)
         (chibi char-set) (chibi iset) (chibi iset optimize)
         (only (meta) load-module))