diff options
| author | bors <bors@rust-lang.org> | 2014-10-08 13:47:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-10-08 13:47:13 +0000 |
| commit | c588e407b9d06d4ce6e105be4f271b21bf0449c6 (patch) | |
| tree | b5105a3c5fd097798348dacc63a054ea12b3815a /src/libstd | |
| parent | eb2240aca311075f4a4625c11956b582eefae9b7 (diff) | |
| parent | 3db9070e9c2a88cf88766d277ffc03ab65e72dec (diff) | |
| download | rust-c588e407b9d06d4ce6e105be4f271b21bf0449c6.tar.gz rust-c588e407b9d06d4ce6e105be4f271b21bf0449c6.zip | |
auto merge of #17866 : jgallagher/rust/reserve-inheritance-keywords, r=huonw
Closes #17862
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/timer.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/io/timer.rs b/src/libstd/io/timer.rs index 55d4073154e..e7df0285540 100644 --- a/src/libstd/io/timer.rs +++ b/src/libstd/io/timer.rs @@ -308,7 +308,7 @@ mod test { } #[test] - fn override() { + fn test_override() { let mut timer = Timer::new().unwrap(); let orx = timer.oneshot(Duration::milliseconds(100)); let prx = timer.periodic(Duration::milliseconds(100)); |