update to 2.5.0

.github/workflows/celes.yml

@@ -0,0 +1,107 @@
+name: frodo-kem
+
+on:
+  pull_request:
+    paths-ignore: 
+      - README.md
+      - LICENSE-APACHE
+      - LICENSE-MIT
+      - rustfmt.toml
+  push:
+    branches: main
+    paths-ignore:
+      - README.md
+      - LICENSE-APACHE
+      - LICENSE-MIT
+      - rustfmt.toml
+
+env:
+  CARGO_INCREMENTAL: 0
+  CARGO_TERM_COLOR: always
+  RUST_LOG_STYLE: always
+  RUSTFLAGS: "-Dwarnings"
+  RUSTDOCFLAGS: "-Dwarnings"
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+      - run: cargo build
+
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+      - run: cargo test --release
+
+  careful:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@nightly
+      - run: cargo install cargo-careful
+      - run: cargo careful test
+
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: clippy
+      - run: cargo clippy --all --all-features -- -D warnings
+
+  rustfmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: rustfmt
+      - run: cargo fmt -- --check
+
+  doc:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+      - run: cargo doc --all-features
+
+  deps:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@nightly
+      - run: cargo install cargo-udeps
+      - run: cargo udeps --all-targets --all-features
+
+  outdated:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@nightly
+      - run: cargo install cargo-outdated
+      - run: cargo outdated --root-deps-only --exit-code 1
+  pants:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@nightly
+      - run: cargo install cargo-pants
+      - run: cargo pants --loud --dev

.gitignore

@@ -1,3 +1,28 @@
-.idea
-Cargo.lock
+# Generated by Cargo
+# will have compiled files and executables
+debug/
 target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# MSVC Windows builds of rustc generate these, which store debugging information
+*.pdb
+
+# RustRover
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+.idea/
+
+# Visual Studio Code
+.vscode/
+
+# Added by cargo
+
+/target

Cargo.toml

@@ -6,24 +6,38 @@ Each country has a three digit code, two letter code, three letter code,
 full state name, and short english aliases.
 """
 documentation = "https://docs.rs/celes/"
-categories = ["encoding", "no-std", "parsing"]
-edition = "2018"
+categories = ["encoding", "parsing"]
+edition = "2021"
 homepage = "https://crates.io/crates/celes"
 include = [
     "src/*.rs",
     "Cargo.toml",
-    "LICENSE",
+    "LICENSE-APACHE",
+    "LICENSE-MIT",
     "README.md"
 ]
 keywords = ["iso3166", "alpha2", "alpha3", "country", "codes"]
-license = "Apache-2.0"
+license = "Apache-2.0 OR MIT"
 name = "celes"
 readme = "README.md"
 repository = "https://github.com/mikelodder7/celes"
-version = "2.4.0"
+version = "2.5.0"
 
 [dependencies]
 serde = { version = "1", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
 serde_json = "1.0"
+
+[lints.rust]
+missing_docs = "warn"
+missing_debug_implementations = "warn"
+missing_copy_implementations = "warn"
+rust_2018_idioms = "warn"
+trivial_casts = "warn"
+trivial_numeric_casts = "warn"
+unused = "warn"
+
+[lints.clippy]
+mod_module_files = "warn"
+unwrap_used = "deny"

LICENSE-MIT

@@ -0,0 +1,19 @@
+Copyright (c) 2024 RustCrypto Developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -2,10 +2,11 @@
 
 [![crate][crate-image]][crate-link]
 [![Docs][docs-image]][docs-link]
-![Apache2 licensed][license-image]
-![Rust Version][rustc-image]
+![Apache2/MIT licensed][license-image]
+[![Downloads][downloads-image]][crate-link]
 ![Maintenance Status: Passively-Maintained][maintenance-image]
-[![Build Status][build-image]][build-link]
+![build](https://github.com/mikelodder7/celes/actions/workflows/celes.yml/badge.svg)
+![MSRV][msrv-image]
 
 Convenience crate for handling ISO 3166-1. Also compatible with `no-std` environments.
 
@@ -87,6 +88,9 @@ fn main() {
 Licensed under
 
 - [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0)
+- [MIT license](http://opensource.org/licenses/MIT)
+
+at your option.
 
 ### Contribution
 
@@ -100,8 +104,7 @@ licensed as above, without any additional terms or conditions.
 [crate-link]: https://crates.io/crates/celes
 [docs-image]: https://docs.rs/celes/badge.svg
 [docs-link]: https://docs.rs/celes/
-[license-image]: https://img.shields.io/badge/license-Apache2.0-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.53+-blue.svg
+[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
+[msrv-image]: https://img.shields.io/badge/rustc-1.82+-blue.svg
 [maintenance-image]: https://img.shields.io/badge/maintenance-passively--maintained-yellowgreen.svg
-[build-image]: https://travis-ci.com/mikelodder7/celes.svg?branch=master
-[build-link]: https://travis-ci.com/mikelodder7/celes
+[downloads-image]: https://img.shields.io/crates/d/celes.svg

rustfmt.toml

@@ -1 +1,5 @@
+newline_style = "Unix"
+use_field_init_shorthand = true
 reorder_imports = true
+reorder_modules = true
+reorder_impl_items = true