Skip to content

Commit 67c7366

Browse files
committed
[Rust] Take slices by reference.
1 parent c942cc6 commit 67c7366

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

rust/tests/baseline_test.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ fn encode_car_from_scratch() -> SbeResult<(usize, Vec<u8>)> {
176176
car.model_year(2013);
177177
car.available(BooleanType::T);
178178
car.code(Model::A);
179-
car.some_numbers([1, 2, 3, 4]);
180-
car.vehicle_code([97, 98, 99, 100, 101, 102]); // abcdef
179+
car.some_numbers(&[1, 2, 3, 4]);
180+
car.vehicle_code(&[97, 98, 99, 100, 101, 102]); // abcdef
181181

182182
extras.set_cruise_control(true);
183183
extras.set_sports_pack(true);
@@ -187,7 +187,7 @@ fn encode_car_from_scratch() -> SbeResult<(usize, Vec<u8>)> {
187187
let mut engine = car.engine_encoder();
188188
engine.capacity(2000);
189189
engine.num_cylinders(4);
190-
engine.manufacturer_code([49, 50, 51]); // 123
190+
engine.manufacturer_code(&[49, 50, 51]); // 123
191191
engine.efficiency(35);
192192
engine.booster_enabled(BooleanType::T);
193193
let mut booster = engine.booster_encoder();

rust/tests/big_endian_test.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ fn encode_car_from_scratch() -> SbeResult<(usize, Vec<u8>)> {
170170
car.model_year(2013);
171171
car.available(BooleanType::T);
172172
car.code(Model::A);
173-
car.some_numbers([0, 1, 2, 3, 4]);
174-
car.vehicle_code(*b"abcdef");
173+
car.some_numbers(&[0, 1, 2, 3, 4]);
174+
car.vehicle_code(b"abcdef");
175175

176176
extras.set_cruise_control(true);
177177
extras.set_sports_pack(true);
@@ -181,7 +181,7 @@ fn encode_car_from_scratch() -> SbeResult<(usize, Vec<u8>)> {
181181
let mut engine = car.engine_encoder();
182182
engine.capacity(2000);
183183
engine.num_cylinders(4);
184-
engine.manufacturer_code(*b"123");
184+
engine.manufacturer_code(b"123");
185185
engine.efficiency(35);
186186
engine.booster_enabled(BooleanType::T);
187187
let mut booster = engine.booster_encoder();

rust/tests/extension_test.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ fn encode_car_from_scratch() -> SbeResult<(usize, Vec<u8>)> {
177177
car.model_year(2013);
178178
car.available(BooleanType::T);
179179
car.code(Model::A);
180-
car.some_numbers([0, 1, 2, 3]);
181-
car.vehicle_code([97, 98, 99, 100, 101, 102]); // abcdef
180+
car.some_numbers(&[0, 1, 2, 3]);
181+
car.vehicle_code(&[97, 98, 99, 100, 101, 102]); // abcdef
182182

183183
extras.set_cruise_control(true);
184184
extras.set_sports_pack(true);
@@ -188,7 +188,7 @@ fn encode_car_from_scratch() -> SbeResult<(usize, Vec<u8>)> {
188188
let mut engine = car.engine_encoder();
189189
engine.capacity(2000);
190190
engine.num_cylinders(4);
191-
engine.manufacturer_code([49, 50, 51]); // 123
191+
engine.manufacturer_code(&[49, 50, 51]); // 123
192192
engine.efficiency(35);
193193
engine.booster_enabled(BooleanType::T);
194194
let mut booster = engine.booster_encoder();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void generate() throws IOException
5656
{
5757
indent(libRs, 0, "#![forbid(unsafe_code)]\n");
5858
indent(libRs, 0, "#![allow(clippy::upper_case_acronyms)]\n");
59-
indent(libRs, 0, "#![allow(non_camel_case_types)]\n");
59+
indent(libRs, 0, "#![allow(non_camel_case_types)]\n\n");
6060
indent(libRs, 0, "use ::core::{convert::TryInto};\n\n");
6161

6262
final ArrayList<String> modules = new ArrayList<>();
@@ -225,8 +225,8 @@ static void generateWriteBuf(final Writer writer, final ByteOrder byteOrder) thr
225225

226226
indent(writer, 1, "#[inline]\n");
227227
indent(writer, 1,
228-
"pub fn put_bytes_at<const COUNT: usize>(&mut self, index: usize, bytes: [u8; COUNT]) -> usize {\n");
229-
indent(writer, 2, "self.data[index..index + COUNT].copy_from_slice(&bytes);\n");
228+
"pub fn put_bytes_at<const COUNT: usize>(&mut self, index: usize, bytes: &[u8; COUNT]) -> usize {\n");
229+
indent(writer, 2, "self.data[index..index + COUNT].copy_from_slice(bytes);\n");
230230
indent(writer, 2, "COUNT\n");
231231
indent(writer, 1, "}\n\n");
232232

@@ -245,7 +245,7 @@ static void generateWriteBuf(final Writer writer, final ByteOrder byteOrder) thr
245245
// put_<primitive>_at
246246
indent(writer, 1, "#[inline]\n");
247247
indent(writer, 1, "pub fn put_%1$s_at(&mut self, index: usize, value: %1$s) {\n", primitiveType);
248-
indent(writer, 2, "self.put_bytes_at(index, %s::to_%s_bytes(value));\n", primitiveType, endianness);
248+
indent(writer, 2, "self.put_bytes_at(index, &%s::to_%s_bytes(value));\n", primitiveType, endianness);
249249
indent(writer, 1, "}\n\n");
250250
}
251251

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ private static void generatePrimitiveEncoder(
379379
indent(sb, level, "/// - encodedLength: %d\n", typeToken.encodedLength());
380380
indent(sb, level, "/// - version: %d\n", typeToken.version());
381381
indent(sb, level, "#[inline]\n");
382-
indent(sb, level, "pub fn %s(&mut self, value: [%s; %d]) {\n",
382+
indent(sb, level, "pub fn %s(&mut self, value: &[%s; %d]) {\n",
383383
formatFunctionName(name),
384384
rustPrimitiveType,
385385
arrayLength);

0 commit comments

Comments
 (0)