foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

Update sync.rs

Browse source
This commit is contained in:
Matt Mastracci 2023-07-26 12:39:56 -04:00 committed by GitHub
parent 953bd3aedc
commit d2b03b1aea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/fs/sync.rs
View file

@ -45,12 +45,9 @@ mod inner {
#[cfg(not(feature = "sync_fs"))] #[cfg(not(feature = "sync_fs"))]
mod inner { mod inner {
pub use std::rc::Rc as MaybeArc;
<<<<<<< HEAD
=======
use std::ops::Deref; use std::ops::Deref;
use std::ops::DerefMut; use std::ops::DerefMut;
>>>>>>> 2e7254f2a (fix(ext/fs): fix MaybeArc when not sync_fs) pub use std::rc::Rc as MaybeArc;
pub trait MaybeSync {} pub trait MaybeSync {}
impl<T> MaybeSync for T where T: ?Sized {} impl<T> MaybeSync for T where T: ?Sized {}