Skip to content

Commit e1003d5

Browse files
committed
thanks clippy
1 parent 135955d commit e1003d5

File tree

9 files changed

+21
-16
lines changed

9 files changed

+21
-16
lines changed

cargo-smart-release/src/changelog/parse.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ fn headline<'a, E: ParseError<&'a str> + FromExternalError<&'a str, ()>>(i: &'a
476476
let hashes = take_while(|c: char| c == '#');
477477
let greedy_whitespace = |i| take_while(|c: char| c.is_whitespace())(i);
478478
let take_n_digits = |n: usize| {
479-
map_res(take_while_m_n(n, n, |c: char| c.is_digit(10)), |num| {
479+
map_res(take_while_m_n(n, n, |c: char| c.is_ascii_digit()), |num| {
480480
u32::from_str(num).map_err(|_| ())
481481
})
482482
};

git-object/src/tag/ref_iter.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl<'a> TagRefIter<'a> {
6969
let (i, target) = context("object <40 lowercase hex char>", |i| {
7070
parse::header_field(i, b"object", parse::hex_hash)
7171
})(i)?;
72-
*state = State::TargetKind;
72+
*state = TargetKind;
7373
(
7474
i,
7575
Token::Target {
@@ -81,26 +81,29 @@ impl<'a> TagRefIter<'a> {
8181
let (i, kind) = context("type <object kind>", |i| {
8282
parse::header_field(i, b"type", take_while1(is_alphabetic))
8383
})(i)?;
84-
let kind = crate::Kind::from_bytes(kind).map_err(|_| {
85-
let err = crate::decode::ParseError::from_error_kind(i, nom::error::ErrorKind::MapRes);
86-
nom::Err::Error(err)
84+
let kind = Kind::from_bytes(kind).map_err(|_| {
85+
#[allow(clippy::let_unit_value)]
86+
{
87+
let err = crate::decode::ParseError::from_error_kind(i, nom::error::ErrorKind::MapRes);
88+
nom::Err::Error(err)
89+
}
8790
})?;
88-
*state = State::Name;
91+
*state = Name;
8992
(i, Token::TargetKind(kind))
9093
}
9194
Name => {
9295
let (i, tag_version) = context("tag <version>", |i| {
9396
parse::header_field(i, b"tag", take_while1(|b| b != NL[0]))
9497
})(i)?;
95-
*state = State::Tagger;
98+
*state = Tagger;
9699
(i, Token::Name(tag_version.as_bstr()))
97100
}
98101
Tagger => {
99102
let (i, signature) = context(
100103
"tagger <signature>",
101104
opt(|i| parse::header_field(i, b"tagger", parse::signature)),
102105
)(i)?;
103-
*state = State::Message;
106+
*state = Message;
104107
(i, Token::Tagger(signature))
105108
}
106109
Message => {

git-ref/src/store/file/log/iter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub mod decode {
2424
}
2525
}
2626

27-
impl<'a> std::error::Error for Error {}
27+
impl std::error::Error for Error {}
2828

2929
impl Error {
3030
pub(crate) fn new(err: log::line::decode::Error, line: LineNumber) -> Self {

git-ref/src/store/file/log/line.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ pub mod decode {
108108
}
109109
}
110110

111-
impl<'a> std::error::Error for Error {}
111+
impl std::error::Error for Error {}
112112

113113
impl Error {
114114
pub(crate) fn new(input: &[u8]) -> Self {

git-repository/src/object/tree.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ impl<'repo> Tree<'repo> {
4040
} else {
4141
let next_id = entry.oid.to_owned();
4242
let handle = self.repo;
43-
drop(entry);
4443
drop(self);
4544
self = match handle.find_object(next_id)?.try_into_tree() {
4645
Ok(tree) => tree,

git-repository/src/repository/object.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ impl crate::Repository {
5555
match self.objects.try_find(&id, &mut buf)? {
5656
Some(obj) => {
5757
let kind = obj.kind;
58-
drop(obj);
5958
Ok(Some(Object::from_data(id, kind, buf, self)))
6059
}
6160
None => Ok(None),

git-revision/src/spec/parse/function.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,12 @@ fn revision<'a>(mut input: &'a BStr, delegate: &mut impl Delegate) -> Result<&'a
207207
})
208208
.or_else(|| {
209209
name.is_empty().then(|| ()).or_else(|| {
210-
let res = delegate.find_ref(name)?;
211-
has_ref_or_implied_name = true;
212-
res.into()
210+
#[allow(clippy::let_unit_value)]
211+
{
212+
let res = delegate.find_ref(name)?;
213+
has_ref_or_implied_name = true;
214+
res.into()
215+
}
213216
})
214217
})
215218
.ok_or(Error::Delegate)?;

git-tempfile/tests/tempfile/fs/remove_dir.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ mod empty_depth_first {
118118
create_dir_all(tree_parent.join("one").join("two").join("three")).unwrap();
119119
create_dir_all(tree_parent.join("c")).unwrap();
120120
for empty in &[nested_parent, single_parent, tree_parent] {
121-
let _ = git_tempfile::remove_dir::empty_depth_first(empty).unwrap();
121+
git_tempfile::remove_dir::empty_depth_first(empty).unwrap();
122122
}
123123
}
124124
}

git-transport/tests/client/git.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ async fn handshake_v1_and_request() -> crate::Result {
7373
while let Some(line) = lines.next().await {
7474
refs.push(line?)
7575
}
76+
#[allow(clippy::drop_non_drop)] // needed for non-async version
7677
drop(lines);
7778

7879
assert_eq!(

0 commit comments

Comments
 (0)