diff options
| author | bors <bors@rust-lang.org> | 2019-04-19 04:04:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-19 04:04:02 +0000 |
| commit | 316a391dcb7d66dc25f1f9a4ec9d368ef7615005 (patch) | |
| tree | 8701a634c23f3bd64688468562f1f57458199d61 /src/libstd | |
| parent | e928e9441157f63a776ba1f8773818838e0912ea (diff) | |
| parent | 3ad9fcccbbfef027386c6f42fe6321c885b04817 (diff) | |
| download | rust-316a391dcb7d66dc25f1f9a4ec9d368ef7615005.tar.gz rust-316a391dcb7d66dc25f1f9a4ec9d368ef7615005.zip | |
Auto merge of #60104 - Centril:rollup-7vmae1a, r=Centril
Rollup of 16 pull requests Successful merges: - #59915 (Implement event filtering for self-profiler.) - #59933 (Make clear that format padding doesn't work for Debug) - #60023 (implement specialized nth_back() for Bytes, Fuse and Enumerate) - #60032 (Remove unwanted z-index change) - #60041 (Simplify the returning of a Result a bit) - #60045 (Suggest appropriate path when calling associated item on bare types) - #60052 (Correct unused parameter diagnostic) - #60056 (Update rustfmt to 1.2.1) - #60060 (whitelist RTM x86 target cpu feature) - #60061 (Change suggestion of field when not in self context) - #60064 (Point at try `?` on errors affecting the err match arm of the desugared code) - #60078 (Use more realistic example for thread builder) - #60080 (Fix small errors in docs for `rchunks_exact` and `rchunks_exact_mut`.) - #60082 (Update miri) - #60097 (Use -mergefunc-use-aliases for any LLVM >= 8) - #60098 (libcore: deny `elided_lifetimes_in_paths`) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fs.rs | 3 | ||||
| -rw-r--r-- | src/libstd/thread/mod.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index dea198d8c91..1772879d013 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -901,8 +901,7 @@ impl OpenOptions { } fn _open(&self, path: &Path) -> io::Result<File> { - let inner = fs_imp::File::open(path, &self.0)?; - Ok(File { inner }) + fs_imp::File::open(path, &self.0).map(|inner| File { inner }) } } diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index c59226e0c0b..fce28ffd9c3 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -269,7 +269,7 @@ impl Builder { /// /// let builder = thread::Builder::new() /// .name("foo".into()) - /// .stack_size(10); + /// .stack_size(32 * 1024); /// /// let handler = builder.spawn(|| { /// // thread code |
