Skip to content

Commit 8d4867f

Browse files
committed
---
yaml --- r: 220462 b: refs/heads/auto c: 092f4ed h: refs/heads/master v: v3
1 parent a7205e8 commit 8d4867f

File tree

2 files changed

+28
-7
lines changed

2 files changed

+28
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: ff664f3c6cc0b9b530406c2ffb380040b4c4fc88
11+
refs/heads/auto: 092f4ed2de83884661373b6ce7cd217a7b9860ee
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/libstd/io/mod.rs

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -692,17 +692,38 @@ pub trait Write {
692692
}
693693
}
694694

695-
/// An object implementing `Seek` internally has some form of cursor which can
696-
/// be moved within a stream of bytes.
695+
/// The `Seek` trait provides a cursor which can be moved within a stream of
696+
/// bytes.
697697
///
698698
/// The stream typically has a fixed size, allowing seeking relative to either
699699
/// end or the current offset.
700+
///
701+
/// # Examples
702+
///
703+
/// [`File`][file]s implement `Seek`:
704+
///
705+
/// [file]: ../std/fs/struct.File.html
706+
///
707+
/// ```
708+
/// use std::io;
709+
/// use std::fs::File;
710+
/// use std::io::Seek;
711+
/// use std::io::SeekFrom;
712+
///
713+
/// # fn foo() -> io::Result<()> {
714+
/// let mut f = try!(File::open("foo.txt"));
715+
///
716+
/// // move the cursor 42 bytes from the start of the file
717+
/// f.seek(SeekFrom::Start(42)).unwrap();
718+
/// # Ok(())
719+
/// # }
720+
/// ```
700721
#[stable(feature = "rust1", since = "1.0.0")]
701722
pub trait Seek {
702-
/// Seek to an offset, in bytes, in a stream
723+
/// Seek to an offset, in bytes, in a stream.
703724
///
704-
/// A seek beyond the end of a stream is allowed, but seeking before offset
705-
/// 0 is an error.
725+
/// A seek beyond the end of a stream is allowed, but implementation
726+
/// defined.
706727
///
707728
/// The behavior when seeking past the end of the stream is implementation
708729
/// defined.
@@ -712,7 +733,7 @@ pub trait Seek {
712733
///
713734
/// # Errors
714735
///
715-
/// Seeking to a negative offset is considered an error
736+
/// Seeking to a negative offset is considered an error.
716737
#[stable(feature = "rust1", since = "1.0.0")]
717738
fn seek(&mut self, pos: SeekFrom) -> Result<u64>;
718739
}

0 commit comments

Comments
 (0)