Skip to content

Commit 1879c46

Browse files
committed
misc: Downgrade Clippy and rustfmt to stable toolchain
1 parent 97a53c0 commit 1879c46

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- name: Install Rust toolchain
7575
uses: dtolnay/rust-toolchain@v1
7676
with:
77-
toolchain: nightly
77+
toolchain: stable
7878
components: clippy
7979
- run: |
8080
cargo clippy --all-features -- -Dclippy::all -Dclippy::pedantic
@@ -93,7 +93,7 @@ jobs:
9393
- name: Install Rust toolchain
9494
uses: dtolnay/rust-toolchain@v1
9595
with:
96-
toolchain: nightly
96+
toolchain: stable
9797
components: rustfmt
9898
- run: |
9999
cargo fmt -- --check

src/id3/v2/tag.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ impl MergeTag for SplitTagRemainder {
923923
let frame_id = item_key
924924
.map_key(TagType::Id3v2, false)
925925
.expect("valid frame id");
926-
if let Some(text) = join_text_items(&mut tag, [item_key].into_iter()) {
926+
if let Some(text) = join_text_items(&mut tag, [item_key]) {
927927
let frame = new_text_frame(
928928
FrameId::Valid(Cow::Borrowed(frame_id)),
929929
text,

src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@
136136
clippy::manual_let_else,
137137
clippy::let_underscore_untyped,
138138
clippy::field_reassign_with_default,
139+
clippy::manual_range_patterns, /* This is not at all clearer as it suggests */
140+
clippy::explicit_iter_loop,
139141
)]
140142
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
141143

src/ogg/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub use tag::VorbisComments;
3030
pub use vorbis::properties::VorbisProperties;
3131
pub use vorbis::VorbisFile;
3232

33-
pub(self) fn verify_signature(content: &[u8], sig: &[u8]) -> Result<()> {
33+
fn verify_signature(content: &[u8], sig: &[u8]) -> Result<()> {
3434
let sig_len = sig.len();
3535

3636
if content.len() < sig_len || &content[..sig_len] != sig {
@@ -40,7 +40,7 @@ pub(self) fn verify_signature(content: &[u8], sig: &[u8]) -> Result<()> {
4040
Ok(())
4141
}
4242

43-
pub(self) fn find_last_page<R>(data: &mut R) -> Result<Page>
43+
fn find_last_page<R>(data: &mut R) -> Result<Page>
4444
where
4545
R: Read + Seek,
4646
{

0 commit comments

Comments
 (0)