mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-23 20:22:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge #137

Browse source 
137: impl Default for Duration r=japaric a=japaric

closes #134

Co-authored-by: Jorge Aparicio <jorge@japaric.io>
This commit is contained in:
bors[bot] 2019-02-08 10:55:45 +00:00
commit 1d52964df7
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ci/script.sh
View file

@ -118,6 +118,10 @@ if [ -z ${TRAVIS_RUST_VERSION-} ]; then
esac esac
fi fi
if [ -z ${TARGET-} ]; then
TARGET=$(rustc -Vv | grep host | cut -d ' ' -f2)
fi
if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST != false ]; then if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST != false ]; then
main main
fi fi

2
src/lib.rs
View file

@ -197,7 +197,7 @@ impl PartialOrd for Instant {
/// A `Duration` type to represent a span of time. /// A `Duration` type to represent a span of time.
/// ///
/// This data type is only available when the `timer-queue` feature is enabled /// 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")] #[cfg(feature = "timer-queue")]
pub struct Duration(u32); pub struct Duration(u32);