Skip to content

Commit a8c4a42

Browse files
dancrossnycdancrossnyc
committed
cleanup: cargo fmt and clippy warnings
Signed-off-by: Dan Cross <[email protected]>
1 parent 78e80fc commit a8c4a42

12 files changed

+165
-179
lines changed

‎Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
name = "amd-apcb"
33
version = "0.5.1"
44
authors = ["Oxide Computer"]
5-
edition = "2021"
6-
7-
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
5+
edition = "2024"
6+
license = "MPL-2.0"
87

98
[dependencies]
109
# newer one than the one in zerocopy--required for WriteBytesExt (used by Parameters).
@@ -21,7 +20,7 @@ serde = { version = "1.0", default-features = false, features = ["derive"], opti
2120
serde-hex = { version = "0.1", optional = true }
2221
schemars = { version = "0.8", optional = true }
2322
parse_int = { version = "0.9", optional = true }
24-
thiserror = { version = "1.0", optional = true }
23+
thiserror = { version = "2.0", optional = true }
2524

2625
[features]
2726
default = ["std"]

‎rustfmt.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
edition = "2021"
1+
edition = "2024"
22
max_width = 80
33
use_small_heuristics = "Max"
44
newline_style = "Unix"

‎src/apcb.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ use crate::types::{ApcbContext, Error, FileSystemError, PtrMut, Result};
66

77
use crate::entry::EntryItemBody;
88
use crate::group::{GroupItem, GroupMutItem};
9-
use crate::ondisk::GroupId;
109
use crate::ondisk::ENTRY_ALIGNMENT;
1110
use crate::ondisk::ENTRY_HEADER;
1211
use crate::ondisk::GROUP_HEADER;
12+
use crate::ondisk::GroupId;
1313
use crate::ondisk::TOKEN_ENTRY;
1414
use crate::ondisk::V2_HEADER;
1515
use crate::ondisk::V3_HEADER_EXT;
16-
use crate::ondisk::{
17-
take_body_from_collection, take_body_from_collection_mut,
18-
take_header_from_collection, take_header_from_collection_mut,
19-
HeaderWithTail, ParameterAttributes, SequenceElementAsBytes,
20-
};
2116
pub use crate::ondisk::{
2217
BoardInstances, ContextType, EntryCompatible, EntryId, Parameter,
2318
PriorityLevels,
2419
};
20+
use crate::ondisk::{
21+
HeaderWithTail, ParameterAttributes, SequenceElementAsBytes,
22+
take_body_from_collection, take_body_from_collection_mut,
23+
take_header_from_collection, take_header_from_collection_mut,
24+
};
2525
use crate::token_accessors::{Tokens, TokensMut};
2626
use core::convert::TryInto;
2727
use core::default::Default;
@@ -111,7 +111,7 @@ pub struct SerdeApcb {
111111
/// we can actually handle the out-of-band information quite natually.
112112
#[cfg_attr(feature = "serde", serde(default))]
113113
pub context: ApcbContext,
114-
pub version: String,
114+
pub _version: String,
115115
pub header: V2_HEADER,
116116
pub v3_header_ext: Option<V3_HEADER_EXT>,
117117
pub groups: Vec<SerdeGroupItem>,
@@ -125,9 +125,9 @@ impl<'a> schemars::JsonSchema for Apcb<'a> {
125125
SerdeApcb::schema_name()
126126
}
127127
fn json_schema(
128-
gen: &mut schemars::gen::SchemaGenerator,
128+
generator: &mut schemars::r#gen::SchemaGenerator,
129129
) -> schemars::schema::Schema {
130-
SerdeApcb::json_schema(gen)
130+
SerdeApcb::json_schema(generator)
131131
}
132132
fn is_referenceable() -> bool {
133133
SerdeApcb::is_referenceable()
@@ -1181,7 +1181,7 @@ impl<'a> Apcb<'a> {
11811181
// Correct for stored_checksum_byte
11821182
checksum_byte = checksum_byte.wrapping_sub(stored_checksum_byte);
11831183
Ok((0x100u16 - u16::from(checksum_byte)) as u8) // Note: This can
1184-
// overflow
1184+
// overflow
11851185
}
11861186

11871187
/// Note: for OPTIONS, try ApcbIoOptions::default()

‎src/entry.rs

Lines changed: 55 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
use crate::naples::ParameterTokenConfig;
66
use crate::ondisk::ENTRY_HEADER;
77
use crate::ondisk::{
8-
take_header_from_collection, take_header_from_collection_mut,
98
BoardInstances, ContextFormat, ContextType, EntryCompatible, EntryId,
109
HeaderWithTail, MutSequenceElementFromBytes, PriorityLevels,
11-
SequenceElementFromBytes,
10+
SequenceElementFromBytes, take_header_from_collection,
11+
take_header_from_collection_mut,
1212
};
1313
use crate::ondisk::{Parameters, ParametersIter};
1414
use crate::tokens_entry::TokensEntryBodyItem;
@@ -198,11 +198,7 @@ impl<'a, T: EntryCompatible + MutSequenceElementFromBytes<'a>> Iterator
198198
type Item = T;
199199
fn next(&'_ mut self) -> Option<Self::Item> {
200200
// Note: Further error checking is done in validate()
201-
if self.buf.is_empty() {
202-
None
203-
} else {
204-
self.next1().ok()
205-
}
201+
if self.buf.is_empty() { None } else { self.next1().ok() }
206202
}
207203
}
208204

@@ -428,7 +424,7 @@ impl<'a> schemars::JsonSchema for EntryItem<'a> {
428424
String::from("EntryItem")
429425
}
430426
fn json_schema(
431-
gen: &mut schemars::gen::SchemaGenerator,
427+
generator: &mut schemars::r#gen::SchemaGenerator,
432428
) -> schemars::schema::Schema {
433429
use crate::fch;
434430
use crate::gnb;
@@ -441,152 +437,162 @@ impl<'a> schemars::JsonSchema for EntryItem<'a> {
441437
};
442438
let obj = schema.object();
443439
obj.required.insert("header".to_owned());
444-
obj.properties
445-
.insert("header".to_owned(), <ENTRY_HEADER>::json_schema(gen));
440+
obj.properties.insert(
441+
"header".to_owned(),
442+
<ENTRY_HEADER>::json_schema(generator),
443+
);
446444
obj.properties.insert(
447445
"tokens".to_owned(),
448-
<Vec<TokensEntryItem<&'_ TOKEN_ENTRY>>>::json_schema(gen),
446+
<Vec<TokensEntryItem<&'_ TOKEN_ENTRY>>>::json_schema(generator),
449447
);
450448
obj.properties.insert(
451449
"LrdimmDdr4OdtPatElement".to_owned(),
452-
<Vec<memory::LrdimmDdr4OdtPatElement>>::json_schema(gen),
450+
<Vec<memory::LrdimmDdr4OdtPatElement>>::json_schema(generator),
453451
);
454452
obj.properties.insert(
455453
"Ddr4OdtPatElement".to_owned(),
456-
<Vec<memory::Ddr4OdtPatElement>>::json_schema(gen),
454+
<Vec<memory::Ddr4OdtPatElement>>::json_schema(generator),
457455
);
458456
obj.properties.insert(
459457
"DdrPostPackageRepairElement".to_owned(),
460-
<Vec<memory::DdrPostPackageRepairElement>>::json_schema(gen),
458+
<Vec<memory::DdrPostPackageRepairElement>>::json_schema(generator),
461459
);
462460
obj.properties.insert(
463461
"DimmInfoSmbusElement".to_owned(),
464-
<Vec<memory::DimmInfoSmbusElement>>::json_schema(gen),
462+
<Vec<memory::DimmInfoSmbusElement>>::json_schema(generator),
465463
);
466464
obj.properties.insert(
467465
"RdimmDdr4CadBusElement".to_owned(),
468-
<Vec<memory::RdimmDdr4CadBusElement>>::json_schema(gen),
466+
<Vec<memory::RdimmDdr4CadBusElement>>::json_schema(generator),
469467
);
470468
obj.properties.insert(
471469
"UdimmDdr4CadBusElement".to_owned(),
472-
<Vec<memory::UdimmDdr4CadBusElement>>::json_schema(gen),
470+
<Vec<memory::UdimmDdr4CadBusElement>>::json_schema(generator),
473471
);
474472
obj.properties.insert(
475473
"LrdimmDdr4CadBusElement".to_owned(),
476-
<Vec<memory::LrdimmDdr4CadBusElement>>::json_schema(gen),
474+
<Vec<memory::LrdimmDdr4CadBusElement>>::json_schema(generator),
477475
);
478476
obj.properties.insert(
479477
"Ddr4DataBusElement".to_owned(),
480-
<Vec<memory::Ddr4DataBusElement>>::json_schema(gen),
478+
<Vec<memory::Ddr4DataBusElement>>::json_schema(generator),
481479
);
482480
obj.properties.insert(
483481
"LrdimmDdr4DataBusElement".to_owned(),
484-
<Vec<memory::LrdimmDdr4DataBusElement>>::json_schema(gen),
482+
<Vec<memory::LrdimmDdr4DataBusElement>>::json_schema(generator),
485483
);
486484
obj.properties.insert(
487485
"MaxFreqElement".to_owned(),
488-
<Vec<memory::MaxFreqElement>>::json_schema(gen),
486+
<Vec<memory::MaxFreqElement>>::json_schema(generator),
489487
);
490488
obj.properties.insert(
491489
"LrMaxFreqElement".to_owned(),
492-
<Vec<memory::LrMaxFreqElement>>::json_schema(gen),
490+
<Vec<memory::LrMaxFreqElement>>::json_schema(generator),
493491
);
494492
obj.properties.insert(
495493
"Ddr5CaPinMapElement".to_owned(),
496-
<Vec<memory::Ddr5CaPinMapElement>>::json_schema(gen),
494+
<Vec<memory::Ddr5CaPinMapElement>>::json_schema(generator),
497495
);
498496
obj.properties.insert(
499497
"MemDfeSearchElement32".to_owned(),
500-
<Vec<memory::MemDfeSearchElement32>>::json_schema(gen),
498+
<Vec<memory::MemDfeSearchElement32>>::json_schema(generator),
501499
);
502500
obj.properties.insert(
503501
"MemDfeSearchElement36".to_owned(),
504-
<Vec<memory::MemDfeSearchElement36>>::json_schema(gen),
502+
<Vec<memory::MemDfeSearchElement36>>::json_schema(generator),
505503
);
506504
obj.properties.insert(
507505
"DdrDqPinMapElement".to_owned(),
508-
<Vec<memory::DdrDqPinMapElement>>::json_schema(gen),
506+
<Vec<memory::DdrDqPinMapElement>>::json_schema(generator),
509507
);
510508
obj.properties.insert(
511509
"RdimmDdr5BusElement".to_owned(),
512-
<Vec<memory::RdimmDdr5BusElement>>::json_schema(gen),
510+
<Vec<memory::RdimmDdr5BusElement>>::json_schema(generator),
513511
);
514512
obj.properties.insert(
515513
"ConsoleOutControl".to_owned(),
516-
<memory::ConsoleOutControl>::json_schema(gen),
514+
<memory::ConsoleOutControl>::json_schema(generator),
517515
);
518516
obj.properties.insert(
519517
"NaplesConsoleOutControl".to_owned(),
520-
<memory::NaplesConsoleOutControl>::json_schema(gen),
518+
<memory::NaplesConsoleOutControl>::json_schema(generator),
521519
);
522520
obj.properties.insert(
523521
"ExtVoltageControl".to_owned(),
524-
<memory::ExtVoltageControl>::json_schema(gen),
522+
<memory::ExtVoltageControl>::json_schema(generator),
525523
);
526524
obj.properties.insert(
527525
"ErrorOutControl116".to_owned(),
528-
<memory::ErrorOutControl116>::json_schema(gen),
526+
<memory::ErrorOutControl116>::json_schema(generator),
529527
);
530528
obj.properties.insert(
531529
"ErrorOutControl112".to_owned(),
532-
<memory::ErrorOutControl112>::json_schema(gen),
530+
<memory::ErrorOutControl112>::json_schema(generator),
533531
);
534532
obj.properties.insert(
535533
"SlinkConfig".to_owned(),
536-
<crate::df::SlinkConfig>::json_schema(gen),
534+
<crate::df::SlinkConfig>::json_schema(generator),
535+
);
536+
obj.properties.insert(
537+
"EspiInit".to_owned(),
538+
<fch::EspiInit>::json_schema(generator),
537539
);
538-
obj.properties
539-
.insert("EspiInit".to_owned(), <fch::EspiInit>::json_schema(gen));
540540
obj.properties.insert(
541541
"PmuBistVendorAlgorithmElement".to_owned(),
542-
<Vec<memory::PmuBistVendorAlgorithmElement>>::json_schema(gen),
542+
<Vec<memory::PmuBistVendorAlgorithmElement>>::json_schema(
543+
generator,
544+
),
543545
);
544546
obj.properties.insert(
545547
"Ddr5RawCardConfigElement".to_owned(),
546-
<Vec<memory::Ddr5RawCardConfigElement>>::json_schema(gen),
548+
<Vec<memory::Ddr5RawCardConfigElement>>::json_schema(generator),
547549
);
548550
obj.properties.insert(
549551
"EspiSioInitElement".to_owned(),
550-
<Vec<fch::EspiSioInitElement>>::json_schema(gen),
552+
<Vec<fch::EspiSioInitElement>>::json_schema(generator),
551553
);
552554
obj.properties.insert(
553555
"EarlyPcieConfigElement".to_owned(),
554-
<Vec<gnb::EarlyPcieConfigElement>>::json_schema(gen),
556+
<Vec<gnb::EarlyPcieConfigElement>>::json_schema(generator),
555557
);
556558
obj.properties
557559
.insert("BoardIdGettingMethodGpio".to_owned(),
558560
<(psp::BoardIdGettingMethodGpio,
559561
Vec<<psp::BoardIdGettingMethodGpio as
560-
HeaderWithTail>::TailArrayItemType<'_>>)>::json_schema(gen));
562+
HeaderWithTail>::TailArrayItemType<'_>>)>::json_schema(generator));
561563
obj.properties
562564
.insert("BoardIdGettingMethodEeprom".to_owned(),
563565
<(psp::BoardIdGettingMethodEeprom,
564566
Vec<<psp::BoardIdGettingMethodEeprom as
565-
HeaderWithTail>::TailArrayItemType<'_>>)>::json_schema(gen));
567+
HeaderWithTail>::TailArrayItemType<'_>>)>::json_schema(generator));
566568
obj.properties
567569
.insert("BoardIdGettingMethodSmbus".to_owned(),
568570
<(psp::BoardIdGettingMethodSmbus,
569571
Vec<<psp::BoardIdGettingMethodSmbus as
570-
HeaderWithTail>::TailArrayItemType<'_>>)>::json_schema(gen));
572+
HeaderWithTail>::TailArrayItemType<'_>>)>::json_schema(generator));
571573
obj.properties
572574
.insert("BoardIdGettingMethodCustom".to_owned(),
573575
<(psp::BoardIdGettingMethodCustom,
574576
Vec<<psp::BoardIdGettingMethodCustom as
575-
HeaderWithTail>::TailArrayItemType<'_>>)>::json_schema(gen));
577+
HeaderWithTail>::TailArrayItemType<'_>>)>::json_schema(generator));
576578

577579
obj.properties.insert(
578580
"platform_specific_overrides".to_owned(),
579581
<Vec<memory::platform_specific_override::ElementRef<'_>>>::json_schema(
580-
gen,
582+
generator,
581583
),
582584
);
583585
obj.properties.insert(
584586
"platform_tuning".to_owned(),
585-
<Vec<memory::platform_tuning::ElementRef<'_>>>::json_schema(gen),
587+
<Vec<memory::platform_tuning::ElementRef<'_>>>::json_schema(
588+
generator,
589+
),
586590
);
587591

588-
obj.properties
589-
.insert("parameters".to_owned(), <Parameters>::json_schema(gen));
592+
obj.properties.insert(
593+
"parameters".to_owned(),
594+
<Parameters>::json_schema(generator),
595+
);
590596
schema.into()
591597
}
592598
}
@@ -596,9 +602,9 @@ impl schemars::JsonSchema for SerdeEntryItem {
596602
EntryItem::schema_name()
597603
}
598604
fn json_schema(
599-
gen: &mut schemars::gen::SchemaGenerator,
605+
generator: &mut schemars::r#gen::SchemaGenerator,
600606
) -> schemars::schema::Schema {
601-
EntryItem::json_schema(gen)
607+
EntryItem::json_schema(generator)
602608
}
603609
fn is_referenceable() -> bool {
604610
EntryItem::is_referenceable()

0 commit comments

Comments
 (0)