Skip to content

Rollup of 10 pull requests #140547

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

Closed
wants to merge 21 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cf26d82
chore: remove redundant words in comment
pudongair Mar 26, 2025
d81559a
Refactor `diy_float`
TDecking Mar 31, 2025
5a20701
Change signature of File::try_lock and File::try_lock_shared
cberner Apr 4, 2025
7302f8e
Implement error::Error for TryLockError
cberner Apr 6, 2025
e5fb426
docs: Add example to `Iterator::take` with `by_ref`
ongardie Apr 14, 2025
0369ccb
Fix some grammar errors and hyperlinks in doc for `trait Allocator`
Lee-Janggun Apr 14, 2025
31cb737
simd_select_bitmask: the 'padding' bits in the mask are just ignored
RalfJung Apr 19, 2025
3a372e3
std: mention `remove_dir_all` can emit `DirectoryNotEmpty` when concu…
xizheyin Apr 20, 2025
e9d2fef
stop check paren if has different ctx
bvanjoi Apr 29, 2025
d9c060b
Optimize the codegen for `Span::from_expansion`
Jarcho Apr 29, 2025
00f25a8
interpret: better error message for out-of-bounds pointer arithmetic …
RalfJung Apr 30, 2025
64ba474
Rollup merge of #134034 - bvanjoi:issue-131655, r=petrochenkov
Zalathar May 1, 2025
a5ffdb8
Rollup merge of #138703 - pudongair:master, r=workingjubilee
Zalathar May 1, 2025
b06dbd0
Rollup merge of #139186 - TDecking:float, r=workingjubilee
Zalathar May 1, 2025
485270d
Rollup merge of #139343 - cberner:filelock_wouldblock, r=workingjubilee
Zalathar May 1, 2025
76fa362
Rollup merge of #139780 - ongardie:iterator-take-by_ref-example, r=wo…
Zalathar May 1, 2025
a471fe9
Rollup merge of #139802 - Lee-Janggun:fix-allocate-hyperlink, r=worki…
Zalathar May 1, 2025
c4da0f3
Rollup merge of #140034 - RalfJung:simd_select_bitmask-padding, r=wor…
Zalathar May 1, 2025
5d78430
Rollup merge of #140062 - xizheyin:issue-139958, r=workingjubilee
Zalathar May 1, 2025
ca45af0
Rollup merge of #140485 - Jarcho:from_expansion_opt, r=petrochenkov
Zalathar May 1, 2025
582dbdd
Rollup merge of #140521 - RalfJung:oob-error, r=saethlin
Zalathar May 1, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Implement error::Error for TryLockError
  • Loading branch information
cberner committed Apr 6, 2025
commit 7302f8eecd1bb3502c7189514ff00990af0988fc
5 changes: 4 additions & 1 deletion library/std/src/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
mod tests;

use crate::ffi::OsString;
use crate::fmt;
use crate::io::{self, BorrowedCursor, IoSlice, IoSliceMut, Read, Seek, SeekFrom, Write};
use crate::path::{Path, PathBuf};
use crate::sealed::Sealed;
use crate::sync::Arc;
use crate::sys::fs as fs_imp;
use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
use crate::time::SystemTime;
use crate::{error, fmt};

/// An object providing access to an open file on the filesystem.
///
Expand Down Expand Up @@ -368,6 +368,9 @@ pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) -> io::Result
inner(path.as_ref(), contents.as_ref())
}

#[unstable(feature = "file_lock", issue = "130994")]
impl error::Error for TryLockError {}

#[unstable(feature = "file_lock", issue = "130994")]
impl fmt::Debug for TryLockError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
Expand Down
Loading