Fix typos in usage/comments; Make rust generator respect to --filenam… (#6342)

* Fix typos in usage/comments; Make rust generator respect to --filename-suffix

* run clang format

diff --git a/src/flatc.cpp b/src/flatc.cpp
index 09acb07..d51120f 100644 (file)
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -132,10 +132,10 @@ std::string FlatCompiler::GetUsageString(const char *program_name) const {
     "  --no-js-exports        Removes Node.js style export lines in JS.\n"
     "  --goog-js-export       Uses goog.exports* for closure compiler exporting in JS.\n"
     "  --es6-js-export        Uses ECMAScript 6 export style lines in JS.\n"
-    "  --go-namespace         Generate the overrided namespace in Golang.\n"
-    "  --go-import            Generate the overrided import for flatbuffers in Golang\n"
+    "  --go-namespace         Generate the overriding namespace in Golang.\n"
+    "  --go-import            Generate the overriding import for flatbuffers in Golang\n"
     "                         (default is \"github.com/google/flatbuffers/go\").\n"
-    "  --raw-binary           Allow binaries without file_indentifier to be read.\n"
+    "  --raw-binary           Allow binaries without file_identifier to be read.\n"
     "                         This may crash flatc given a mismatched schema.\n"
     "  --size-prefixed        Input binaries are size prefixed buffers.\n"
     "  --proto                Input is a .proto, translate to .fbs.\n"

diff --git a/src/idl_gen_rust.cpp b/src/idl_gen_rust.cpp
index 3c17b5c..04c779d 100644 (file)
--- a/src/idl_gen_rust.cpp
+++ b/src/idl_gen_rust.cpp
@@ -24,7 +24,7 @@
 namespace flatbuffers {
 
 // Convert a camelCaseIdentifier or CamelCaseIdentifier to a
-// snake_case_indentifier.
+// snake_case_identifier.
 std::string MakeSnakeCase(const std::string &in) {
   std::string s;
   for (size_t i = 0; i < in.length(); i++) {
@@ -1907,7 +1907,8 @@ class RustGenerator : public BaseGenerator {
         auto noext = flatbuffers::StripExtension(it->second);
         auto basename = flatbuffers::StripPath(noext);
 
-        code_ += indent + "use crate::" + basename + "_generated::*;";
+        code_ += indent + "use crate::" + basename +
+                 parser_.opts.filename_suffix + "::*;";
       }
     }
 

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index a32c93c..015a711 100644 (file)
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -92,7 +92,7 @@ static bool IsLowerSnakeCase(const std::string &str) {
   return true;
 }
 
-// Convert an underscore_based_indentifier in to camelCase.
+// Convert an underscore_based_identifier in to camelCase.
 // Also uppercases the first character if first is true.
 std::string MakeCamel(const std::string &in, bool first) {
   std::string s;