Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependencies, follow rustfmt and clippy #60

Closed
wants to merge 11 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
toolchain: ["stable", "beta"]
toolchain: ["stable", "beta", "1.58.0"]
coverage: [false]
include:
- toolchain: "nightly"
Expand Down
14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@ readme = "README.md"
bincode = "1.3"
either = "1.8"
fnv = "1.0"
itertools = ">=0.10, <=0.11"
lazy_static = "1.4"
itertools = ">=0.10, <= 0.12"
nom = "7.1"
quick-xml = "0.28"
once_cell = "1.0"
quick-xml = ">=0.28, <= 0.31"
regex = "1.7"
regex-cache = "0.2"
serde = "1.0"
serde_derive = "1.0"
strum = { version = "0.24", features = ["derive"] }
strum = { version = ">=0.24, <=0.25", features = ["derive"] }
thiserror = "1.0"

[build-dependencies]
bincode = "1.3"
quick-xml = "0.28"
quick-xml = ">=0.28, <=0.31"
regex = "1.7"
serde = "1.0"
serde_derive = "1.0"
thiserror = "1.0"

[dev-dependencies]
doc-comment = "0.3"
rstest = "0.17"
rstest_reuse = "0.5"
rstest = ">= 0.13, <=0.18"
rstest_reuse = "0.6"
anyhow = "1"
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)

Rust version of [libphonenumber](https://github.com/googlei18n/libphonenumber).
We currently require 1.58.0 as minimum supported Rust version (MSRV).

## Usage

Expand All @@ -20,8 +21,6 @@ phonenumber = "0.3"
The following example parses, validates and formats the given phone number.

```rust,no_run
extern crate phonenumber;

use phonenumber::Mode;
use std::env;

Expand Down
9 changes: 0 additions & 9 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,6 @@ use std::fs::File;
use std::io::{BufReader, BufWriter};
use std::path::Path;

extern crate quick_xml as xml;
extern crate regex;
extern crate thiserror;

extern crate serde;
#[macro_use]
extern crate serde_derive;
extern crate bincode;

use bincode::Options;

#[path = "src/metadata/loader.rs"]
Expand Down
Empty file added clippy.toml
Empty file.
1 change: 0 additions & 1 deletion examples/test.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::env;

extern crate phonenumber;
use phonenumber::Mode;

fn main() {
Expand Down
3 changes: 2 additions & 1 deletion src/carrier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use serde_derive::{Deserialize, Serialize};
use std::fmt;
use std::ops::Deref;

Expand Down Expand Up @@ -40,7 +41,7 @@ impl AsRef<str> for Carrier {
}

impl fmt::Display for Carrier {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", self.0)
}
}
Loading
Loading