'std::string &' => 'std::string& ' (#1403)

The & on the type is the proper convention.

12 files changed, 65 insertions, 65 deletions

diff --git a/src/tools/asm2wasm.cpp b/src/tools/asm2wasm.cpp
index 3679a86e1..63367f0f7 100644
--- a/src/tools/asm2wasm.cpp
+++ b/src/tools/asm2wasm.cpp
@@ -48,43 +48,43 @@ int main(int argc, const char *argv[]) {
   options
       .add("--output", "-o", "Output file (stdout if not specified)",
            Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              o->extra["output"] = argument;
              Colors::disable();
            })
       .add("--mapped-globals", "-n", "Mapped globals", Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              std::cerr << "warning: the --mapped-globals/-m option is deprecated (a mapped globals file is no longer needed as we use wasm globals)" << std::endl;
            })
       .add("--mem-init", "-t", "Import a memory initialization file into the output module", Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              o->extra["mem init"] = argument;
            })
       .add("--mem-base", "-mb", "Set the location to write the memory initialization (--mem-init) file (GLOBAL_BASE in emscripten). If not provided, the memoryBase global import is used.", Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              o->extra["mem base"] = argument;
            })
       .add("--mem-max", "-mm", "Set the maximum size of memory in the wasm module (in bytes). -1 means no limit. Without this, TOTAL_MEMORY is used (as it is used for the initial value), or if memory growth is enabled, no limit is set. This overrides both of those.", Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              o->extra["mem max"] = argument;
            })
       .add("--total-memory", "-m", "Total memory size", Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              o->extra["total memory"] = argument;
            })
       .add("--table-max", "-tM", "Set the maximum size of the table. Without this, it is set depending on how many functions are in the module. -1 means no limit", Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              o->extra["table max"] = argument;
            })
       .add("--no-opts", "-n", "Disable optimization passes (deprecated)", Options::Arguments::Zero,
-           [](Options *o, const std::string &) {
+           [](Options *o, const std::string& ) {
              std::cerr << "--no-opts is deprecated (use -O0, etc.)\n";
            })
       .add("--trap-mode", "",
            "Strategy for handling potentially trapping instructions. Valid "
              "values are \"allow\", \"js\", and \"clamp\"",
            Options::Arguments::One,
-           [&trapMode](Options *o, const std::string &argument) {
+           [&trapMode](Options *o, const std::string& argument) {
              try {
                trapMode = trapModeFromString(argument);
              } catch (std::invalid_argument& e) {
@@ -93,33 +93,33 @@ int main(int argc, const char *argv[]) {
              }
            })
       .add("--wasm-only", "-w", "Input is in WebAssembly-only format, and not actually valid asm.js", Options::Arguments::Zero,
-           [&wasmOnly](Options *o, const std::string &) {
+           [&wasmOnly](Options *o, const std::string& ) {
              wasmOnly = true;
            })
       .add("--no-legalize-javascript-ffi", "-nj", "Do not legalize (i64->i32, f32->f64) the imports and exports for interfacing with JS", Options::Arguments::Zero,
-           [&legalizeJavaScriptFFI](Options *o, const std::string &) {
+           [&legalizeJavaScriptFFI](Options *o, const std::string& ) {
              legalizeJavaScriptFFI = false;
            })
       .add("--debuginfo", "-g", "Emit names section in wasm binary (or full debuginfo in wast)",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &arguments) { options.passOptions.debugInfo = true; })
+           [&](Options *o, const std::string& arguments) { options.passOptions.debugInfo = true; })
       .add("--source-map", "-sm", "Emit source map (if using binary output) to the specified file",
            Options::Arguments::One,
-           [&sourceMapFilename](Options *o, const std::string &argument) { sourceMapFilename = argument; })
+           [&sourceMapFilename](Options *o, const std::string& argument) { sourceMapFilename = argument; })
       .add("--source-map-url", "-su", "Use specified string as source map URL",
            Options::Arguments::One,
-           [&sourceMapUrl](Options *o, const std::string &argument) { sourceMapUrl = argument; })
+           [&sourceMapUrl](Options *o, const std::string& argument) { sourceMapUrl = argument; })
       .add("--symbolmap", "-s", "Emit a symbol map (indexes => names)",
            Options::Arguments::One,
-           [&](Options *o, const std::string &argument) { symbolMap = argument; })
+           [&](Options *o, const std::string& argument) { symbolMap = argument; })
       .add("--emit-text", "-S", "Emit text instead of binary for the output file",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &argument) { emitBinary = false; })
