From 7ce24c3f7344fcb2f6e8fb3ca04c162b3f4f5f35 Mon Sep 17 00:00:00 2001 From: Grzegorz Gierlach Date: Fri, 31 May 2024 13:31:10 +0200 Subject: [PATCH] [Rust] Generate imports in alphabetical order. --- .../java/uk/co/real_logic/sbe/generation/rust/LibRsDef.java | 1 + .../uk/co/real_logic/sbe/generation/rust/RustGenerator.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/LibRsDef.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/LibRsDef.java index 109d3ba4c5..ad8a62c23e 100644 --- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/LibRsDef.java +++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/LibRsDef.java @@ -73,6 +73,7 @@ void generate() throws IOException .filter((fileName) -> fileName.endsWith(".rs")) .filter((fileName) -> !fileName.equals("lib.rs")) .map((fileName) -> fileName.substring(0, fileName.length() - 3)) + .sorted() .forEach(modules::add); } diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/RustGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/RustGenerator.java index 1b53987098..734b57d2bc 100644 --- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/RustGenerator.java +++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/RustGenerator.java @@ -152,8 +152,8 @@ public void generate() throws IOException try (Writer out = outputManager.createOutput(codecModName)) { indent(out, 0, "use crate::*;\n\n"); - indent(out, 0, "pub use encoder::%sEncoder;\n", formatStructName(msgToken.name())); - indent(out, 0, "pub use decoder::%sDecoder;\n\n", formatStructName(msgToken.name())); + indent(out, 0, "pub use decoder::%sDecoder;\n", formatStructName(msgToken.name())); + indent(out, 0, "pub use encoder::%sEncoder;\n\n", formatStructName(msgToken.name())); final String blockLengthType = blockLengthType(); final String templateIdType = rustTypeName(ir.headerStructure().templateIdType()); final String schemaIdType = rustTypeName(ir.headerStructure().schemaIdType());