[Rust] Tidy up and fix resource leak.

Author: mjpt777

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/LibRsDef.java

@@ -19,8 +19,10 @@
 import java.io.Writer;
 import java.nio.ByteOrder;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
+import java.util.stream.Stream;
 
 import static java.nio.ByteOrder.LITTLE_ENDIAN;
 import static uk.co.real_logic.sbe.generation.rust.RustGenerator.*;
@@ -58,13 +60,16 @@ void generate() throws IOException
  indent(libRs, 0, "use ::core::{convert::TryInto};\n\n");
 
  final ArrayList<String> modules = new ArrayList<>();
- Files.walk(outputManager.getSrcDirPath())
- .filter(Files::isRegularFile)
- .map((path) -> path.getFileName().toString())
- .filter((fileName) -> fileName.endsWith(".rs"))
- .filter((fileName) -> !fileName.equals("lib.rs"))
- .map((fileName) -> fileName.substring(0, fileName.length() - 3))
- .forEach(modules::add);
+ try (Stream<Path> walk = Files.walk(outputManager.getSrcDirPath()))
+ {
+ walk
+ .filter(Files::isRegularFile)
+ .map((path) -> path.getFileName().toString())
+ .filter((fileName) -> fileName.endsWith(".rs"))
+ .filter((fileName) -> !fileName.equals("lib.rs"))
+ .map((fileName) -> fileName.substring(0, fileName.length() - 3))
+ .forEach(modules::add);
+ }
 
  // add modules
  for (final String mod : modules)

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/RustGenerator.java

@@ -27,6 +27,7 @@
 import uk.co.real_logic.sbe.ir.Token;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -208,32 +209,34 @@ static void generateEncoderFields(
  final List<Token> tokens,
  final int level)
  {
- Generators.forEachField(tokens, (fieldToken, typeToken) ->
- {
- try
+ Generators.forEachField(
+  tokens,
+ (fieldToken, typeToken) ->
  {
- final String name = fieldToken.name();
- switch (typeToken.signal())
+ try
  {
- case ENCODING:
- generatePrimitiveEncoder(sb, level, typeToken, name);
- break;
- case BEGIN_ENUM:
- generateEnumEncoder(sb, level, fieldToken, typeToken, name);
- break;
- case BEGIN_SET:
- generateBitSetEncoder(sb, level, typeToken, name);
- break;
- case BEGIN_COMPOSITE:
- generateCompositeEncoder(sb, level, typeToken, name);
- break;
+ final String name = fieldToken.name();
+ switch (typeToken.signal())
+ {
+ case ENCODING:
+ generatePrimitiveEncoder(sb, level, typeToken, name);
+ break;
+ case BEGIN_ENUM:
+ generateEnumEncoder(sb, level, fieldToken, typeToken, name);
+ break;
+ case BEGIN_SET:
+ generateBitSetEncoder(sb, level, typeToken, name);
+ break;
+ case BEGIN_COMPOSITE:
+ generateCompositeEncoder(sb, level, typeToken, name);
+ break;
+ }
  }
- }
- catch (final IOException ex)
- {
- throw new RuntimeException(ex);
- }
- });
+ catch (final IOException ex)
+ {
+ throw new UncheckedIOException(ex);
+ }
+ });
  }
 
  static void generateEncoderGroups(
@@ -489,36 +492,38 @@ static void generateDecoderFields(
  final List<Token> tokens,
  final int level)
  {
- Generators.forEachField(tokens, (fieldToken, typeToken) ->
- {
- try
+ Generators.forEachField(
+  tokens,
+ (fieldToken, typeToken) ->
  {
- final String name = fieldToken.name();
- final Encoding encoding = typeToken.encoding();
-
- switch (typeToken.signal())
+ try
  {
- case ENCODING:
- generatePrimitiveDecoder(sb, level, fieldToken, typeToken, name, encoding);
- break;
- case BEGIN_ENUM:
- generateEnumDecoder(sb, level, fieldToken, typeToken, name);
- break;
- case BEGIN_SET:
- generateBitSetDecoder(sb, level, typeToken, name);
- break;
- case BEGIN_COMPOSITE:
- generateCompositeDecoder(sb, level, fieldToken, typeToken, name);
- break;
- default:
- throw new UnsupportedOperationException("Unable to handle: " + typeToken);
+ final String name = fieldToken.name();
+ final Encoding encoding = typeToken.encoding();
+
+ switch (typeToken.signal())
+ {
+ case ENCODING:
+ generatePrimitiveDecoder(sb, level, fieldToken, typeToken, name, encoding);
+ break;
+ case BEGIN_ENUM:
+ generateEnumDecoder(sb, level, fieldToken, typeToken, name);
+ break;
+ case BEGIN_SET:
+ generateBitSetDecoder(sb, level, typeToken, name);
+ break;
+ case BEGIN_COMPOSITE:
+ generateCompositeDecoder(sb, level, fieldToken, typeToken, name);
+ break;
+ default:
+ throw new UnsupportedOperationException("Unable to handle: " + typeToken);
+ }
  }
- }
- catch (final IOException e)
- {
- throw new RuntimeException(e);
- }
- });
+ catch (final IOException ex)
+ {
+ throw new UncheckedIOException(ex);
+ }
+ });
  }
 
  private static void generateCompositeDecoder(

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/RustOutputManager.java

@@ -86,7 +86,7 @@ public Writer createOutput(final String name) throws IOException
  }
 
  /**
- * Creates a new Cargo.toml file
+ * Creates a new Cargo.toml file.
  * <p>
  * @return a {@link java.io.Writer} to which the crate definition should be written.
  * @throws IOException if an issue occurs when creating the file.

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/RustUtil.java

@@ -157,6 +157,7 @@ static String cleanUpperAcronyms(final String value)
  final int index = i - 1;
  return value.substring(0, index).toLowerCase() + value.substring(index);
  }
+
  return value;
  }
  }

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/SubGroup.java

@@ -45,6 +45,7 @@ public SubGroup addSubGroup(final String name, final int level, final Token grou
  {
  final SubGroup subGroup = new SubGroup(name, level, groupToken);
  subGroups.add(subGroup);
+
  return subGroup;
  }