Skip to content

Commit f978f7f

Browse files
authored
Merge pull request #111 from kornelski/bump
MSRV
2 parents 8cec3a5 + 942c59c commit f978f7f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ homepage = "https://docs.rs/encoding_rs/"
1111
repository = "https://github.com/hsivonen/encoding_rs"
1212
keywords = ["encoding", "web", "unicode", "charset"]
1313
categories = ["text-processing", "encoding", "web-programming", "internationalization"]
14-
rust-version = "1.36"
14+
rust-version = "1.40"
1515

1616
[features]
1717
default = ["alloc"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ as semver-breaking, because this crate depends on `cfg-if`, which doesn't
367367
appear to treat MSRV changes as semver-breaking, so it would be useless for
368368
this crate to treat MSRV changes as semver-breaking.
369369

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

src/iso_2022_jp.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ fn is_kanji_mapped(bmp: u16) -> bool {
373373
}
374374

375375
#[cfg(not(feature = "fast-kanji-encode"))]
376-
#[allow(clippy::if_let_redundant_pattern_matching, clippy::if_same_then_else)]
376+
#[allow(clippy::redundant_pattern_matching, clippy::if_same_then_else)]
377377
#[inline(always)]
378378
fn is_kanji_mapped(bmp: u16) -> bool {
379379
if 0x4EDD == bmp {
@@ -391,7 +391,7 @@ fn is_kanji_mapped(bmp: u16) -> bool {
391391
}
392392
}
393393

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

0 commit comments

Comments
 (0)