Skip to content

Commit 881d350

Browse files
committed
Derive Default for some structs.
1 parent 8656a72 commit 881d350

1 file changed

Lines changed: 30 additions & 30 deletions

File tree

arm-sysregs-json/src/lib.rs

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ pub struct Meta {
5050
pub version: Version,
5151
}
5252

53-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
53+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
5454
pub struct License {
5555
pub copyright: String,
5656
pub info: String,
5757
}
5858

59-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
59+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
6060
pub struct Version {
6161
pub architecture: String,
6262
pub build: String,
@@ -184,7 +184,7 @@ pub struct SystemAccess {
184184
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
185185
pub struct Access {}
186186

187-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
187+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
188188
pub struct Encoding {
189189
pub asmvalue: Option<String>,
190190
pub encodings: BTreeMap<String, ValueEntry>,
@@ -237,39 +237,39 @@ pub struct AstBinaryOp {
237237
pub right: Box<Expression>,
238238
}
239239

240-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
240+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
241241
pub struct AstBool {
242242
pub value: bool,
243243
}
244244

245-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
245+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
246246
pub struct AstConcat {
247247
pub values: Vec<Expression>,
248248
}
249249

250-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
250+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
251251
pub struct AstDotAtom {
252252
pub values: Vec<Expression>,
253253
}
254254

255-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
255+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
256256
pub struct AstFunction {
257257
pub arguments: Vec<Expression>,
258258
pub name: String,
259259
pub parameters: Vec<Expression>,
260260
}
261261

262-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
262+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
263263
pub struct AstIdentifier {
264264
pub value: String,
265265
}
266266

267-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
267+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
268268
pub struct AstInteger {
269269
pub value: i64,
270270
}
271271

272-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
272+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
273273
pub struct AstSet {
274274
pub values: Vec<Expression>,
275275
}
@@ -300,7 +300,7 @@ pub struct FieldValue {
300300
pub state: ExecutionState,
301301
}
302302

303-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
303+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
304304
pub struct TypesString {
305305
pub value: String,
306306
}
@@ -336,7 +336,7 @@ pub enum FieldEntry {
336336
Dynamic(DynamicField),
337337
}
338338

339-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
339+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
340340
pub struct Field {
341341
pub description: Description,
342342
pub name: Option<String>,
@@ -346,14 +346,14 @@ pub struct Field {
346346
pub volatile: Option<bool>,
347347
}
348348

349-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
349+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
350350
pub struct ReservedField {
351351
pub description: Description,
352352
pub rangeset: Vec<Range>,
353353
pub value: String,
354354
}
355355

356-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
356+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
357357
pub struct ImplementationDefinedField {
358358
pub constraints: Option<Vec<()>>,
359359
pub description: Description,
@@ -364,7 +364,7 @@ pub struct ImplementationDefinedField {
364364
pub volatile: Option<bool>,
365365
}
366366

367-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
367+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
368368
pub struct ArrayField {
369369
pub access: Option<()>,
370370
pub description: Description,
@@ -378,7 +378,7 @@ pub struct ArrayField {
378378
pub volatile: Option<bool>,
379379
}
380380

381-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
381+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
382382
pub struct VectorField {
383383
pub access: Option<()>,
384384
pub description: Description,
@@ -400,7 +400,7 @@ pub struct ConditionValue {
400400
pub value: Expression,
401401
}
402402

403-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
403+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
404404
pub struct ConditionalField {
405405
pub description: Description,
406406
pub display: Option<String>,
@@ -428,7 +428,7 @@ pub struct ConstantField {
428428
pub value: ValueEntry,
429429
}
430430

431-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
431+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
432432
pub struct DynamicField {
433433
pub description: Description,
434434
pub display: Option<String>,
@@ -439,13 +439,13 @@ pub struct DynamicField {
439439
pub volatile: Option<bool>,
440440
}
441441

442-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
442+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
443443
pub struct Description {
444444
pub after: Option<String>,
445445
pub before: Option<String>,
446446
}
447447

448-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
448+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
449449
pub struct Range {
450450
pub start: u32,
451451
pub width: u32,
@@ -454,7 +454,7 @@ pub struct Range {
454454
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
455455
pub struct FieldResets {}
456456

457-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
457+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
458458
pub struct Values {
459459
pub values: Vec<ValueEntry>,
460460
}
@@ -487,47 +487,47 @@ pub struct ConditionalValue {
487487
pub values: Values,
488488
}
489489

490-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
490+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
491491
pub struct EquationValue {
492492
pub meaning: Option<String>,
493493
pub slice: Vec<Range>,
494494
pub value: String,
495495
}
496496

497-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
497+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
498498
pub struct Group {
499499
pub meaning: Option<String>,
500500
pub value: String,
501501
pub values: Values,
502502
}
503503

504-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
504+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
505505
pub struct Link {
506506
pub links: BTreeMap<String, String>,
507507
pub meaning: Option<String>,
508508
pub value: String,
509509
}
510510

511-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
511+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
512512
pub struct NamedValue {
513513
pub meaning: Option<String>,
514514
pub name: String,
515515
pub value: String,
516516
}
517517

518-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
518+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
519519
pub struct Value {
520520
pub meaning: Option<String>,
521521
pub value: String,
522522
}
523523

524-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
524+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
525525
pub struct ImplementationDefinedValue {
526526
pub constraints: Option<Values>,
527527
pub meaning: Option<String>,
528528
}
529529

530-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
530+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
531531
pub struct ValueRange {
532532
pub end: Value,
533533
pub meaning: Option<String>,
@@ -562,7 +562,7 @@ pub enum Instances {
562562
Bool(bool),
563563
}
564564

565-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
565+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
566566
pub struct InstanceSet {
567567
pub values: Vec<Instance>,
568568
}
@@ -589,7 +589,7 @@ pub struct RegisterBlock {
589589
pub title: Option<String>,
590590
}
591591

592-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
592+
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
593593
pub struct ReadWriteAccess {
594594
pub read: String,
595595
pub write: String,

0 commit comments

Comments
 (0)