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.

Sign up for GitHub

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

Jump to bottom

Fixed metadata and improved test script #20

Merged
merged 2 commits into from
Jan 7, 2019
Merged

Fixed metadata and improved test script #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af73f6c
Improved Travis-ci script
Razican Jan 2, 2019
a1ba057
Removed appveyor script
Razican Jan 2, 2019
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
32 changes: 27 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,32 @@ language: rust
sudo: false
env:
global:
- RUST_BACKTRACE=1
- RUST_BACKTRACE=1
cache: cargo

matrix:
include:
- rust: nightly
- rust: stable
# Run builds in Linux, MacOS X and Windows
os:
- linux
- osx
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We found this can dramatically slow down test feedback since the queue for Mac machines can get quite long. But it's fine. :)

- windows
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So cool!


# Run builds for all the supported trains
rust:
- 1.19.0
- stable
- beta
- nightly

# Run the multiple tests.
script:
- |
if [[ "$TRAVIS_RUST_VERSION" == "stable" && "$TRAVIS_OS_NAME" == "linux" ]]; then
rustup component add rustfmt &&
cargo fmt --verbose -- --check
fi
- |
if [[ "$TRAVIS_RUST_VERSION" == "stable" && "$TRAVIS_OS_NAME" == "linux" ]]; then
rustup component add clippy &&
cargo clippy --verbose
fi
- cargo test --verbose
3 changes: 1 addition & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ readme = "README.md"
repository = "https://github.com/Hoverbear/getset"

[badges]
travis-ci = { repository = "https://github.com/Hoverbear/getset" }
appveyor = { repository = "https://github.com/Hoverbear/getset", service = "github" }
travis-ci = { repository = "Hoverbear/getset" }

[lib]
proc-macro = true
Expand Down
23 changes: 0 additions & 23 deletions appveyor.yml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/generate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use proc_macro2::{Ident, Span};
use proc_macro2::TokenStream as TokenStream2;
use proc_macro2::{Ident, Span};
use syn::{Attribute, Field, Lit, Meta, MetaNameValue};

pub struct GenParams {
Expand Down Expand Up @@ -133,6 +133,6 @@ pub fn implement(field: &Field, mode: GenMode, params: GenParams) -> TokenStream
}
}
// Don't need to do anything.
None => quote!{},
None => quote! {},
}
}