Skip to content

Commit 768894b

Browse files
burrbullburrbull
committed
simplify
1 parent c192581 commit 768894b

File tree

2 files changed

+17
-24
lines changed

2 files changed

+17
-24
lines changed

‎src/generate/register.rs

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ pub fn fields(
213213
let can_write = access != Access::ReadOnly;
214214

215215
// TODO enumeratedValues
216+
let inline = quote! { #[inline(always)] };
216217
for f in fields.iter() {
217218
// TODO(AJM) - do we need to do anything with this range type?
218219
let BitRange { offset, width, .. } = f.bit_range;
@@ -314,7 +315,7 @@ pub fn fields(
314315
let doc = &util::replace_suffix(&description, suffixes_str);
315316
r_impl_items.extend(quote! {
316317
#[doc = #doc]
317-
#[inline(always)]
318+
#inline
318319
pub unsafe fn #sc(&self, n: usize) -> #_pc_r {
319320
#_pc_r::new ( #value )
320321
}
@@ -341,7 +342,7 @@ pub fn fields(
341342
);
342343
r_impl_items.extend(quote! {
343344
#[doc = #doc]
344-
#[inline(always)]
345+
#inline
345346
pub fn #sc_n(&self) -> #_pc_r {
346347
#_pc_r::new ( #value )
347348
}
@@ -351,7 +352,7 @@ pub fn fields(
351352
let doc = description_with_bits(&description, offset, width);
352353
r_impl_items.extend(quote! {
353354
#[doc = #doc]
354-
#[inline(always)]
355+
#inline
355356
pub fn #sc(&self) -> #_pc_r {
356357
#_pc_r::new ( #value )
357358
}
@@ -407,7 +408,7 @@ pub fn fields(
407408
if has_reserved_variant {
408409
enum_items.extend(quote! {
409410
///Get enumerated values variant
410-
#[inline(always)]
411+
#inline
411412
pub fn variant(&self) -> crate::Variant<#fty, #pc_r> {
412413
use crate::Variant::*;
413414
match self.bits {
@@ -418,7 +419,7 @@ pub fn fields(
418419
} else {
419420
enum_items.extend(quote! {
420421
///Get enumerated values variant
421-
#[inline(always)]
422+
#inline
422423
pub fn variant(&self) -> #pc_r {
423424
match self.bits {
424425
#arms
@@ -443,7 +444,7 @@ pub fn fields(
443444
let doc = format!("Checks if the value of the field is `{}`", pc);
444445
enum_items.extend(quote! {
445446
#[doc = #doc]
446-
#[inline(always)]
447+
#inline
447448
pub fn #is_variant(&self) -> bool {
448449
*self == #pc_r::#pc
449450
}
@@ -496,7 +497,7 @@ pub fn fields(
496497

497498
proxy_items.extend(quote! {
498499
///Writes `variant` to the field
499-
#[inline(always)]
500+
#inline
500501
pub fn variant(self, variant: #pc_w) -> &'a mut W {
501502
#unsafety {
502503
self.#bits(variant.into())
@@ -511,7 +512,7 @@ pub fn fields(
511512
let doc = util::escape_brackets(util::respace(&v.doc).as_ref());
512513
proxy_items.extend(quote! {
513514
#[doc = #doc]
514-
#[inline(always)]
515+
#inline
515516
pub fn #sc(self) -> &'a mut W {
516517
self.variant(#pc_w::#pc)
517518
}
@@ -522,13 +523,13 @@ pub fn fields(
522523
if width == 1 {
523524
proxy_items.extend(quote! {
524525
///Sets the field bit
525-
#[inline(always)]
526+
#inline
526527
pub #unsafety fn set_bit(self) -> &'a mut W {
527528
self.bit(true)
528529
}
529530

530531
///Clears the field bit
531-
#[inline(always)]
532+
#inline
532533
pub #unsafety fn clear_bit(self) -> &'a mut W {
533534
self.bit(false)
534535
}
@@ -538,7 +539,7 @@ pub fn fields(
538539
proxy_items.extend(if field_dim.is_some() {
539540
quote! {
540541
///Writes raw bits to the field
541-
#[inline(always)]
542+
#inline
542543
pub #unsafety fn #bits(self, value: #fty) -> &'a mut W {
543544
self.w.bits = (self.w.bits & !(#hexmask << self.offset)) | (((value as #rty) & #hexmask) << self.offset);
544545
self.w
@@ -548,7 +549,7 @@ pub fn fields(
548549
let offset = &util::unsuffixed(offset);
549550
quote! {
550551
///Writes raw bits to the field
551-
#[inline(always)]
552+
#inline
552553
pub #unsafety fn #bits(self, value: #fty) -> &'a mut W {
553554
self.w.bits = (self.w.bits & !(#hexmask << #offset)) | (((value as #rty) & #hexmask) << #offset);
554555
self.w
@@ -557,7 +558,7 @@ pub fn fields(
557558
} else {
558559
quote! {
559560
///Writes raw bits to the field
560-
#[inline(always)]
561+
#inline
561562
pub #unsafety fn #bits(self, value: #fty) -> &'a mut W {
562563
self.w.bits = (self.w.bits & !#hexmask) | ((value as #rty) & #hexmask);
563564
self.w
@@ -591,7 +592,7 @@ pub fn fields(
591592
let doc = &util::replace_suffix(&description, suffixes_str);
592593
w_impl_items.extend(quote! {
593594
#[doc = #doc]
594-
#[inline(always)]
595+
#inline
595596
pub unsafe fn #sc(&mut self, n: usize) -> #_pc_w {
596597
#_pc_w { w: self, offset: #offset_calc }
597598
}
@@ -609,7 +610,7 @@ pub fn fields(
609610
let sub_offset = util::unsuffixed(sub_offset as u64);
610611
w_impl_items.extend(quote! {
611612
#[doc = #doc]
612-
#[inline(always)]
613+
#inline
613614
pub fn #sc_n(&mut self) -> #_pc_w {
614615
#_pc_w { w: self, offset: #sub_offset }
615616
}
@@ -619,7 +620,7 @@ pub fn fields(
619620
let doc = description_with_bits(&description, offset, width);
620621
w_impl_items.extend(quote! {
621622
#[doc = #doc]
622-
#[inline(always)]
623+
#inline
623624
pub fn #sc(&mut self) -> #_pc_w {
624625
#_pc_w { w: self }
625626
}

‎src/util.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,6 @@ pub fn replace_suffix(name: &str, suffix: &str) -> String {
197197
}
198198
}
199199

200-
pub fn replace_suffix(name: &str, suffix: &str) -> String {
201-
if name.contains("[%s]") {
202-
name.replace("[%s]", suffix)
203-
} else {
204-
name.replace("%s", suffix)
205-
}
206-
}
207-
208200
pub fn access_of(register: &Register) -> Access {
209201
register.access.unwrap_or_else(|| {
210202
if let Some(fields) = &register.fields {

0 commit comments

Comments
 (0)