Skip to content

Commit ab42d67

Browse files
sanket1729sanket1729
committed
Fix lint issues
1 parent f2ccc62 commit ab42d67

File tree

8 files changed

+27
-25
lines changed

8 files changed

+27
-25
lines changed

‎src/array.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl<'a, A> BTreeSlice<'a, A> {
2020
}
2121
}
2222

23-
impl<'a, A: Clone> BTreeSlice<'a, A> {
23+
impl<A: Clone> BTreeSlice<'_, A> {
2424
/// Fold the tree in post order, using the binary function `f`.
2525
///
2626
/// Returns `None` if the tree is empty.
@@ -57,7 +57,7 @@ impl<'a, A: Clone> BTreeSlice<'a, A> {
5757
}
5858
}
5959

60-
impl<'a, A: Clone> TreeLike for BTreeSlice<'a, A> {
60+
impl<A: Clone> TreeLike for BTreeSlice<'_, A> {
6161
fn as_node(&self) -> Tree<Self> {
6262
match self.0.len() {
6363
0 | 1 => Tree::Nullary,
@@ -169,7 +169,7 @@ impl<'a, A> Partition<'a, A> {
169169
}
170170
}
171171

172-
impl<'a, A: Clone> Partition<'a, A> {
172+
impl<A: Clone> Partition<'_, A> {
173173
/// Check if the partition is complete.
174174
///
175175
/// A complete partition contains no empty blocks.
@@ -213,7 +213,7 @@ impl<'a, A: Clone> Partition<'a, A> {
213213
}
214214

215215
#[rustfmt::skip]
216-
impl<'a, A: Clone> TreeLike for Partition<'a, A> {
216+
impl<A: Clone> TreeLike for Partition<'_, A> {
217217
fn as_node(&self) -> Tree<Self> {
218218
match self {
219219
Self::Leaf {..} => Tree::Nullary,

‎src/ast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ pub enum ExprTree<'a> {
426426
Match(&'a Match),
427427
}
428428

429-
impl<'a> TreeLike for ExprTree<'a> {
429+
impl TreeLike for ExprTree<'_> {
430430
fn as_node(&self) -> Tree<Self> {
431431
use SingleExpressionInner as S;
432432

‎src/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ impl<'a> From<&'a pest::iterators::Pair<'_, Rule>> for Span {
144144
}
145145
}
146146

147-
impl<'a> From<&'a str> for Span {
147+
impl From<&str> for Span {
148148
fn from(s: &str) -> Self {
149149
let start = Position::new(1, 1);
150150
let end_line = std::cmp::max(1, s.lines().count());

‎src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// Library for parsing and compiling simfony
1+
//! Library for parsing and compiling simfony
22
33
pub type ProgNode = Arc<named::ConstructNode>;
44

@@ -247,6 +247,7 @@ pub trait ArbitraryOfType: Sized {
247247
mod tests {
248248
use base64::display::Base64Display;
249249
use base64::engine::general_purpose::STANDARD;
250+
#[cfg(feature = "serde")]
250251
use elements::LockTime;
251252
use simplicity::BitMachine;
252253
use std::borrow::Cow;

‎src/parse.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ pub enum ExprTree<'a> {
544544
Match(&'a Match),
545545
}
546546

547-
impl<'a> TreeLike for ExprTree<'a> {
547+
impl TreeLike for ExprTree<'_> {
548548
fn as_node(&self) -> Tree<Self> {
549549
use SingleExpressionInner as S;
550550

@@ -596,7 +596,7 @@ impl<'a> TreeLike for ExprTree<'a> {
596596
}
597597
}
598598

599-
impl<'a> fmt::Display for ExprTree<'a> {
599+
impl fmt::Display for ExprTree<'_> {
600600
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
601601
use SingleExpressionInner as S;
602602

@@ -1512,7 +1512,7 @@ impl PestParse for ModuleAssignment {
15121512
#[derive(Clone, Debug)]
15131513
struct PatternPair<'a>(pest::iterators::Pair<'a, Rule>);
15141514

1515-
impl<'a> TreeLike for PatternPair<'a> {
1515+
impl TreeLike for PatternPair<'_> {
15161516
fn as_node(&self) -> Tree<Self> {
15171517
let mut it = self.0.clone().into_inner();
15181518
match self.0.as_rule() {
@@ -1534,7 +1534,7 @@ impl<'a> TreeLike for PatternPair<'a> {
15341534
#[derive(Clone, Debug)]
15351535
struct TyPair<'a>(pest::iterators::Pair<'a, Rule>);
15361536

1537-
impl<'a> TreeLike for TyPair<'a> {
1537+
impl TreeLike for TyPair<'_> {
15381538
fn as_node(&self) -> Tree<Self> {
15391539
let mut it = self.0.clone().into_inner();
15401540
match self.0.as_rule() {

‎src/pattern.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl Pattern {
7272
}
7373
}
7474

75-
impl<'a> TreeLike for &'a Pattern {
75+
impl TreeLike for &Pattern {
7676
fn as_node(&self) -> Tree<Self> {
7777
match self {
7878
Pattern::Identifier(_) | Pattern::Ignore => Tree::Nullary,
@@ -170,7 +170,7 @@ pub enum BasePattern {
170170
Product(Arc<Self>, Arc<Self>),
171171
}
172172

173-
impl<'a> TreeLike for &'a BasePattern {
173+
impl TreeLike for &BasePattern {
174174
fn as_node(&self) -> Tree<Self> {
175175
match self {
176176
BasePattern::Ignore | BasePattern::Identifier(_) => Tree::Nullary,

‎src/types.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ impl fmt::Display for UIntType {
193193
}
194194
}
195195

196-
impl<'a> TryFrom<&'a StructuralType> for UIntType {
196+
impl TryFrom<&StructuralType> for UIntType {
197197
type Error = ();
198198

199199
fn try_from(value: &StructuralType) -> Result<Self, Self::Error> {
@@ -215,7 +215,7 @@ impl<'a> TryFrom<&'a StructuralType> for UIntType {
215215
}
216216
}
217217

218-
impl<'a> TryFrom<&'a ResolvedType> for UIntType {
218+
impl TryFrom<&ResolvedType> for UIntType {
219219
type Error = ();
220220

221221
fn try_from(value: &ResolvedType) -> Result<Self, Self::Error> {
@@ -402,7 +402,7 @@ impl TypeDeconstructible for ResolvedType {
402402
}
403403
}
404404

405-
impl<'a> TreeLike for &'a ResolvedType {
405+
impl TreeLike for &ResolvedType {
406406
fn as_node(&self) -> Tree<Self> {
407407
match &self.0 {
408408
TypeInner::Boolean | TypeInner::UInt(..) => Tree::Nullary,
@@ -698,7 +698,7 @@ impl TypeDeconstructible for AliasedType {
698698
}
699699
}
700700

701-
impl<'a> TreeLike for &'a AliasedType {
701+
impl TreeLike for &AliasedType {
702702
fn as_node(&self) -> Tree<Self> {
703703
match &self.0 {
704704
AliasedInner::Alias(_) | AliasedInner::Builtin(_) => Tree::Nullary,
@@ -974,7 +974,7 @@ impl From<UIntType> for StructuralType {
974974
}
975975
}
976976

977-
impl<'a> From<&'a ResolvedType> for StructuralType {
977+
impl From<&ResolvedType> for StructuralType {
978978
fn from(value: &ResolvedType) -> Self {
979979
let mut output = vec![];
980980
for data in value.post_order_iter() {

‎src/value.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ pub struct Value {
395395
ty: ResolvedType,
396396
}
397397

398-
impl<'a> TreeLike for &'a Value {
398+
impl TreeLike for &Value {
399399
fn as_node(&self) -> Tree<Self> {
400400
match &self.inner {
401401
ValueInner::Option(None) | ValueInner::Boolean(_) | ValueInner::UInt(_) => {
@@ -443,10 +443,11 @@ impl fmt::Display for Value {
443443
}
444444
},
445445
ValueInner::Boolean(bit) => write!(f, "{bit}")?,
446-
ValueInner::UInt(integer) => match print_hex_byte_array {
447-
false => write!(f, "{integer}")?,
448-
true => {} // bytes have already been printed
449-
},
446+
ValueInner::UInt(integer) => {
447+
if !print_hex_byte_array {
448+
write!(f, "{integer}")?
449+
}
450+
}
450451
ValueInner::Tuple(tuple) => {
451452
if data.n_children_yielded == 0 {
452453
write!(f, "(")?;
@@ -998,7 +999,7 @@ impl From<UIntValue> for StructuralValue {
998999
}
9991000
}
10001001

1001-
impl<'a> From<&'a Value> for StructuralValue {
1002+
impl From<&Value> for StructuralValue {
10021003
fn from(value: &Value) -> Self {
10031004
let mut output = vec![];
10041005
for data in value.post_order_iter() {
@@ -1110,7 +1111,7 @@ impl<'a> Destructor<'a> {
11101111
}
11111112
}
11121113

1113-
impl<'a> TreeLike for Destructor<'a> {
1114+
impl TreeLike for Destructor<'_> {
11141115
fn as_node(&self) -> Tree<Self> {
11151116
let (value, ty) = match self {
11161117
Self::Ok { value, ty } => (value, ty),

0 commit comments

Comments
 (0)