Remove Option from BufWriter #87171
Merged
Remove Option from BufWriter #87171
Conversation
This file contains 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
|
(rust-highfive has picked a reviewer for you, use r? to override) |
the8472
reviewed
Jul 15, 2021
|
Actually, does this need any unsafe at all? Plain destructuring should work. |
|
No, destructuring by value for types impl'ing drop doesn't work - https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=b5e4339d6b72e25199a3d02d47004108 |
25ff036 to
9aea03f
Compare
|
Fixed the merge conflict, I was accidentally 11k commits behind master 😅 |
SkiFire13
reviewed
Jul 16, 2021
Comment on lines
341
to
345
| let inner = ptr::read(&mut self.inner); | ||
| let buf = ptr::read(&mut self.buf); | ||
| let buf = if !self.panicked { Ok(buf) } else { Err(WriterPanicked { buf }) }; | ||
|
|
||
| mem::forget(self); |
There was a problem hiding this comment.
OT: this makes me wonder if we should have a way to destructure a struct that implements Drop without running its drop implementation (and maybe also a way with running it?). It feels bad having to use unsafe for this kind of stuff since it's simple enough that the compiler should be able to guarantee its safety in the general case.
9aea03f to
8837bf1
Compare
|
@bors r+ |
|
📌 Commit 8837bf1 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 23, 2021
Rollup of 14 pull requests Successful merges: - rust-lang#86410 (VecMap::get_value_matching should return just one element) - rust-lang#86790 (Document iteration order of `retain` functions) - rust-lang#87171 (Remove Option from BufWriter) - rust-lang#87175 (Stabilize `into_parts()` and `into_error()`) - rust-lang#87185 (Fix panics on Windows when the build was cancelled) - rust-lang#87191 (Package LLVM libs for the target rather than the build host) - rust-lang#87255 (better support for running libcore tests with Miri) - rust-lang#87266 (Add testcase for 87076) - rust-lang#87283 (Add `--codegen-backends=foo,bar` configure flag) - rust-lang#87322 (fix: clarify suggestion that `&T` must refer to `T: Sync` for `&T: Send`) - rust-lang#87358 (Fix `--dry-run` when download-ci-llvm is set) - rust-lang#87380 (Don't default to `submodules = true` unless the rust repo has a .git directory) - rust-lang#87398 (Add test for fonts used for module items) - rust-lang#87412 (Add missing article) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #72925