Add BufWriter::buffer method #55211

fintelia · 2018-10-19T19:10:02Z

CC #45323

rust-highfive · 2018-10-19T19:10:05Z

r? @shepmaster

(rust_highfive has picked a reviewer for you, use r? to override)

fintelia · 2018-10-24T17:47:29Z

@shepmaster Does this PR look reasonable?

sfackler · 2018-10-24T19:29:05Z

src/libstd/io/buffered.rs

+    /// ```
+    #[unstable(feature = "bufreader_buffer", issue = "45323")]
+    pub fn buffer(&self) -> &[u8] {
+        &self.buf[..]


Nit: This can just be &self.buf.

sfackler · 2018-10-24T19:30:00Z

Could you add a simple test? Looks good otherwise!

shepmaster · 2018-10-26T14:57:11Z

Sorry, I was away at a conference and let this drop off my radar.

add a simple test

You can use BufReader::new(&b"abcd"[..]); to get a very lightweight instance of a BufReader, FWIW.

shepmaster · 2018-10-26T15:29:20Z

BufReader::new(&b"abcd"[..]); to get a very lightweight instance of a BufReader

Of course, I meant BufWriter::new(Vec::new()), not sure why I started talking about readers...

fintelia · 2018-10-31T18:46:10Z

Is this ready for merging at this point?

shepmaster · 2018-10-31T21:30:19Z

src/libstd/io/buffered.rs

+    /// use std::io::BufWriter;
+    /// use std::net::TcpStream;
+    ///
+    /// let mut buf_writer = BufWriter::new(TcpStream::connect("127.0.0.1:34254").unwrap());


This mut is unneeded for this example, right?

I think most other examples return a result to avoid the unwrap:

fn main() -> std::io::Result<()> { let buf_writer = BufWriter::new(TcpStream::connect("127.0.0.1:34254")?);

Check to see what the prevailing pattern is and follow that, please.

shepmaster · 2018-10-31T21:34:45Z

src/libstd/io/buffered.rs

-        let b: &[_] = &[5, 6, 7];
-        assert_eq!(buf, b);
+        assert_eq!(buf, [5, 6, 7]);
+        assert_eq!(*reader.buffer(), []);


These * don't seem to be needed — why did you have to add them?

rust-highfive · 2018-11-01T19:04:15Z

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:01988a04:start=1541093667286994812,finish=1541093721096541729,duration=53809546917
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-5.0
---
[00:53:19] .................................................................................................... 100/4983
[00:53:22] .................................................................................................... 200/4983
[00:53:25] ...........................................................................................ii....... 300/4983
[00:53:27] .........................................................................................iii........ 400/4983
[00:53:30] iiiiiiii.iii...........................iii...........................................i...........i.. 500/4983
[00:53:38] .................................................................................................... 700/4983
[00:53:44] ..................................................................i...........i..................... 800/4983
[00:53:47] ....................................................................................iiiii........... 900/4983
[00:53:51] .................................................................................................... 1000/4983
---
[00:54:28] .................................................................................................... 2200/4983
[00:54:32] .................................................................................................... 2300/4983
[00:54:36] .................................................................................................... 2400/4983
[00:54:40] .................................................................................................... 2500/4983
[00:54:44] ...................................................................iiiiiiiii........................ 2600/4983
[00:54:51] ..................ii................................................................................ 2800/4983
[00:54:54] .................................................................................................... 2900/4983
[00:54:58] .................................................................................................... 3000/4983
[00:55:00] .............i...................................................................................... 3100/4983
---
travis_time:start:test_codegen
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:08:47] 
[01:08:47] running 115 tests
[01:08:50] i..ii...iii..iii.....i...i.........i..iii...........i.....i.....ii...i..i.ii..............i...ii..ii 100/115
[01:08:51] .i....iiii.....
[01:08:51] 
[01:08:51]  finished in 3.684
[01:08:51] travis_fold:end:test_codegen

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:09:06] 
[01:09:06] running 118 tests
[01:09:31] .iiiii...i.....i..i...i..i.i..i.i..i.....i..i....i..........iiii.........i.i....i...i.......ii.i.i.i 100/118
[01:09:35] ......iii.i.....ii
[01:09:35] 
[01:09:35]  finished in 29.329
[01:09:35] travis_fold:end:test_debuginfo

