Skip to content

Commit

Permalink
Merge pull request #111 from kornelski/bump
Browse files Browse the repository at this point in the history
MSRV
  • Loading branch information
hsivonen authored Nov 4, 2024
2 parents 8cec3a5 + 942c59c commit f978f7f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ homepage = "https://docs.rs/encoding_rs/"
repository = "https://github.com/hsivonen/encoding_rs"
keywords = ["encoding", "web", "unicode", "charset"]
categories = ["text-processing", "encoding", "web-programming", "internationalization"]
rust-version = "1.36"
rust-version = "1.40"

[features]
default = ["alloc"]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ as semver-breaking, because this crate depends on `cfg-if`, which doesn't
appear to treat MSRV changes as semver-breaking, so it would be useless for
this crate to treat MSRV changes as semver-breaking.

As of 2024-04-04, MSRV appears to be Rust 1.36.0 for using the crate and
As of 2024-11-01, MSRV appears to be Rust 1.40.0 for using the crate and
1.42.0 for doc tests to pass without errors about the global allocator.
With the `simd-accel` feature, the MSRV is even higher.

Expand Down
4 changes: 2 additions & 2 deletions src/iso_2022_jp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ fn is_kanji_mapped(bmp: u16) -> bool {
}

#[cfg(not(feature = "fast-kanji-encode"))]
#[allow(clippy::if_let_redundant_pattern_matching, clippy::if_same_then_else)]
#[allow(clippy::redundant_pattern_matching, clippy::if_same_then_else)]
#[inline(always)]
fn is_kanji_mapped(bmp: u16) -> bool {
if 0x4EDD == bmp {
Expand All @@ -391,7 +391,7 @@ fn is_kanji_mapped(bmp: u16) -> bool {
}
}

#[allow(clippy::if_let_redundant_pattern_matching, clippy::if_same_then_else)]
#[allow(clippy::redundant_pattern_matching, clippy::if_same_then_else)]
fn is_mapped_for_two_byte_encode(bmp: u16) -> bool {
// The code below uses else after return to
// keep the same structure as in EUC-JP.
Expand Down

0 comments on commit f978f7f

Please sign in to comment.