BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-30 21:00:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

* run clang format
This commit is contained in:
mqy
2020-12-18 05:15:27 +08:00
committed by GitHub
parent f2511d7d49
commit 05192553f4
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/flatc.cpp
View File

@@ -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" " --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" " --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" " --es6-js-export Uses ECMAScript 6 export style lines in JS.\n"
" --go-namespace Generate the overrided namespace in Golang.\n" " --go-namespace Generate the overriding namespace in Golang.\n"
" --go-import Generate the overrided import for flatbuffers in Golang\n" " --go-import Generate the overriding import for flatbuffers in Golang\n"
" (default is \"github.com/google/flatbuffers/go\").\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" " This may crash flatc given a mismatched schema.\n"
" --size-prefixed Input binaries are size prefixed buffers.\n" " --size-prefixed Input binaries are size prefixed buffers.\n"
" --proto Input is a .proto, translate to .fbs.\n" " --proto Input is a .proto, translate to .fbs.\n"

5
src/idl_gen_rust.cpp
View File

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

2
src/idl_parser.cpp
View File

@@ -92,7 +92,7 @@ static bool IsLowerSnakeCase(const std::string &str) {
return true; 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. // Also uppercases the first character if first is true.
std::string MakeCamel(const std::string &in, bool first) { std::string MakeCamel(const std::string &in, bool first) {
std::string s; std::string s;