diff options
| author | bors <bors@rust-lang.org> | 2021-09-01 09:06:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-01 09:06:24 +0000 |
| commit | 3ed6c1d23fd40f4367259a531465e809eb00ec27 (patch) | |
| tree | e2bba4bf1319aca82d661cee190109aa018f7603 /compiler/rustc_data_structures/src | |
| parent | 608b5e1c209ffb4d6d0cf83817c823b12bbb7659 (diff) | |
| parent | d31352961c30a123f2ccdb07d843d23943cf0bc4 (diff) | |
| download | rust-3ed6c1d23fd40f4367259a531465e809eb00ec27.tar.gz rust-3ed6c1d23fd40f4367259a531465e809eb00ec27.zip | |
Auto merge of #88556 - m-ou-se:rollup-q636wyd, r=m-ou-se
Rollup of 9 pull requests Successful merges: - #86376 (Emit specific warning to clarify that `#[no_mangle]` should not be applied on foreign statics or functions) - #88040 (BTree: remove Ord bound from new) - #88053 (Fix the flock fallback implementation) - #88350 (add support for clobbering xer, cr, and cr[0-7] for asm! on OpenPower/PowerPC) - #88410 (Remove bolding on associated constants) - #88525 (fix(rustc_typeck): produce better errors for dyn auto trait) - #88542 (Use the return value of readdir_r() instead of errno) - #88548 (Stabilize `Iterator::intersperse()`) - #88551 (Stabilize `UnsafeCell::raw_get()`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/flock.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_data_structures/src/flock.rs b/compiler/rustc_data_structures/src/flock.rs index 4f5d8d7ea48..293ef4caac4 100644 --- a/compiler/rustc_data_structures/src/flock.rs +++ b/compiler/rustc_data_structures/src/flock.rs @@ -222,6 +222,10 @@ cfg_if! { let msg = "file locks not supported on this platform"; Err(io::Error::new(io::ErrorKind::Other, msg)) } + + pub fn error_unsupported(_err: &io::Error) -> bool { + true + } } } } |
