Skip to content

Commit

Permalink
Misc cleanups
Browse files Browse the repository at this point in the history
- Tweak TryFrom usage
- Add beta to CI to catch clippy changes sooner
- Apply updated MSRV to clippy.toml
  • Loading branch information
marshallpierce committed Aug 26, 2023
1 parent b001749 commit f2a06dd
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ workflows:
'__msrv__', # won't add any other toolchains, just uses what's in the docker image
'1.60.0', # minimum needed to build dev-dependencies
'stable',
'beta',
'nightly'
]

Expand Down
5 changes: 5 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 0.21.3

- Implement `source` instead of `cause` on Error types
- Roll back MSRV to 1.48.0 so Debian can continue to live in a time warp

# 0.21.2

- Rollback MSRV to 1.57.0 -- only dev dependencies need 1.60, not the main code
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.57.0"
msrv = "1.48.0"
6 changes: 3 additions & 3 deletions src/alphabet.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
//! Provides [Alphabet] and constants for alphabets commonly used in the wild.
use crate::PAD_BYTE;
use core::convert::TryFrom;
use core::fmt;
use core::{convert, fmt};
#[cfg(any(feature = "std", test))]
use std::error;

Expand Down Expand Up @@ -125,7 +124,7 @@ impl Alphabet {
}
}

impl TryFrom<&str> for Alphabet {
impl convert::TryFrom<&str> for Alphabet {
type Error = ParseAlphabetError;

fn try_from(value: &str) -> Result<Self, Self::Error> {
Expand Down Expand Up @@ -203,6 +202,7 @@ pub const BIN_HEX: Alphabet = Alphabet::from_str_unchecked(
#[cfg(test)]
mod tests {
use crate::alphabet::*;
use core::convert::TryFrom as _;

#[test]
fn detects_duplicate_start() {
Expand Down

0 comments on commit f2a06dd

Please sign in to comment.