-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
Move std::io::Cursor to core::io
#156428
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+353
−314
Merged
Move std::io::Cursor to core::io
#156428
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,291 @@ | ||
| /// A `Cursor` wraps an in-memory buffer and provides it with a | ||
| /// [`Seek`] implementation. | ||
| /// | ||
| /// `Cursor`s are used with in-memory buffers, anything implementing | ||
| /// <code>[AsRef]<\[u8]></code>, to allow them to implement [`Read`] and/or [`Write`], | ||
| /// allowing these buffers to be used anywhere you might use a reader or writer | ||
| /// that does actual I/O. | ||
| /// | ||
| /// The standard library implements some I/O traits on various types which | ||
| /// are commonly used as a buffer, like <code>Cursor<[Vec]\<u8>></code> and | ||
| /// <code>Cursor<[&\[u8\]][bytes]></code>. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// We may want to write bytes to a [`File`] in our production | ||
| /// code, but use an in-memory buffer in our tests. We can do this with | ||
| /// `Cursor`: | ||
| /// | ||
| /// [bytes]: crate::slice "slice" | ||
| /// [`File`]: ../../std/fs/struct.File.html | ||
| /// [`Read`]: ../../std/io/trait.Read.html | ||
| /// [`Write`]: ../../std/io/trait.Write.html | ||
| /// [`Seek`]: ../../std/io/trait.Seek.html | ||
| /// [Vec]: ../../alloc/vec/struct.Vec.html | ||
| /// | ||
| /// ```no_run | ||
| /// use std::io::prelude::*; | ||
| /// use std::io::{self, SeekFrom}; | ||
| /// use std::fs::File; | ||
| /// | ||
| /// // a library function we've written | ||
| /// fn write_ten_bytes_at_end<W: Write + Seek>(mut writer: W) -> io::Result<()> { | ||
| /// writer.seek(SeekFrom::End(-10))?; | ||
| /// | ||
| /// for i in 0..10 { | ||
| /// writer.write(&[i])?; | ||
| /// } | ||
| /// | ||
| /// // all went well | ||
| /// Ok(()) | ||
| /// } | ||
| /// | ||
| /// # fn foo() -> io::Result<()> { | ||
| /// // Here's some code that uses this library function. | ||
| /// // | ||
| /// // We might want to use a BufReader here for efficiency, but let's | ||
| /// // keep this example focused. | ||
| /// let mut file = File::create("foo.txt")?; | ||
| /// // First, we need to allocate 10 bytes to be able to write into. | ||
| /// file.set_len(10)?; | ||
| /// | ||
| /// write_ten_bytes_at_end(&mut file)?; | ||
| /// # Ok(()) | ||
| /// # } | ||
| /// | ||
| /// // now let's write a test | ||
| /// #[test] | ||
| /// fn test_writes_bytes() { | ||
| /// // setting up a real File is much slower than an in-memory buffer, | ||
| /// // let's use a cursor instead | ||
| /// use std::io::Cursor; | ||
| /// let mut buff = Cursor::new(vec![0; 15]); | ||
| /// | ||
| /// write_ten_bytes_at_end(&mut buff).unwrap(); | ||
| /// | ||
| /// assert_eq!(&buff.get_ref()[5..15], &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]); | ||
| /// } | ||
| /// ``` | ||
| #[stable(feature = "rust1", since = "1.0.0")] | ||
| #[derive(Debug, Default, Eq, PartialEq)] | ||
| pub struct Cursor<T> { | ||
| inner: T, | ||
| pos: u64, | ||
| } | ||
|
|
||
| impl<T> Cursor<T> { | ||
| /// Creates a new cursor wrapping the provided underlying in-memory buffer. | ||
| /// | ||
| /// Cursor initial position is `0` even if underlying buffer (e.g., [`Vec`]) | ||
| /// is not empty. So writing to cursor starts with overwriting [`Vec`] | ||
| /// content, not with appending to it. | ||
| /// | ||
| /// [`Vec`]: ../../alloc/vec/struct.Vec.html | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use std::io::Cursor; | ||
| /// | ||
| /// let buff = Cursor::new(Vec::new()); | ||
| /// # fn force_inference(_: &Cursor<Vec<u8>>) {} | ||
| /// # force_inference(&buff); | ||
| /// ``` | ||
| #[stable(feature = "rust1", since = "1.0.0")] | ||
| #[rustc_const_stable(feature = "const_io_structs", since = "1.79.0")] | ||
| pub const fn new(inner: T) -> Cursor<T> { | ||
| Cursor { pos: 0, inner } | ||
| } | ||
|
|
||
| /// Consumes this cursor, returning the underlying value. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use std::io::Cursor; | ||
| /// | ||
| /// let buff = Cursor::new(Vec::new()); | ||
| /// # fn force_inference(_: &Cursor<Vec<u8>>) {} | ||
| /// # force_inference(&buff); | ||
| /// | ||
| /// let vec = buff.into_inner(); | ||
| /// ``` | ||
| #[stable(feature = "rust1", since = "1.0.0")] | ||
| pub fn into_inner(self) -> T { | ||
| self.inner | ||
| } | ||
|
|
||
| /// Gets a reference to the underlying value in this cursor. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use std::io::Cursor; | ||
| /// | ||
| /// let buff = Cursor::new(Vec::new()); | ||
| /// # fn force_inference(_: &Cursor<Vec<u8>>) {} | ||
| /// # force_inference(&buff); | ||
| /// | ||
| /// let reference = buff.get_ref(); | ||
| /// ``` | ||
| #[stable(feature = "rust1", since = "1.0.0")] | ||
| #[rustc_const_stable(feature = "const_io_structs", since = "1.79.0")] | ||
| pub const fn get_ref(&self) -> &T { | ||
| &self.inner | ||
| } | ||
|
|
||
| /// Gets a mutable reference to the underlying value in this cursor. | ||
| /// | ||
| /// Care should be taken to avoid modifying the internal I/O state of the | ||
| /// underlying value as it may corrupt this cursor's position. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use std::io::Cursor; | ||
| /// | ||
| /// let mut buff = Cursor::new(Vec::new()); | ||
| /// # fn force_inference(_: &Cursor<Vec<u8>>) {} | ||
| /// # force_inference(&buff); | ||
| /// | ||
| /// let reference = buff.get_mut(); | ||
| /// ``` | ||
| #[stable(feature = "rust1", since = "1.0.0")] | ||
| #[rustc_const_stable(feature = "const_mut_cursor", since = "1.86.0")] | ||
| pub const fn get_mut(&mut self) -> &mut T { | ||
| &mut self.inner | ||
| } | ||
|
|
||
| /// Returns the current position of this cursor. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use std::io::Cursor; | ||
| /// use std::io::prelude::*; | ||
| /// use std::io::SeekFrom; | ||
| /// | ||
| /// let mut buff = Cursor::new(vec![1, 2, 3, 4, 5]); | ||
| /// | ||
| /// assert_eq!(buff.position(), 0); | ||
| /// | ||
| /// buff.seek(SeekFrom::Current(2)).unwrap(); | ||
| /// assert_eq!(buff.position(), 2); | ||
| /// | ||
| /// buff.seek(SeekFrom::Current(-1)).unwrap(); | ||
| /// assert_eq!(buff.position(), 1); | ||
| /// ``` | ||
| #[stable(feature = "rust1", since = "1.0.0")] | ||
| #[rustc_const_stable(feature = "const_io_structs", since = "1.79.0")] | ||
| pub const fn position(&self) -> u64 { | ||
| self.pos | ||
| } | ||
|
|
||
| /// Sets the position of this cursor. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use std::io::Cursor; | ||
| /// | ||
| /// let mut buff = Cursor::new(vec![1, 2, 3, 4, 5]); | ||
| /// | ||
| /// assert_eq!(buff.position(), 0); | ||
| /// | ||
| /// buff.set_position(2); | ||
| /// assert_eq!(buff.position(), 2); | ||
| /// | ||
| /// buff.set_position(4); | ||
| /// assert_eq!(buff.position(), 4); | ||
| /// ``` | ||
| #[stable(feature = "rust1", since = "1.0.0")] | ||
| #[rustc_const_stable(feature = "const_mut_cursor", since = "1.86.0")] | ||
| pub const fn set_position(&mut self, pos: u64) { | ||
| self.pos = pos; | ||
| } | ||
|
|
||
| #[doc(hidden)] | ||
| #[unstable(feature = "core_io_internals", reason = "exposed only for libstd", issue = "none")] | ||
| #[inline] | ||
| pub const fn into_parts_mut(&mut self) -> (&mut u64, &mut T) { | ||
| (&mut self.pos, &mut self.inner) | ||
| } | ||
| } | ||
|
|
||
| impl<T> Cursor<T> | ||
| where | ||
| T: AsRef<[u8]>, | ||
| { | ||
| /// Splits the underlying slice at the cursor position and returns them. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// #![feature(cursor_split)] | ||
| /// use std::io::Cursor; | ||
| /// | ||
| /// let mut buff = Cursor::new(vec![1, 2, 3, 4, 5]); | ||
| /// | ||
| /// assert_eq!(buff.split(), ([].as_slice(), [1, 2, 3, 4, 5].as_slice())); | ||
| /// | ||
| /// buff.set_position(2); | ||
| /// assert_eq!(buff.split(), ([1, 2].as_slice(), [3, 4, 5].as_slice())); | ||
| /// | ||
| /// buff.set_position(6); | ||
| /// assert_eq!(buff.split(), ([1, 2, 3, 4, 5].as_slice(), [].as_slice())); | ||
| /// ``` | ||
| #[unstable(feature = "cursor_split", issue = "86369")] | ||
| pub fn split(&self) -> (&[u8], &[u8]) { | ||
| let slice = self.inner.as_ref(); | ||
| let pos = self.pos.min(slice.len() as u64); | ||
| slice.split_at(pos as usize) | ||
| } | ||
| } | ||
|
|
||
| impl<T> Cursor<T> | ||
| where | ||
| T: AsMut<[u8]>, | ||
| { | ||
| /// Splits the underlying slice at the cursor position and returns them | ||
| /// mutably. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// #![feature(cursor_split)] | ||
| /// use std::io::Cursor; | ||
| /// | ||
| /// let mut buff = Cursor::new(vec![1, 2, 3, 4, 5]); | ||
| /// | ||
| /// assert_eq!(buff.split_mut(), ([].as_mut_slice(), [1, 2, 3, 4, 5].as_mut_slice())); | ||
| /// | ||
| /// buff.set_position(2); | ||
| /// assert_eq!(buff.split_mut(), ([1, 2].as_mut_slice(), [3, 4, 5].as_mut_slice())); | ||
| /// | ||
| /// buff.set_position(6); | ||
| /// assert_eq!(buff.split_mut(), ([1, 2, 3, 4, 5].as_mut_slice(), [].as_mut_slice())); | ||
| /// ``` | ||
| #[unstable(feature = "cursor_split", issue = "86369")] | ||
| pub fn split_mut(&mut self) -> (&mut [u8], &mut [u8]) { | ||
| let slice = self.inner.as_mut(); | ||
| let pos = self.pos.min(slice.len() as u64); | ||
| slice.split_at_mut(pos as usize) | ||
| } | ||
| } | ||
|
|
||
| #[stable(feature = "rust1", since = "1.0.0")] | ||
| impl<T> Clone for Cursor<T> | ||
| where | ||
| T: Clone, | ||
| { | ||
| #[inline] | ||
| fn clone(&self) -> Self { | ||
| Cursor { inner: self.inner.clone(), pos: self.pos } | ||
| } | ||
|
|
||
| #[inline] | ||
| fn clone_from(&mut self, other: &Self) { | ||
| self.inner.clone_from(&other.inner); | ||
| self.pos = other.pos; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,14 @@ | ||
| //! Traits, helpers, and type definitions for core I/O functionality. | ||
|
|
||
| mod borrowed_buf; | ||
| mod cursor; | ||
| mod error; | ||
|
|
||
| #[unstable(feature = "core_io_borrowed_buf", issue = "117693")] | ||
| pub use self::borrowed_buf::{BorrowedBuf, BorrowedCursor}; | ||
| #[unstable(feature = "core_io", issue = "154046")] | ||
| pub use self::cursor::Cursor; | ||
| #[unstable(feature = "core_io", issue = "154046")] | ||
| pub use self::error::ErrorKind; | ||
| #[unstable(feature = "raw_os_error_ty", issue = "107792")] | ||
| pub use self::error::RawOsError; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.