Skip to content

Commit 10ca3c8

Browse files
bors[bot]behnam
andcommitted
Merge #248
248: Migrate to Rust 2018 Edition r=behnam a=behnam Using automated cargo fix runs and manual fixes from its hints. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/open-i18n/rust-unic/248) <!-- Reviewable:end --> Co-authored-by: Behnam Esfahbod <[email protected]>
2 parents bb20514 + 06277f9 commit 10ca3c8

File tree

185 files changed

+425
-526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+425
-526
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rust:
77
- nightly
88
- beta
99
- stable
10-
- 1.28.0 # = MIN_RUST_VERSION
10+
- 1.31.0 # = MIN_RUST_VERSION
1111

1212
branches:
1313
except:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[![Travis](https://img.shields.io/travis/open-i18n/rust-unic/master.svg?label=Linux%20build)](https://travis-ci.org/open-i18n/rust-unic/)
66
[![AppVeyor](https://img.shields.io/appveyor/ci/open-i18n/rust-unic/master.svg?label=Windows%20build)](https://ci.appveyor.com/project/open-i18n/rust-unic)
7-
[![Rust-1.28.0+](https://img.shields.io/badge/rustc-1.28+-red.svg#MIN_RUST_VERSION)](https://www.rust-lang.org/)
7+
[![Rust-1.31.0+](https://img.shields.io/badge/rustc-1.28+-red.svg#MIN_RUST_VERSION)](https://www.rust-lang.org/)
88
[![Unicode-10.0.0](https://img.shields.io/badge/unicode-10.0.0-red.svg)](https://www.unicode.org/versions/Unicode10.0.0/)
99
[![Release](https://img.shields.io/github/release/open-i18n/rust-unic.svg)](https://github.com/open-i18n/rust-unic/)
1010
[![Crates.io](https://img.shields.io/crates/v/unic.svg)](https://crates.io/crates/unic/)

apps/cli/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[package]
22
name = "unic-cli"
33
version = "0.8.0"
4+
edition = "2018"
45
authors = ["The UNIC Project Developers"]
56
repository = "https://github.com/open-i18n/rust-unic/"
67
license = "MIT/Apache-2.0"

apps/cli/src/bin/unic-inspector.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ extern crate clap;
1414
#[macro_use]
1515
extern crate prettytable;
1616

17-
extern crate unic;
18-
extern crate unic_cli;
19-
2017
use clap::Arg;
2118
use prettytable::format::TableFormat;
2219
use prettytable::Table;

apps/cli/src/bin/unic-versions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
//! Command-line tool to list versions of UNIC components.
1414
15-
extern crate unic;
15+
use unic;
1616

1717
macro_rules! print_component_desc {
1818
( $component:tt ) => {

apps/cli/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#[macro_use]
1212
extern crate lazy_static;
13-
extern crate regex;
1413

1514
pub mod parsers;
1615
pub mod writers;

apps/cli/tests/quickcheck.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#[macro_use]
1212
extern crate quickcheck;
1313

14-
extern crate unic_cli;
15-
1614
use unic_cli::parsers;
1715
use unic_cli::writers;
1816

apps/cli/tests/test_unic-echo.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
extern crate assert_cli;
12-
1311
use assert_cli::Assert;
1412

1513
// At the moment, there's no way to test stdout value for an exact string, therefore a mix of

gen/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[package]
22
name = "unic-gen"
33
version = "0.0.0"
4+
edition = "2018"
45
authors = ["The UNIC Project Developers"]
56
repository = "https://github.com/open-i18n/rust-unic/"
67
license = "MIT/Apache-2.0"

gen/src/main.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ extern crate lazy_static;
2020
#[macro_use]
2121
extern crate matches;
2222

23-
extern crate itertools;
24-
extern crate regex;
25-
2623
mod source;
2724
mod writer;
2825

0 commit comments

Comments
 (0)