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

Cherry-pick version bump commit with conflicts

Browse source
This commit is contained in:
Matt Mastracci 2023-07-26 10:44:42 -04:00 committed by mmastrac
parent 89ba3f820c
commit 953bd3aedc
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/fs/sync.rs
View file

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