switch to edition 2021, bumping msrv to 1.56.0
unfortunately we can't use the new resolver for reasons explained in the readme
This commit is contained in:
parent
a3cb90c8ee
commit
3b6be17e4a
7 changed files with 23 additions and 15 deletions
|
@ -83,7 +83,7 @@ cleanup-stable:
|
||||||
|
|
||||||
cleanup-msrv:
|
cleanup-msrv:
|
||||||
extends: cleanup-stable
|
extends: cleanup-stable
|
||||||
image: "rust:1.54.0"
|
image: "rust:1.56.0"
|
||||||
cache:
|
cache:
|
||||||
key: msrv
|
key: msrv
|
||||||
paths:
|
paths:
|
||||||
|
@ -107,7 +107,7 @@ build-base-stable:
|
||||||
build-base-msrv:
|
build-base-msrv:
|
||||||
extends: build-base-stable
|
extends: build-base-stable
|
||||||
needs: ["cleanup-msrv"]
|
needs: ["cleanup-msrv"]
|
||||||
image: "rust:1.54.0"
|
image: "rust:1.56.0"
|
||||||
cache:
|
cache:
|
||||||
key: msrv
|
key: msrv
|
||||||
paths:
|
paths:
|
||||||
|
@ -133,7 +133,7 @@ build-stable:
|
||||||
build-msrv:
|
build-msrv:
|
||||||
extends: build-stable
|
extends: build-stable
|
||||||
needs: ["build-base-msrv"]
|
needs: ["build-base-msrv"]
|
||||||
image: "rust:1.54.0"
|
image: "rust:1.56.0"
|
||||||
cache:
|
cache:
|
||||||
key: msrv
|
key: msrv
|
||||||
paths:
|
paths:
|
||||||
|
@ -158,7 +158,7 @@ test-stable:
|
||||||
|
|
||||||
test-msrv:
|
test-msrv:
|
||||||
extends: test-stable
|
extends: test-stable
|
||||||
image: "rust:1.54.0"
|
image: "rust:1.56.0"
|
||||||
needs: ["build-msrv"]
|
needs: ["build-msrv"]
|
||||||
cache:
|
cache:
|
||||||
key: msrv
|
key: msrv
|
||||||
|
|
|
@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
## Changed
|
## Changed
|
||||||
- MSRV is now 1.54.0
|
- MSRV is now 1.56.0
|
||||||
- A few dependencies have been updated, most notably [`clap`]
|
- A few dependencies have been updated, most notably [`clap`]
|
||||||
### Added
|
### Added
|
||||||
- AIFF (Audio Interchange File Format, a PCM audio format like WAV) detection to [`infer`]
|
- AIFF (Audio Interchange File Format, a PCM audio format like WAV) detection to [`infer`]
|
||||||
|
|
4
Cargo.lock
generated
4
Cargo.lock
generated
|
@ -27,9 +27,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bitflags"
|
name = "bitflags"
|
||||||
version = "1.3.2"
|
version = "1.2.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "byteorder"
|
name = "byteorder"
|
||||||
|
|
16
Cargo.toml
16
Cargo.toml
|
@ -3,16 +3,22 @@ name = "fif"
|
||||||
description = "A command-line tool for detecting and optionally correcting files with incorrect extensions."
|
description = "A command-line tool for detecting and optionally correcting files with incorrect extensions."
|
||||||
version = "0.3.6"
|
version = "0.3.6"
|
||||||
authors = ["Lynnesbian <lynne@bune.city>"]
|
authors = ["Lynnesbian <lynne@bune.city>"]
|
||||||
edition = "2018"
|
edition = "2021"
|
||||||
license = "GPL-3.0-or-later"
|
license = "GPL-3.0-or-later"
|
||||||
rust-version = "1.54.0"
|
rust-version = "1.56.0"
|
||||||
repository = "https://gitlab.com/Lynnesbian/fif"
|
repository = "https://gitlab.com/Lynnesbian/fif"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
keywords = ["mime", "mimetype", "utilities", "tools"]
|
keywords = ["mime", "mimetype", "utilities", "tools"]
|
||||||
categories = ["command-line-utilities"]
|
categories = ["command-line-utilities"]
|
||||||
exclude = [".idea/", "*.toml", "!Cargo.toml", "*.sh", "*.py", "*.yml", "*.md", ".mailmap", "pkg/"]
|
exclude = [".idea/", "*.toml", "!Cargo.toml", "*.sh", "*.py", "*.yml", "*.md", ".mailmap", "pkg/"]
|
||||||
#resolver = "2"
|
|
||||||
#license-file = "LICENSE"
|
# unfortunately, we can't use resolver v2 right now, because one of the phf crates (i think it's phf_codegen) that are
|
||||||
|
# pulled in by new_mime_guess' phf-map feature doesn't enable phf_shared's unicase feature when it should.
|
||||||
|
# this causes new_mime_guess' build.rs to fail with errors about PhfHash traits and such not being implemented for
|
||||||
|
# UniCase<&str>.
|
||||||
|
# there's no way to fix this in either fif or new_mime_guess itself, short of a patch (which can't be used on
|
||||||
|
# crates.io), so we'll have to disable the new resolver for now :(
|
||||||
|
resolver = "1"
|
||||||
|
|
||||||
[badges]
|
[badges]
|
||||||
maintenance = { status = "experimental" }
|
maintenance = { status = "experimental" }
|
||||||
|
@ -83,4 +89,4 @@ opt-level = 3
|
||||||
opt-level = 3
|
opt-level = 3
|
||||||
|
|
||||||
[package.metadata]
|
[package.metadata]
|
||||||
msrv = "1.54.0"
|
msrv = "1.56.0"
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
[![Version](https://img.shields.io/crates/v/fif.svg?logo=rust&style=flat-square)
|
[![Version](https://img.shields.io/crates/v/fif.svg?logo=rust&style=flat-square)
|
||||||
](https://crates.io/crates/fif)
|
](https://crates.io/crates/fif)
|
||||||
[![Minimum Supported Rust Version](https://img.shields.io/badge/msrv-1.54.0-orange?logo=rust&style=flat-square)
|
[![Minimum Supported Rust Version](https://img.shields.io/badge/msrv-1.56.0-orange?logo=rust&style=flat-square)
|
||||||
](https://gitlab.com/Lynnesbian/fif/-/blob/master/README.md#version-policy)
|
](https://gitlab.com/Lynnesbian/fif/-/blob/master/README.md#version-policy)
|
||||||
[![License](https://img.shields.io/crates/l/fif.svg?style=flat-square)
|
[![License](https://img.shields.io/crates/l/fif.svg?style=flat-square)
|
||||||
](https://gitlab.com/Lynnesbian/fif/-/blob/master/LICENSE)
|
](https://gitlab.com/Lynnesbian/fif/-/blob/master/LICENSE)
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
# avoid-breaking-exported-api = false # only available on nightly for now
|
# avoid-breaking-exported-api = false # only available on nightly for now
|
||||||
cognitive-complexity-threshold = 15
|
cognitive-complexity-threshold = 15
|
||||||
msrv = "1.54.0"
|
msrv = "1.56.0"
|
4
test.py
4
test.py
|
@ -24,7 +24,9 @@ def test_versions():
|
||||||
print("Couldn't find rust-version")
|
print("Couldn't find rust-version")
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
versions = [match.group(1), "stable", "nightly"]
|
# versions = [match.group(1), "stable", "nightly"]
|
||||||
|
# remove this when 1.56 is released
|
||||||
|
versions = ["beta", "nightly"]
|
||||||
backends = ["xdg-mime", "infer"]
|
backends = ["xdg-mime", "infer"]
|
||||||
|
|
||||||
upto = 1
|
upto = 1
|
||||||
|
|
Loading…
Reference in a new issue