about summary refs log tree commit diff
path: root/src/libstd/time
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-01-15 11:59:11 +0000
committerbors <bors@rust-lang.org>2016-01-15 11:59:11 +0000
commit1f4e317e45349eb2d3c853e96bfd24dd574b36d1 (patch)
tree88ad81e57e6ad22f242754edf6143167fda74a5a /src/libstd/time
parenta70a60a02bca4c1fb75a0eb0ecf80acb73972f66 (diff)
parent4f8d584aa586a4e31be3b73233d37cd0ee2ba03b (diff)
downloadrust-1f4e317e45349eb2d3c853e96bfd24dd574b36d1.tar.gz
rust-1f4e317e45349eb2d3c853e96bfd24dd574b36d1.zip
Auto merge of #30929 - Manishearth:rollup, r=Manishearth
- Successful merges: #30591, #30781, #30836, #30864, #30896, #30898, #30908, #30921, #30925
- Failed merges:
Diffstat (limited to 'src/libstd/time')
-rw-r--r--src/libstd/time/mod.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/time/mod.rs b/src/libstd/time/mod.rs
index e3ce8e0de4b..f885733c2d1 100644
--- a/src/libstd/time/mod.rs
+++ b/src/libstd/time/mod.rs
@@ -23,6 +23,7 @@ pub use self::duration::Duration;
 mod duration;
 
 /// A measurement of a monotonically increasing clock.
+///  Opaque and useful only with `Duration`.
 ///
 /// Instants are always guaranteed to be greater than any previously measured
 /// instant when created, and are often useful for tasks such as measuring
@@ -42,8 +43,8 @@ mod duration;
 #[unstable(feature = "time2", reason = "recently added", issue = "29866")]
 pub struct Instant(time::Instant);
 
-/// A measurement of the system clock appropriate for timestamps such as those
-/// on files on the filesystem.
+/// A measurement of the system clock, useful for talking to
+/// external entities like the file system or other processes.
 ///
 /// Distinct from the `Instant` type, this time measurement **is not
 /// monotonic**. This means that you can save a file to the file system, then