---
[01:28:13] travis_fold:start:test_stage1-std
travis_time:start:test_stage1-std
Testing std stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:28:13]    Compiling std v0.0.0 (/checkout/src/libstd)
[01:28:23] error[E0277]: can't compare `&realstd::vec::Vec<u8>` with `[{integer}; 2]`
[01:28:23]      |
[01:28:23]      |
[01:28:23] 1101 |         assert_eq!(writer.get_ref(), [0, 1]);
[01:28:23]      |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `&realstd::vec::Vec<u8> == [{integer}; 2]`
[01:28:23]      |
[01:28:23]      = help: the trait `core::cmp::PartialEq<[{integer}; 2]>` is not implemented for `&realstd::vec::Vec<u8>`
[01:28:23] 
[01:28:23] 
[01:28:23] error[E0277]: can't compare `&realstd::vec::Vec<u8>` with `[{integer}; 2]`
[01:28:23]      |
[01:28:23]      |
[01:28:23] 1105 |         assert_eq!(writer.get_ref(), [0, 1]);
[01:28:23]      |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `&realstd::vec::Vec<u8> == [{integer}; 2]`
[01:28:23]      |
[01:28:23]      = help: the trait `core::cmp::PartialEq<[{integer}; 2]>` is not implemented for `&realstd::vec::Vec<u8>`
[01:28:23] 
[01:28:23] 
[01:28:23] error[E0277]: can't compare `&realstd::vec::Vec<u8>` with `[{integer}; 2]`
[01:28:23]      |
[01:28:23]      |
[01:28:23] 1109 |         assert_eq!(writer.get_ref(), [0, 1]);
[01:28:23]      |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `&realstd::vec::Vec<u8> == [{integer}; 2]`
[01:28:23]      |
[01:28:23]      = help: the trait `core::cmp::PartialEq<[{integer}; 2]>` is not implemented for `&realstd::vec::Vec<u8>`
[01:28:23] 
[01:28:23] 
[01:28:23] error[E0277]: can't compare `&realstd::vec::Vec<u8>` with `[{integer}; 4]`
[01:28:23]      |
[01:28:23]      |
[01:28:23] 1113 |         assert_eq!(writer.get_ref(), [0, 1, 2, 3]);
[01:28:23]      |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `&realstd::vec::Vec<u8> == [{integer}; 4]`
[01:28:23]      |
[01:28:23]      = help: the trait `core::cmp::PartialEq<[{integer}; 4]>` is not implemented for `&realstd::vec::Vec<u8>`
[01:28:23] 
[01:28:23] 
[01:28:23] error[E0277]: can't compare `&realstd::vec::Vec<u8>` with `[{integer}; 4]`
[01:28:23]      |
[01:28:23]      |
[01:28:23] 1118 |         assert_eq!(writer.get_ref(), [0, 1, 2, 3]);
[01:28:23]      |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `&realstd::vec::Vec<u8> == [{integer}; 4]`
[01:28:23]      |
[01:28:23]      = help: the trait `core::cmp::PartialEq<[{integer}; 4]>` is not implemented for `&realstd::vec::Vec<u8>`
[01:28:23] 
[01:28:23] 
[01:28:23] error[E0277]: can't compare `&realstd::vec::Vec<u8>` with `[{integer}; 6]`
[01:28:23]      |
[01:28:23]      |
[01:28:23] 1122 |         assert_eq!(writer.get_ref(), [0, 1, 2, 3, 4, 5]);
[01:28:23]      |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `&realstd::vec::Vec<u8> == [{integer}; 6]`
[01:28:23]      |
[01:28:23]      = help: the trait `core::cmp::PartialEq<[{integer}; 6]>` is not implemented for `&realstd::vec::Vec<u8>`
[01:28:23] 
[01:28:23] 
[01:28:23] error[E0277]: can't compare `&realstd::vec::Vec<u8>` with `[{integer}; 9]`
[01:28:23]      |
[01:28:23]      |
[01:28:23] 1126 |         assert_eq!(writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8]);
[01:28:23]      |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `&realstd::vec::Vec<u8> == [{integer}; 9]`
[01:28:23]      |
[01:28:23]      = help: the trait `core::cmp::PartialEq<[{integer}; 9]>` is not implemented for `&realstd::vec::Vec<u8>`
[01:28:23] 
[01:28:23] 
[01:28:23] error[E0277]: can't compare `&realstd::vec::Vec<u8>` with `[{integer}; 12]`
[01:28:23]      |
[01:28:23]      |
[01:28:23] 1130 |         assert_eq!(writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
[01:28:23]      |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `&realstd::vec::Vec<u8> == [{integer}; 12]`
[01:28:23]      |
[01:28:23]      = help: the trait `core::cmp::PartialEq<[{integer}; 12]>` is not implemented for `&realstd::vec::Vec<u8>`
[01:28:23] 
[01:28:23] 
[01:28:23] error[E0277]: can't compare `&realstd::vec::Vec<u8>` with `[{integer}; 12]`
[01:28:23]      |
[01:28:23]      |
[01:28:23] 1134 |         assert_eq!(writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
[01:28:23]      |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `&realstd::vec::Vec<u8> == [{integer}; 12]`
[01:28:23]      |
[01:28:23]      = help: the trait `core::cmp::PartialEq<[{integer}; 12]>` is not implemented for `&realstd::vec::Vec<u8>`
[01:28:23] 
[01:28:30] error: aborting due to 9 previous errors
[01:28:30] 
[01:28:30] For more information about this error, try `rustc --explain E0277`.
[01:28:30] For more information about this error, try `rustc --explain E0277`.
[01:28:30] error: Could not compile `std`.
[01:28:30] 
[01:28:30] To learn more, run the command again with --verbose.
[01:28:30] 
[01:28:30] 
[01:28:30] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "std" "--" "--quiet"
[01:28:30] 
[01:28:30] 
[01:28:30] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:28:30] Build completed unsuccessfully in 0:39:03
[01:28:30] Build completed unsuccessfully in 0:39:03
[01:28:30] make: *** [check] Error 1
[01:28:30] Makefile:58: recipe for target 'check' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:00927a04
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

shepmaster · 2018-11-01T21:35:10Z

Looks OK to me — care to hit it with a rebase and force-push and we'll be on our way!

TimNN · 2018-11-13T18:35:12Z

Ping from triage @shepmaster: it looks like the PR has been rebased and is ready for a final review.

shepmaster · 2018-11-13T19:16:08Z

@bors r+ rollup

bors · 2018-11-13T19:16:13Z

📌 Commit 59a0309 has been approved by shepmaster

shepmaster · 2018-11-13T19:16:30Z

Argh; I forget GH doesn't ping for force pushes — sorry!

…ster Add BufWriter::buffer method CC rust-lang#45323

Rollup of 16 pull requests Successful merges: - #54906 (Reattach all grandchildren when constructing specialization graph.) - #55182 (Redox: Update to new changes) - #55211 (Add BufWriter::buffer method) - #55507 (Add link to std::mem::size_of to size_of intrinsic documentation) - #55530 (Speed up String::from_utf16) - #55556 (Use `Mmap` to open the rmeta file.) - #55622 (NetBSD: link libstd with librt in addition to libpthread) - #55827 (A few tweaks to iterations/collecting) - #55901 (fix various typos in doc comments) - #55926 (Change sidebar selector to fix compatibility with docs.rs) - #55930 (A handful of hir tweaks) - #55932 (core/char: Speed up `to_digit()` for `radix <= 10`) - #55935 (appveyor: Use VS2017 for all our images) - #55936 (save-analysis: be even more aggressive about ignorning macro-generated defs) - #55948 (submodules: update clippy from d8b4269 to 7e0ddef) - #55956 (add tests for some fixed ICEs)

…ster Add BufWriter::buffer method CC rust-lang#45323

@ghost

Rollup of 17 pull requests Successful merges: - #55182 (Redox: Update to new changes) - #55211 (Add BufWriter::buffer method) - #55507 (Add link to std::mem::size_of to size_of intrinsic documentation) - #55530 (Speed up String::from_utf16) - #55556 (Use `Mmap` to open the rmeta file.) - #55622 (NetBSD: link libstd with librt in addition to libpthread) - #55750 (Make `NodeId` and `HirLocalId` `newtype_index`) - #55778 (Wrap some query results in `Lrc`.) - #55781 (More precise spans for temps and their drops) - #55785 (Add mem::forget_unsized() for forgetting unsized values) - #55852 (Rewrite `...` as `..=` as a `MachineApplicable` 2018 idiom lint) - #55865 (Unix RwLock: avoid racy access to write_locked) - #55901 (fix various typos in doc comments) - #55926 (Change sidebar selector to fix compatibility with docs.rs) - #55930 (A handful of hir tweaks) - #55932 (core/char: Speed up `to_digit()` for `radix <= 10`) - #55956 (add tests for some fixed ICEs) Failed merges: r? @ghost

rust-highfive assigned shepmaster Oct 19, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 19, 2018

sfackler reviewed Oct 24, 2018

View reviewed changes

shepmaster reviewed Oct 31, 2018

View reviewed changes

fintelia added 4 commits November 2, 2018 13:39

Add BufWriter::buffer method

7eece47

Add some tests

07d966d

Suggested edits

40e4144

Fix compile errors in test

59a0309

fintelia force-pushed the bufwriter-buffer branch from 72fbba0 to 59a0309 Compare November 2, 2018 17:40

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 13, 2018

kennytm added a commit to kennytm/rust that referenced this pull request Nov 14, 2018

Rollup merge of rust-lang#55211 - fintelia:bufwriter-buffer, r=shepma…

2544286

…ster Add BufWriter::buffer method CC rust-lang#45323

kennytm mentioned this pull request Nov 14, 2018

Rollup of 16 pull requests #55943

Closed

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Nov 15, 2018

Rollup merge of rust-lang#55211 - fintelia:bufwriter-buffer, r=shepma…

b20bba4

…ster Add BufWriter::buffer method CC rust-lang#45323

pietroalbini mentioned this pull request Nov 15, 2018

Rollup of 17 pull requests #55974

Merged

bors merged commit 59a0309 into rust-lang:master Nov 15, 2018

SimonSapin mentioned this pull request Nov 19, 2018

Use Mmap to open the rmeta file. #55556

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add BufWriter::buffer method #55211

Add BufWriter::buffer method #55211

fintelia commented Oct 19, 2018

rust-highfive commented Oct 19, 2018

fintelia commented Oct 24, 2018

sfackler Oct 24, 2018

sfackler commented Oct 24, 2018

shepmaster commented Oct 26, 2018

shepmaster commented Oct 26, 2018

fintelia commented Oct 31, 2018

shepmaster Oct 31, 2018

shepmaster Oct 31, 2018

shepmaster Oct 31, 2018

rust-highfive commented Nov 1, 2018

shepmaster commented Nov 1, 2018

TimNN commented Nov 13, 2018

shepmaster commented Nov 13, 2018

bors commented Nov 13, 2018

shepmaster commented Nov 13, 2018

Add BufWriter::buffer method #55211

Add BufWriter::buffer method #55211

Conversation

fintelia commented Oct 19, 2018

rust-highfive commented Oct 19, 2018

fintelia commented Oct 24, 2018

sfackler Oct 24, 2018

Choose a reason for hiding this comment

sfackler commented Oct 24, 2018

shepmaster commented Oct 26, 2018

shepmaster commented Oct 26, 2018

fintelia commented Oct 31, 2018

shepmaster Oct 31, 2018

Choose a reason for hiding this comment

shepmaster Oct 31, 2018

Choose a reason for hiding this comment

shepmaster Oct 31, 2018

Choose a reason for hiding this comment

rust-highfive commented Nov 1, 2018

shepmaster commented Nov 1, 2018

TimNN commented Nov 13, 2018

shepmaster commented Nov 13, 2018

bors commented Nov 13, 2018

shepmaster commented Nov 13, 2018