Skip to content

Commit e74ecbd

Browse files
burrbullburrbull
committed
rm ref
1 parent af01705 commit e74ecbd

File tree

5 files changed

+67
-77
lines changed

5 files changed

+67
-77
lines changed

‎src/generate/peripheral.rs

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::borrow::Cow;
22
use std::cmp::Ordering;
33

44
use quote::{ToTokens, Tokens};
5-
use svd::{Cluster, ClusterInfo, Defaults, Peripheral, Register, RegisterCluster};
5+
use crate::svd::{Cluster, ClusterInfo, Defaults, Peripheral, Register, RegisterCluster};
66
use syn::{self, Ident};
77
use log::warn;
88

@@ -130,9 +130,9 @@ impl Region {
130130
let mut idents: Vec<_> = self
131131
.fields
132132
.iter()
133-
.filter_map(|f| match f.field.ident {
133+
.filter_map(|f| match &f.field.ident {
134134
None => None,
135-
Some(ref ident) => Some(ident.as_ref()),
135+
Some(ident) => Some(ident.as_ref()),
136136
})
137137
.collect();
138138
if idents.is_empty() {
@@ -171,9 +171,9 @@ impl Region {
171171
let idents: Vec<_> = self
172172
.fields
173173
.iter()
174-
.filter_map(|f| match f.field.ident {
174+
.filter_map(|f| match &f.field.ident {
175175
None => None,
176-
Some(ref ident) => Some(ident.as_ref()),
176+
Some(ident) => Some(ident.as_ref()),
177177
})
178178
.collect();
179179

@@ -558,9 +558,9 @@ fn expand(
558558
let mut ercs_expanded = vec![];
559559

560560
for erc in ercs {
561-
ercs_expanded.extend(match erc {
562-
RegisterCluster::Register(ref register) => expand_register(register, defs, name)?,
563-
RegisterCluster::Cluster(ref cluster) => expand_cluster(cluster, defs)?,
561+
ercs_expanded.extend(match &erc {
562+
RegisterCluster::Register(register) => expand_register(register, defs, name)?,
563+
RegisterCluster::Cluster(cluster) => expand_cluster(cluster, defs)?,
564564
});
565565
}
566566

@@ -575,16 +575,16 @@ fn cluster_size_in_bits(info: &ClusterInfo, defs: &Defaults) -> Result<u32> {
575575
let mut size = 0;
576576

577577
for c in &info.children {
578-
let end = match *c {
579-
RegisterCluster::Register(ref reg) => {
578+
let end = match c {
579+
RegisterCluster::Register(reg) => {
580580
let reg_size: u32 = expand_register(reg, defs, None)?
581581
.iter()
582582
.map(|rbf| rbf.size)
583583
.sum();
584584

585585
(reg.address_offset * BITS_PER_BYTE) + reg_size
586586
}
587-
RegisterCluster::Cluster(ref clust) => {
587+
RegisterCluster::Cluster(clust) => {
588588
(clust.address_offset * BITS_PER_BYTE) + cluster_size_in_bits(clust, defs)?
589589
}
590590
};
@@ -604,14 +604,14 @@ fn expand_cluster(cluster: &Cluster, defs: &Defaults) -> Result<Vec<RegisterBloc
604604
.or_else(|_e| cluster_size_in_bits(cluster, defs))
605605
.chain_err(|| format!("Cluster {} has no determinable `size` field", cluster.name))?;
606606

607-
match *cluster {
608-
Cluster::Single(ref info) => cluster_expanded.push(RegisterBlockField {
607+
match cluster {
608+
Cluster::Single(info) => cluster_expanded.push(RegisterBlockField {
609609
field: convert_svd_cluster(cluster),
610610
description: info.description.clone(),
611611
offset: info.address_offset,
612612
size: cluster_size,
613613
}),
614-
Cluster::Array(ref info, ref array_info) => {
614+
Cluster::Array(info, array_info) => {
615615
let sequential_addresses = cluster_size == array_info.dim_increment * BITS_PER_BYTE;
616616

617617
// if dimIndex exists, test if it is a sequence of numbers from 0 to dim
@@ -661,14 +661,14 @@ fn expand_register(
661661
.or(defs.size)
662662
.ok_or_else(|| format!("Register {} has no `size` field", register.name))?;
663663

664-
match *register {
665-
Register::Single(ref info) => register_expanded.push(RegisterBlockField {
664+
match register {
665+
Register::Single(info) => register_expanded.push(RegisterBlockField {
666666
field: convert_svd_register(register, name),
667667
description: info.description.clone().unwrap(),
668668
offset: info.address_offset,
669669
size: register_size,
670670
}),
671-
Register::Array(ref info, ref array_info) => {
671+
Register::Array(info, array_info) => {
672672
let sequential_addresses = register_size == array_info.dim_increment * BITS_PER_BYTE;
673673

674674
// if dimIndex exists, test if it is a sequence of numbers from 0 to dim
@@ -718,9 +718,9 @@ fn cluster_block(
718718
let description = util::escape_brackets(util::respace(&c.description).as_ref());
719719

720720
// Generate the register block.
721-
let mod_name = match *c {
722-
Cluster::Single(ref info) => &info.name,
723-
Cluster::Array(ref info, ref _ai) => &info.name,
721+
let mod_name = match c {
722+
Cluster::Single(info) => &info.name,
723+
Cluster::Array(info, _ai) => &info.name,
724724
}
725725
.replace("[%s]", "")
726726
.replace("%s", "");
@@ -785,9 +785,9 @@ fn expand_svd_register(register: &Register, name: Option<&str>) -> Vec<syn::Fiel
785785

786786
let mut out = vec![];
787787

788-
match *register {
789-
Register::Single(ref _info) => out.push(convert_svd_register(register, name)),
790-
Register::Array(ref info, ref array_info) => {
788+
match register {
789+
Register::Single(_info) => out.push(convert_svd_register(register, name)),
790+
Register::Array(info, array_info) => {
791791
let has_brackets = info.name.contains("[%s]");
792792

793793
let indices = array_info
@@ -856,14 +856,14 @@ fn convert_svd_register(register: &Register, name: Option<&str>) -> syn::Field {
856856
)
857857
};
858858

859-
match *register {
860-
Register::Single(ref info) => syn::Field {
859+
match register {
860+
Register::Single(info) => syn::Field {
861861
ident: Some(Ident::new(info.name.to_sanitized_snake_case())),
862862
vis: syn::Visibility::Public,
863863
attrs: vec![],
864864
ty: name_to_ty(&info.name, name),
865865
},
866-
Register::Array(ref info, ref array_info) => {
866+
Register::Array(info, array_info) => {
867867
let has_brackets = info.name.contains("[%s]");
868868

869869
let nb_name = if has_brackets {
@@ -910,9 +910,9 @@ fn expand_svd_cluster(cluster: &Cluster) -> Vec<syn::Field> {
910910

911911
let mut out = vec![];
912912

913-
match *cluster {
914-
Cluster::Single(ref _info) => out.push(convert_svd_cluster(cluster)),
915-
Cluster::Array(ref info, ref array_info) => {
913+
match &cluster {
914+
Cluster::Single(_info) => out.push(convert_svd_cluster(cluster)),
915+
Cluster::Array(info, array_info) => {
916916
let has_brackets = info.name.contains("[%s]");
917917

918918
let indices = array_info
@@ -970,14 +970,14 @@ fn convert_svd_cluster(cluster: &Cluster) -> syn::Field {
970970
)
971971
};
972972

973-
match *cluster {
974-
Cluster::Single(ref info) => syn::Field {
973+
match cluster {
974+
Cluster::Single(info) => syn::Field {
975975
ident: Some(Ident::new(info.name.to_sanitized_snake_case())),
976976
vis: syn::Visibility::Public,
977977
attrs: vec![],
978978
ty: name_to_ty(&info.name),
979979
},
980-
Cluster::Array(ref info, ref array_info) => {
980+
Cluster::Array(info, array_info) => {
981981
let has_brackets = info.name.contains("[%s]");
982982

983983
let name = if has_brackets {

‎src/generate/register.rs

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use cast::u64;
22
use quote::Tokens;
3-
use svd::{Access, BitRange, Defaults, EnumeratedValues, Field, Peripheral, Register,
3+
use crate::svd::{Access, BitRange, Defaults, EnumeratedValues, Field, Peripheral, Register,
44
RegisterCluster, Usage, WriteConstraint};
55
use syn::Ident;
66

@@ -239,7 +239,7 @@ pub fn fields(
239239
} else {
240240
format!("Bits {}:{}", offset, offset + width - 1)
241241
};
242-
if let Some(ref d) = f.description {
242+
if let Some(d) = &f.description {
243243
description.push_str(" - ");
244244
description.push_str(&*util::respace(&util::escape_brackets(d)));
245245
}
@@ -330,14 +330,12 @@ pub fn fields(
330330
.collect::<Result<Vec<_>>>()?;
331331

332332
let pc_r = &f.pc_r;
333-
if let Some(ref base) = base {
333+
if let Some(base) = &base {
334334
let pc = base.field.to_sanitized_upper_case();
335335
let base_pc_r = Ident::new(&*format!("{}R", pc));
336336
let desc = format!("Possible values of the field `{}`", f.name,);
337337

338-
if let (Some(ref peripheral), Some(ref register)) =
339-
(base.peripheral, base.register)
340-
{
338+
if let (Some(peripheral), Some(register)) = (&base.peripheral, &base.register) {
341339
let pmod_ = peripheral.to_sanitized_snake_case();
342340
let rmod_ = register.to_sanitized_snake_case();
343341
let pmod_ = Ident::new(&*pmod_);
@@ -347,7 +345,7 @@ pub fn fields(
347345
#[doc = #desc]
348346
pub type #pc_r = ::#pmod_::#rmod_::#base_pc_r;
349347
});
350-
} else if let Some(ref register) = base.register {
348+
} else if let Some(register) = &base.register {
351349
let mod_ = register.to_sanitized_snake_case();
352350
let mod_ = Ident::new(&*mod_);
353351

@@ -596,9 +594,7 @@ pub fn fields(
596594
let pc = base.field.to_sanitized_upper_case();
597595
let base_pc_w = Ident::new(&*format!("{}W", pc));
598596

599-
if let (Some(ref peripheral), Some(ref register)) =
600-
(base.peripheral, base.register)
601-
{
597+
if let (Some(peripheral), Some(register)) = (&base.peripheral, &base.register) {
602598
let pmod_ = peripheral.to_sanitized_snake_case();
603599
let rmod_ = register.to_sanitized_snake_case();
604600
let pmod_ = Ident::new(&*pmod_);
@@ -613,7 +609,7 @@ pub fn fields(
613609
quote! {
614610
::#pmod_::#rmod_::#base_pc_w
615611
}
616-
} else if let Some(ref register) = base.register {
612+
} else if let Some(register) = &base.register {
617613
let mod_ = register.to_sanitized_snake_case();
618614
let mod_ = Ident::new(&*mod_);
619615

@@ -791,8 +787,8 @@ pub fn fields(
791787
}
792788

793789
fn unsafety(write_constraint: Option<&WriteConstraint>, width: u32) -> Option<Ident> {
794-
match write_constraint {
795-
Some(&WriteConstraint::Range(ref range))
790+
match &write_constraint {
791+
Some(&WriteConstraint::Range(range))
796792
if u64::from(range.min) == 0 && u64::from(range.max) == (1u64 << width) - 1 =>
797793
{
798794
// the SVD has acknowledged that it's safe to write
@@ -827,7 +823,7 @@ fn lookup<'a>(
827823
) -> Result<Option<(&'a EnumeratedValues, Option<Base<'a>>)>> {
828824
let evs = evs.iter()
829825
.map(|evs| {
830-
if let Some(ref base) = evs.derived_from {
826+
if let Some(base) = &evs.derived_from {
831827
let mut parts = base.split('.');
832828

833829
match (parts.next(), parts.next(), parts.next(), parts.next()) {
@@ -865,7 +861,7 @@ fn lookup<'a>(
865861
})
866862
.collect::<Result<Vec<_>>>()?;
867863

868-
for &(ref evs, ref base) in evs.iter() {
864+
for (evs, base) in evs.iter() {
869865
if evs.usage == Some(usage) {
870866
return Ok(Some((*evs, base.clone())));
871867
}
@@ -979,7 +975,7 @@ fn lookup_in_register<'r>(
979975
} else {
980976
let fields = matches
981977
.iter()
982-
.map(|&(ref f, _)| &f.name)
978+
.map(|(f, _)| &f.name)
983979
.collect::<Vec<_>>();
984980
Err(format!(
985981
"Fields {:?} have an \
@@ -1019,7 +1015,7 @@ fn periph_all_registers<'a>(p: &'a Peripheral) -> Vec<&'a Register> {
10191015
return par;
10201016
}
10211017

1022-
if let Some(ref regs) = p.registers {
1018+
if let Some(regs) = &p.registers {
10231019
for r in regs.iter() {
10241020
rem.push(r);
10251021
}
@@ -1032,13 +1028,15 @@ fn periph_all_registers<'a>(p: &'a Peripheral) -> Vec<&'a Register> {
10321028
}
10331029

10341030
let b = b.unwrap();
1035-
match *b {
1036-
RegisterCluster::Register(ref reg) => {
1031+
match b {
1032+
RegisterCluster::Register(reg) => {
10371033
par.push(reg);
10381034
}
1039-
RegisterCluster::Cluster(ref cluster) => for c in cluster.children.iter() {
1040-
rem.push(c);
1041-
},
1035+
RegisterCluster::Cluster(cluster) => {
1036+
for c in cluster.children.iter() {
1037+
rem.push(c);
1038+
}
1039+
}
10421040
}
10431041
}
10441042
par

‎src/lib.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -424,15 +424,11 @@
424424
425425
#![recursion_limit = "128"]
426426

427-
extern crate cast;
428-
extern crate either;
429427
#[macro_use]
430428
extern crate error_chain;
431-
extern crate inflections;
432429
#[macro_use]
433430
extern crate quote;
434-
extern crate svd_parser as svd;
435-
extern crate syn;
431+
use svd_parser as svd;
436432

437433
mod errors;
438434
mod generate;

‎src/main.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
#![recursion_limit = "128"]
22

3-
extern crate cast;
4-
extern crate clap;
5-
extern crate either;
6-
extern crate env_logger;
73
#[macro_use]
84
extern crate error_chain;
9-
extern crate inflections;
105
#[macro_use]
116
extern crate log;
127
#[macro_use]
138
extern crate quote;
14-
extern crate svd_parser as svd;
15-
extern crate syn;
9+
use svd_parser as svd;
1610

1711
mod errors;
1812
mod generate;

0 commit comments

Comments
 (0)