Skip to content

Commit a29ea3e

Browse files
mwardMichael Ward
mward
and
Michael Ward
authored
[Rust] updated code generator to prevent rust warning for "ambiguous glob re-exports" (aeron-io#982)
Co-authored-by: Michael Ward <mward@drw.com>
1 parent 7800371 commit a29ea3e

File tree

10 files changed

+74
-34
lines changed

10 files changed

+74
-34
lines changed

‎rust/benches/car_benchmark.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use car_codec::encoder::*;
12
use criterion::{black_box, criterion_group, criterion_main, Criterion};
23
use examples_uk_co_real_logic_sbe_benchmarks::*;
3-
use car_codec::encoder::*;
44

55
const MANUFACTURER: &[u8] = b"MANUFACTURER";
66
const MODEL: &[u8] = b"MODEL";

‎rust/tests/baseline_test.rs‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1-
use std::fs::File;
2-
use std::io::prelude::*;
3-
4-
use examples_baseline::*;
5-
use car_codec::encoder::*;
1+
use examples_baseline::{
2+
boolean_type::BooleanType,
3+
boost_type::BoostType,
4+
car_codec::{
5+
encoder::{AccelerationEncoder, FuelFiguresEncoder, PerformanceFiguresEncoder},
6+
*,
7+
},
8+
message_header_codec,
9+
message_header_codec::MessageHeaderDecoder,
10+
model::Model,
11+
optional_extras::OptionalExtras,
12+
Encoder, ReadBuf, SbeResult, WriteBuf,
13+
};
14+
use std::{fs::File, io::prelude::*};
615

716
fn read_sbe_file_generated_from_java_example() -> std::io::Result<Vec<u8>> {
817
// Generated by the generateCarExampleDataFile gradle task.

‎rust/tests/big_endian_test.rs‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1-
use baseline_bigendian::*;
2-
use car_codec::encoder::*;
1+
use baseline_bigendian::{
2+
boolean_type::BooleanType,
3+
boost_type::BoostType,
4+
car_codec::{
5+
encoder::{AccelerationEncoder, FuelFiguresEncoder, PerformanceFiguresEncoder},
6+
*,
7+
},
8+
message_header_codec,
9+
message_header_codec::MessageHeaderDecoder,
10+
model::Model,
11+
optional_extras::OptionalExtras,
12+
Encoder, ReadBuf, SbeResult, WriteBuf,
13+
};
314

415
#[test]
516
fn big_endian_baseline_example() -> SbeResult<()> {

‎rust/tests/extension_test.rs‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1-
use std::fs::File;
2-
use std::io::prelude::*;
3-
4-
use examples_extension::*;
5-
use car_codec::encoder::*;
1+
use examples_extension::{
2+
boolean_type::BooleanType,
3+
boost_type::BoostType,
4+
car_codec::{
5+
encoder::{AccelerationEncoder, FuelFiguresEncoder, PerformanceFiguresEncoder},
6+
*,
7+
},
8+
message_header_codec,
9+
message_header_codec::MessageHeaderDecoder,
10+
model::Model,
11+
optional_extras::OptionalExtras,
12+
Encoder, ReadBuf, SbeResult, WriteBuf,
13+
};
14+
use std::{fs::File, io::prelude::*};
615

716
fn read_sbe_file_generated_from_java_example() -> std::io::Result<Vec<u8>> {
817
// Generated by the generateCarExampleDataFile gradle task.

‎rust/tests/issue_435_test.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
use ::issue_435::*;
2+
use issue_435::{
3+
enum_ref::EnumRef, issue_435_codec::*, message_header_codec::MessageHeaderDecoder,
4+
set_ref::SetRef,
5+
};
26

37
fn create_encoder(buffer: &mut Vec<u8>) -> Issue435Encoder {
48
let issue_435 = Issue435Encoder::default().wrap(

‎rust/tests/issue_895_test.rs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
use issue_895::{
2-
issue_895_codec::{decoder::Issue895Decoder, encoder::Issue895Encoder},
3-
MessageHeaderDecoder, ReadBuf, SbeResult, WriteBuf, ENCODED_LENGTH, SBE_BLOCK_LENGTH,
4-
SBE_SCHEMA_ID, SBE_SCHEMA_VERSION, SBE_TEMPLATE_ID,
5-
};
1+
use issue_895::{issue_895_codec::*, message_header_codec::*, *};
62

73
fn create_encoder(buffer: &mut Vec<u8>) -> Issue895Encoder {
84
let issue_895 =

‎rust/tests/issue_972_test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use issue_972::*;
1+
use issue_972::{issue_972_codec::*, message_header_codec::MessageHeaderDecoder, *};
22

33
fn create_encoder(buffer: &mut Vec<u8>) -> Issue972Encoder {
44
let issue_972 = Issue972Encoder::default().wrap(

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ void generate() throws IOException
7878
}
7979
indent(libRs, 0, "\n");
8080

81-
// add re-export of modules
82-
for (final String module : modules)
83-
{
84-
indent(libRs, 0, "pub use crate::%s::*;\n", toLowerSnakeCase(module));
85-
}
86-
indent(libRs, 0, "\n");
87-
8881
generateSbeErrorEnum(libRs);
8982
generateEitherEnum(libRs);
9083

@@ -163,6 +156,7 @@ static void generateReadBuf(final Appendable writer, final ByteOrder byteOrder)
163156
indent(writer, 0, "}\n");
164157

165158
// impl ReadBuf ...
159+
indent(writer, 0, "#[allow(dead_code)]\n");
166160
indent(writer, 0, "impl<%s> %s<%s> {\n", BUF_LIFETIME, READ_BUF_TYPE, BUF_LIFETIME);
167161
indent(writer, 1, "#[inline]\n");
168162
indent(writer, 1, "pub fn new(data: &%s [u8]) -> Self {\n", BUF_LIFETIME);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ void generate(
6363
final List<Token> varData) throws IOException
6464
{
6565
indent(sb, 0, "pub mod %s {\n", codecType.toString().toLowerCase());
66-
indent(sb, 1, "use super::*;\n\n");
66+
indent(sb, 1, "use super::*;\n");
67+
indent(sb, 1, "use message_header_codec::*;\n\n");
6768

6869
// i.e. <name>Decoder or <name>Encoder
6970
final String msgTypeName = formatStructName(msgToken.name()) + codecType.name();

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

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,9 @@ private static void generateEnumEncoder(
449449
final String name) throws IOException
450450
{
451451
final String referencedName = typeToken.referencedName();
452-
final String enumType = formatStructName(referencedName == null ? typeToken.name() : referencedName);
452+
final String enumType = format("%s::%s",
453+
toLowerSnakeCase(referencedName == null ? typeToken.name() : referencedName),
454+
formatStructName(referencedName == null ? typeToken.name() : referencedName));
453455

454456
if (fieldToken.isConstantEncoding())
455457
{
@@ -479,7 +481,10 @@ private static void generateBitSetEncoder(
479481
{
480482
final Encoding encoding = bitsetToken.encoding();
481483
final String rustPrimitiveType = rustTypeName(encoding.primitiveType());
482-
final String structTypeName = formatStructName(bitsetToken.applicableTypeName());
484+
final String referencedName = bitsetToken.referencedName();
485+
final String structTypeName = format("%s::%s",
486+
toLowerSnakeCase(referencedName == null ? bitsetToken.name() : referencedName),
487+
formatStructName(bitsetToken.applicableTypeName()));
483488
indent(sb, level, "#[inline]\n");
484489
indent(sb, level, "pub fn %s(&mut self, value: %s) {\n", formatFunctionName(name), structTypeName);
485490

@@ -496,7 +501,9 @@ private static void generateCompositeEncoder(
496501
final String name) throws IOException
497502
{
498503
final String encoderName = toLowerSnakeCase(encoderName(name));
499-
final String encoderTypeName = encoderName(formatStructName(typeToken.applicableTypeName()));
504+
final String encoderTypeName = format("%s::%s",
505+
codecModName(typeToken.referencedName() == null ? typeToken.name() : typeToken.referencedName()),
506+
encoderName(formatStructName(typeToken.applicableTypeName())));
500507
indent(sb, level, "/// COMPOSITE ENCODER\n");
501508
indent(sb, level, "#[inline]\n");
502509
indent(sb, level, "pub fn %s(self) -> %2$s<Self> {\n",
@@ -556,7 +563,10 @@ private static void generateCompositeDecoder(
556563
final String name) throws IOException
557564
{
558565
final String decoderName = toLowerSnakeCase(decoderName(name));
559-
final String decoderTypeName = decoderName(formatStructName(typeToken.applicableTypeName()));
566+
final String referencedName = typeToken.referencedName();
567+
final String decoderTypeName = format("%s::%s",
568+
codecModName(referencedName == null ? typeToken.name() : referencedName),
569+
decoderName(formatStructName(typeToken.applicableTypeName())));
560570
indent(sb, level, "/// COMPOSITE DECODER\n");
561571
indent(sb, level, "#[inline]\n");
562572
if (fieldToken.version() > 0)
@@ -575,7 +585,7 @@ private static void generateCompositeDecoder(
575585
}
576586
else
577587
{
578-
indent(sb, level, "pub fn %s(self) -> %2$s<Self> {\n",
588+
indent(sb, level, "pub fn %s(self) -> %s<Self> {\n",
579589
decoderName,
580590
decoderTypeName);
581591

@@ -593,7 +603,11 @@ private static void generateBitSetDecoder(
593603
{
594604
final Encoding encoding = bitsetToken.encoding();
595605
final String rustPrimitiveType = rustTypeName(encoding.primitiveType());
596-
final String structTypeName = formatStructName(bitsetToken.applicableTypeName());
606+
final String referencedName = bitsetToken.referencedName();
607+
final String structTypeName = format("%s::%s",
608+
toLowerSnakeCase(referencedName == null ? bitsetToken.name() : referencedName),
609+
formatStructName(bitsetToken.applicableTypeName()));
610+
indent(sb, level, "/// BIT SET DECODER\n");
597611
indent(sb, level, "#[inline]\n");
598612
indent(sb, level, "pub fn %s(&self) -> %s {\n", formatFunctionName(name), structTypeName);
599613

@@ -834,7 +848,9 @@ private static void generateEnumDecoder(
834848
final String name) throws IOException
835849
{
836850
final String referencedName = typeToken.referencedName();
837-
final String enumType = formatStructName(referencedName == null ? typeToken.name() : referencedName);
851+
final String enumType = format("%s::%s",
852+
toLowerSnakeCase(referencedName == null ? typeToken.name() : referencedName),
853+
formatStructName(referencedName == null ? typeToken.name() : referencedName));
838854

839855
if (fieldToken.isConstantEncoding())
840856
{

0 commit comments

Comments
 (0)