diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-08 10:55:45 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-08 10:55:45 +0000 |
| commit | 1d52964df7abf9fba09933470d5c3dcce96760c4 (patch) | |
| tree | d4921a45aa3f6b7df0ee74aec5663dc862536fb1 | |
| parent | 60478f3623340c96c955b04cfc03a40f42536660 (diff) | |
| parent | e7586f4a8abf6204ae505cdd541f80d08051b617 (diff) | |
Merge #137
137: impl Default for Duration r=japaric a=japaric
closes #134
Co-authored-by: Jorge Aparicio <jorge@japaric.io>
| -rw-r--r-- | ci/script.sh | 4 | ||||
| -rw-r--r-- | src/lib.rs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ci/script.sh b/ci/script.sh index 0244c58..3dd60de 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -118,6 +118,10 @@ if [ -z ${TRAVIS_RUST_VERSION-} ]; then esac fi +if [ -z ${TARGET-} ]; then + TARGET=$(rustc -Vv | grep host | cut -d ' ' -f2) +fi + if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST != false ]; then main fi @@ -197,7 +197,7 @@ impl PartialOrd for Instant { /// A `Duration` type to represent a span of time. /// /// This data type is only available when the `timer-queue` feature is enabled -#[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd)] +#[derive(Clone, Copy, Default, Eq, Ord, PartialEq, PartialOrd)] #[cfg(feature = "timer-queue")] pub struct Duration(u32); |