+           [&](Options *o, const std::string& argument) { emitBinary = false; })
       .add("--enable-threads", "-a", "Enable the Atomics wasm feature",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &argument) { options.passOptions.features |= Feature::Atomics; })
+           [&](Options *o, const std::string& argument) { options.passOptions.features |= Feature::Atomics; })
       .add_positional("INFILE", Options::Arguments::One,
-                      [](Options *o, const std::string &argument) {
+                      [](Options *o, const std::string& argument) {
                         o->extra["infile"] = argument;
                       });
   options.parse(argc, argv);
diff --git a/src/tools/optimization-options.h b/src/tools/optimization-options.h
index 265f072c7..14ce6aa04 100644
--- a/src/tools/optimization-options.h
+++ b/src/tools/optimization-options.h
@@ -29,7 +29,7 @@ struct OptimizationOptions : public Options {
   PassOptions passOptions;
   FeatureSet features = Feature::Atomics;
 
-  OptimizationOptions(const std::string &command, const std::string &description) : Options(command, description) {
+  OptimizationOptions(const std::string& command, const std::string& description) : Options(command, description) {
     (*this).add("", "-O", "execute default optimization passes",
                 Options::Arguments::Zero,
                 [this](Options*, const std::string&) {
diff --git a/src/tools/s2wasm.cpp b/src/tools/s2wasm.cpp
index f950b9d94..d4e7731c5 100644
--- a/src/tools/s2wasm.cpp
+++ b/src/tools/s2wasm.cpp
@@ -46,50 +46,50 @@ int main(int argc, const char *argv[]) {
   options
       .add("--output", "-o", "Output file (stdout if not specified)",
            Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              o->extra["output"] = argument;
              Colors::disable();
            })
       .add("--ignore-unknown", "", "Ignore unknown symbols",
            Options::Arguments::Zero,
-           [&ignoreUnknownSymbols](Options *, const std::string &) {
+           [&ignoreUnknownSymbols](Options *, const std::string& ) {
              ignoreUnknownSymbols = true;
            })
       .add("--start", "", "Generate the start method (default: main)",
            Options::Arguments::Optional,
-           [&startFunction](Options *, const std::string &argument) {
+           [&startFunction](Options *, const std::string& argument) {
              startFunction = argument.size() ? argument : "main";
            })
       .add("--global-base", "-g", "Where to start to place globals",
            Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              o->extra["global-base"] = argument;
            })
       .add("--allocate-stack", "-s", "Size of the user stack in linear memory",
            Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              o->extra["stack-allocation"] = argument;
            })
       .add("--initial-memory", "-i", "Initial size of the linear memory",
            Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              o->extra["initial-memory"] = argument;
            })
       .add("--max-memory", "-m", "Maximum size of the linear memory",
            Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              o->extra["max-memory"] = argument;
            })
       .add("--allow-memory-growth", "", "Allow linear memory to grow at runtime",
            Options::Arguments::Zero,
-           [&allowMemoryGrowth](Options *, const std::string &) {
+           [&allowMemoryGrowth](Options *, const std::string& ) {
              allowMemoryGrowth = true;
            })
       .add("--trap-mode", "",
            "Strategy for handling potentially trapping instructions. Valid "
              "values are \"allow\", \"js\", and \"clamp\"",
            Options::Arguments::One,
-           [&trapMode](Options *o, const std::string &argument) {
+           [&trapMode](Options *o, const std::string& argument) {
              try {
                trapMode = trapModeFromString(argument);
              } catch (std::invalid_argument& e) {
@@ -99,22 +99,22 @@ int main(int argc, const char *argv[]) {
            })
       .add("--emscripten-glue", "-e", "Generate emscripten glue",
            Options::Arguments::Zero,
-           [&generateEmscriptenGlue](Options *, const std::string &) {
+           [&generateEmscriptenGlue](Options *, const std::string& ) {
              generateEmscriptenGlue = true;
            })
       .add("--import-memory", "", "Import the linear memory instead of exporting it",
            Options::Arguments::Zero,
-           [&importMemory](Options *, const std::string &) {
+           [&importMemory](Options *, const std::string& ) {
              importMemory = true;
            })
       .add("--library", "-l", "Add archive library",
            Options::Arguments::N,
-           [&archiveLibraries](Options *o, const std::string &argument) {
+           [&archiveLibraries](Options *o, const std::string& argument) {
              archiveLibraries.push_back(argument);
            })
       .add("--validate", "-v", "Control validation of the output module",
            Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              if (argument != "web" && argument != "none" && argument != "wasm") {
                std::cerr << "Valid arguments for --validate flag are 'wasm', 'web' and 'none'.\n";
                exit(1);
@@ -122,7 +122,7 @@ int main(int argc, const char *argv[]) {
              o->extra["validate"] = argument;
            })
       .add_positional("INFILE", Options::Arguments::One,
-                      [](Options *o, const std::string &argument) {
+                      [](Options *o, const std::string& argument) {
                         o->extra["infile"] = argument;
                       });
   options.parse(argc, argv);
diff --git a/src/tools/wasm-as.cpp b/src/tools/wasm-as.cpp
index 0e053e05a..b01bae0e3 100644
--- a/src/tools/wasm-as.cpp
+++ b/src/tools/wasm-as.cpp
@@ -39,13 +39,13 @@ int main(int argc, const char *argv[]) {
   options
       .add("--output", "-o", "Output file (stdout if not specified)",
            Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              o->extra["output"] = argument;
              Colors::disable();
            })
       .add("--validate", "-v", "Control validation of the output module",
            Options::Arguments::One,
-           [](Options *o, const std::string &argument) {
+           [](Options *o, const std::string& argument) {
              if (argument != "web" && argument != "none" && argument != "wasm") {
                std::cerr << "Valid arguments for --validate flag are 'wasm', 'web', and 'none'.\n";
                exit(1);
@@ -54,18 +54,18 @@ int main(int argc, const char *argv[]) {
            })
       .add("--debuginfo", "-g", "Emit names section and debug info",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &arguments) { debugInfo = true; })
+           [&](Options *o, const std::string& arguments) { debugInfo = true; })
       .add("--source-map", "-sm", "Emit source map to the specified file",
            Options::Arguments::One,
-           [&sourceMapFilename](Options *o, const std::string &argument) { sourceMapFilename = argument; })
+           [&sourceMapFilename](Options *o, const std::string& argument) { sourceMapFilename = argument; })
       .add("--source-map-url", "-su", "Use specified string as source map URL",
            Options::Arguments::One,
-           [&sourceMapUrl](Options *o, const std::string &argument) { sourceMapUrl = argument; })
+           [&sourceMapUrl](Options *o, const std::string& argument) { sourceMapUrl = argument; })
       .add("--symbolmap", "-s", "Emit a symbol map (indexes => names)",
            Options::Arguments::One,
-           [&](Options *o, const std::string &argument) { symbolMap = argument; })
+           [&](Options *o, const std::string& argument) { symbolMap = argument; })
       .add_positional("INFILE", Options::Arguments::One,
-                      [](Options *o, const std::string &argument) {
+                      [](Options *o, const std::string& argument) {
                         o->extra["infile"] = argument;
                       });
   options.parse(argc, argv);
diff --git a/src/tools/wasm-ctor-eval.cpp b/src/tools/wasm-ctor-eval.cpp
index da7c2042a..b71a0356a 100644
--- a/src/tools/wasm-ctor-eval.cpp
+++ b/src/tools/wasm-ctor-eval.cpp
@@ -377,10 +377,10 @@ int main(int argc, const char* argv[]) {
            })
       .add("--emit-text", "-S", "Emit text instead of binary for the output file",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &argument) { emitBinary = false; })
+           [&](Options *o, const std::string& argument) { emitBinary = false; })
       .add("--debuginfo", "-g", "Emit names section and debug info",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &arguments) { debugInfo = true; })
+           [&](Options *o, const std::string& arguments) { debugInfo = true; })
       .add("--ctors", "-c", "Comma-separated list of global constructor functions to evaluate",
            Options::Arguments::One,
            [&](Options* o, const std::string& argument) {
diff --git a/src/tools/wasm-dis.cpp b/src/tools/wasm-dis.cpp
index e6fd7badd..d874b24aa 100644
--- a/src/tools/wasm-dis.cpp
+++ b/src/tools/wasm-dis.cpp
@@ -32,15 +32,15 @@ int main(int argc, const char *argv[]) {
   Options options("wasm-dis", "Un-assemble a .wasm (WebAssembly binary format) into a .wast (WebAssembly text format)");
   options.add("--output", "-o", "Output file (stdout if not specified)",
               Options::Arguments::One,
-              [](Options *o, const std::string &argument) {
+              [](Options *o, const std::string& argument) {
                 o->extra["output"] = argument;
                 Colors::disable();
               })
       .add("--source-map", "-sm", "Consume source map from the specified file to add location information",
            Options::Arguments::One,
-           [&sourceMapFilename](Options *o, const std::string &argument) { sourceMapFilename = argument; })
+           [&sourceMapFilename](Options *o, const std::string& argument) { sourceMapFilename = argument; })
       .add_positional("INFILE", Options::Arguments::One,
-                      [](Options *o, const std::string &argument) {
+                      [](Options *o, const std::string& argument) {
                         o->extra["infile"] = argument;
                       });
   options.parse(argc, argv);
diff --git a/src/tools/wasm-emscripten-finalize.cpp b/src/tools/wasm-emscripten-finalize.cpp
index 87505748c..223fa3082 100644
--- a/src/tools/wasm-emscripten-finalize.cpp
+++ b/src/tools/wasm-emscripten-finalize.cpp
@@ -45,17 +45,17 @@ int main(int argc, const char *argv[]) {
   options
       .add("--output", "-o", "Output file",
            Options::Arguments::One,
-           [&outfile](Options*, const std::string &argument) {
+           [&outfile](Options*, const std::string& argument) {
              outfile = argument;
              Colors::disable();
            })
       .add("--emit-text", "-S", "Emit text instead of binary for the output file",
            Options::Arguments::Zero,
-           [&emitBinary](Options*, const std::string &) {
+           [&emitBinary](Options*, const std::string& ) {
              emitBinary = false;
            })
       .add_positional("INFILE", Options::Arguments::One,
-                      [&infile](Options *o, const std::string &argument) {
+                      [&infile](Options *o, const std::string& argument) {
                         infile = argument;
                       });
   options.parse(argc, argv);
diff --git a/src/tools/wasm-link-metadata.cpp b/src/tools/wasm-link-metadata.cpp
index 1ca64880f..96e06f95b 100644
--- a/src/tools/wasm-link-metadata.cpp
+++ b/src/tools/wasm-link-metadata.cpp
@@ -72,12 +72,12 @@ int main(int argc, const char *argv[]) {
   options
       .add("--output", "-o", "Output file",
            Options::Arguments::One,
-           [&outfile](Options *o, const std::string &argument) {
+           [&outfile](Options *o, const std::string& argument) {
              outfile = argument;
              Colors::disable();
            })
       .add_positional("INFILE", Options::Arguments::One,
-                      [&infile](Options *o, const std::string &argument) {
+                      [&infile](Options *o, const std::string& argument) {
                         infile = argument;
                       });
   options.parse(argc, argv);
diff --git a/src/tools/wasm-merge.cpp b/src/tools/wasm-merge.cpp
index 7fa5af137..6c7bd46af 100644
--- a/src/tools/wasm-merge.cpp
+++ b/src/tools/wasm-merge.cpp
@@ -567,7 +567,7 @@ int main(int argc, const char* argv[]) {
            })
       .add("--emit-text", "-S", "Emit text instead of binary for the output file",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &argument) { emitBinary = false; })
+           [&](Options *o, const std::string& argument) { emitBinary = false; })
       .add("--finalize-memory-base", "-fmb", "Finalize the env.memoryBase import",
            Options::Arguments::One,
            [&](Options* o, const std::string& argument) {
@@ -589,7 +589,7 @@ int main(int argc, const char* argv[]) {
              verbose = true;
            })
       .add_positional("INFILES", Options::Arguments::N,
-                      [&](Options *o, const std::string &argument) {
+                      [&](Options *o, const std::string& argument) {
                         filenames.push_back(argument);
                       });
   options.parse(argc, argv);
diff --git a/src/tools/wasm-metadce.cpp b/src/tools/wasm-metadce.cpp
index c5d12775d..4f90ee612 100644
--- a/src/tools/wasm-metadce.cpp
+++ b/src/tools/wasm-metadce.cpp
@@ -411,10 +411,10 @@ int main(int argc, const char* argv[]) {
            })
       .add("--emit-text", "-S", "Emit text instead of binary for the output file",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &argument) { emitBinary = false; })
+           [&](Options *o, const std::string& argument) { emitBinary = false; })
       .add("--debuginfo", "-g", "Emit names section and debug info",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &arguments) { debugInfo = true; })
+           [&](Options *o, const std::string& arguments) { debugInfo = true; })
       .add("--graph-file", "-f", "Filename of the graph description file",
            Options::Arguments::One,
            [&](Options* o, const std::string& argument) {
@@ -422,7 +422,7 @@ int main(int argc, const char* argv[]) {
            })
       .add("--dump", "-d", "Dump the combined graph file (useful for debugging)",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &arguments) { dump = true; })
+           [&](Options *o, const std::string& arguments) { dump = true; })
       .add_positional("INFILE", Options::Arguments::One,
                       [](Options* o, const std::string& argument) {
                         o->extra["infile"] = argument;
diff --git a/src/tools/wasm-opt.cpp b/src/tools/wasm-opt.cpp
index 374c1b5bd..d2189e616 100644
--- a/src/tools/wasm-opt.cpp
+++ b/src/tools/wasm-opt.cpp
@@ -82,31 +82,31 @@ int main(int argc, const char* argv[]) {
            })
       .add("--emit-text", "-S", "Emit text instead of binary for the output file",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &argument) { emitBinary = false; })
+           [&](Options *o, const std::string& argument) { emitBinary = false; })
       .add("--debuginfo", "-g", "Emit names section and debug info",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &arguments) { debugInfo = true; })
+           [&](Options *o, const std::string& arguments) { debugInfo = true; })
       .add("--fuzz-exec", "-fe", "Execute functions before and after optimization, helping fuzzing find bugs",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &arguments) { fuzzExec = true; })
+           [&](Options *o, const std::string& arguments) { fuzzExec = true; })
       .add("--fuzz-binary", "-fb", "Convert to binary and back after optimizations and before fuzz-exec, helping fuzzing find binary format bugs",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &arguments) { fuzzBinary = true; })
+           [&](Options *o, const std::string& arguments) { fuzzBinary = true; })
       .add("--extra-fuzz-command", "-efc", "An extra command to run on the output before and after optimizing. The output is compared between the two, and an error occurs if they are not equal",
            Options::Arguments::One,
-           [&](Options *o, const std::string &arguments) { extraFuzzCommand = arguments; })
+           [&](Options *o, const std::string& arguments) { extraFuzzCommand = arguments; })
       .add("--translate-to-fuzz", "-ttf", "Translate the input into a valid wasm module *somehow*, useful for fuzzing",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &arguments) { translateToFuzz = true; })
+           [&](Options *o, const std::string& arguments) { translateToFuzz = true; })
       .add("--fuzz-passes", "-fp", "Pick a random set of passes to run, useful for fuzzing. this depends on translate-to-fuzz (it picks the passes from the input)",
            Options::Arguments::Zero,
-           [&](Options *o, const std::string &arguments) { fuzzPasses = true; })
+           [&](Options *o, const std::string& arguments) { fuzzPasses = true; })
       .add("--emit-js-wrapper", "-ejw", "Emit a JavaScript wrapper file that can run the wasm with some test values, useful for fuzzing",
            Options::Arguments::One,
-           [&](Options *o, const std::string &arguments) { emitJSWrapper = arguments; })
+           [&](Options *o, const std::string& arguments) { emitJSWrapper = arguments; })
       .add("--emit-spec-wrapper", "-esw", "Emit a wasm spec interpreter wrapper file that can run the wasm with some test values, useful for fuzzing",
            Options::Arguments::One,
-           [&](Options *o, const std::string &arguments) { emitSpecWrapper = arguments; })
+           [&](Options *o, const std::string& arguments) { emitSpecWrapper = arguments; })
       .add_positional("INFILE", Options::Arguments::One,
                       [](Options* o, const std::string& argument) {
                         o->extra["infile"] = argument;
diff --git a/src/tools/wasm2asm.cpp b/src/tools/wasm2asm.cpp
index 4198c8784..cc53dc834 100644
--- a/src/tools/wasm2asm.cpp
+++ b/src/tools/wasm2asm.cpp
@@ -48,7 +48,7 @@ int main(int argc, const char *argv[]) {
              builderFlags.pedantic = true;
            })
       .add_positional("INFILE", Options::Arguments::One,
-                      [](Options *o, const std::string &argument) {
+                      [](Options *o, const std::string& argument) {
                         o->extra["infile"] = argument;
                       });
   options.parse(argc, argv);