Skip to content

Commit 09eec43

Browse files
bors[bot]behnam
andauthored
Merge #276
276: Update to Rust/Cargo 1.45+ r=behnam a=behnam - Fix some compiler warnings. - Use `std::char::UNICODE_VERSION`, stabilized in Rust 1.4.50. - Clippy: update the rule control syntax, and fix a few warnings. <!-- 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/276) <!-- Reviewable:end --> Co-authored-by: Behnam Esfahbod <[email protected]>
2 parents 89f5f55 + 9d0a20d commit 09eec43

Some content is hidden

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

62 files changed

+75
-198
lines changed

.appveyor.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.bors.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
status = [
2-
"continuous-integration/travis-ci/push",
3-
"continuous-integration/appveyor/branch"
2+
"continuous-integration/travis-ci/push"
43
]

.travis.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rust:
77
- nightly
88
- beta
99
- stable
10-
- 1.31.0 # = MIN_RUST_VERSION
10+
- 1.45.0 # = MIN_RUST_VERSION
1111

1212
branches:
1313
except:
@@ -26,23 +26,18 @@ env:
2626
- RUST_BACKTRACE=full
2727

2828
script:
29-
- cargo build --verbose --all
30-
- cargo doc --verbose --all --no-deps
29+
- cargo build --verbose --workspace
30+
- cargo doc --verbose --workspace --no-deps
3131

32-
- cargo test --verbose --all
33-
- cargo test --verbose --all --features serde
32+
- cargo test --verbose --workspace
3433

3534
# unic-ucd-normal is used in unic-ucd with non-default feature
3635
- cargo test --verbose --manifest-path unic/ucd/normal/Cargo.toml
3736

3837
# == Nightly-only ==
3938

4039
- test "$TRAVIS_RUST_VERSION" != "nightly" ||
41-
cargo test --verbose --all --all-features
42-
43-
# This takes too long, let's disable for now.
44-
- test "$TRAVIS_RUST_VERSION" != "nightly" ||
45-
cargo build --benches --verbose --all --features 'bench_it'
40+
cargo test --verbose --workspace --all-features
4641

4742
# TODO: - rustdoc --test README.md -L target/debug -L target/debug/deps
4843

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.31.0+](https://img.shields.io/badge/rustc-1.31+-red.svg#MIN_RUST_VERSION)](https://www.rust-lang.org/)
7+
[![Rust-1.45+](https://img.shields.io/badge/rustc-1.45+-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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,3 @@ quickcheck = "0.6"
2626
maintenance = { status = "actively-developed" }
2727
is-it-maintained-issue-resolution = { repository = "open-i18n/rust-unic" }
2828
is-it-maintained-open-issues = { repository = "open-i18n/rust-unic" }
29-
appveyor = { repository = "open-i18n/rust-unic", branch = "master", service = "github" }
30-
travis-ci = { repository = "open-i18n/rust-unic", branch = "master" }

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212

1313
//! Command-line tool to list versions of UNIC components.
1414
15-
use unic;
16-
1715
macro_rules! print_component_desc {
1816
( $component:tt ) => {
1917
println!("Component: {}", unic::$component::PKG_DESCRIPTION);

etc/cargo-clippy-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# option. This file may not be copied, modified, or distributed
1111
# except according to those terms.
1212

13-
# Since `cargo publish --all` does not exist yet, we use this dumb alternative
14-
# solution for now.
13+
# Since `cargo clippy --workspace` does not exist yet, we use this dumb
14+
# alternative solution for now.
1515
#
1616
# Main downside of this approch is that there are separate `target/`
1717
# directories used for each component, increasing the test and publish process

etc/cargo-package-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# option. This file may not be copied, modified, or distributed
1111
# except according to those terms.
1212

13-
# Since `cargo package --all` does not exist yet, we use this dumb alternative
14-
# solution for now.
13+
# Since `cargo package --workspace` does not exist yet, we use this dumb
14+
# alternative solution for now.
1515
#
1616
# Main downside of this approch is that there are separate `target/`
1717
# directories used for each component, increasing the test and publish process

etc/cargo-publish-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# option. This file may not be copied, modified, or distributed
1111
# except according to those terms.
1212

13-
# Since `cargo publish --all` does not exist yet, we use this dumb alternative
14-
# solution for now.
13+
# Since `cargo publish --workspaces` does not exist yet, we use this dumb
14+
# alternative solution for now.
1515
#
1616
# Main downside of this approch is that there are separate `target/`
1717
# directories used for each component, increasing the test and publish process

etc/cargo-test-all.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
# option. This file may not be copied, modified, or distributed
1111
# except according to those terms.
1212

13-
# Since `cargo publish --all` does not exist yet, we use this dumb alternative
14-
# solution for now.
13+
# Since `cargo publish --workspace` does not exist yet, we use this dumb
14+
# alternative solution for now to test all components in their isolated form,
15+
# before publishing them.
1516
#
1617
# Main downside of this approch is that there are separate `target/`
1718
# directories used for each component, increasing the test and publish process

0 commit comments

Comments
 (0)