From 7ada9c87cc7490b547d0538d9dfb794864e37f8b Mon Sep 17 00:00:00 2001 From: tiif Date: Fri, 15 Nov 2024 12:29:32 +0000 Subject: [PATCH] Remove accidentally committed swp file and remove the first fix attempt --- tokio/src/runtime/io/.registration_set.rs.swp | Bin 16384 -> 0 bytes tokio/src/runtime/io/registration_set.rs | 2 -- 2 files changed, 2 deletions(-) delete mode 100644 tokio/src/runtime/io/.registration_set.rs.swp diff --git a/tokio/src/runtime/io/.registration_set.rs.swp b/tokio/src/runtime/io/.registration_set.rs.swp deleted file mode 100644 index b327a0f86cfdd0622c0741b07bc46f34f2470499..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeHOON<;x8SWSy48#eq15$!icEmChW_#BrIJo_g9A!;badyq@I(A~A*`Ds2o!0hr zHC5H#tj#(SNJs<;#Rw!$a6w411i3^)1UO&B1MD)5*N7f{Z-x5-7~w3 z%?Y7y`Ez@^>+#q3KdS1lc7Oh<#V6Tu_lSe*eU1}8{K)$Cza4PC^t~BpeK@P5Xh3iF zyh46uHsoqUi*%M}vq#-18A#uinbNbdpRBt=u2Tco^9JX%*oZ{_x01n}%n}`q_#7Te zz8)zpeI1FUr?_^d+OzNGWy3(jz-=&)>A~!$4mzJWdSsqTKX~{M```yI+(yNwNW(zG zK*K=8K*K=8K*K=8K*K=8!2b&aI^E|yhr#U22Q

cTL>ik^i2_@5#jb{AY7(7-$%1 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 TE@#@xnX%^4VKa2Px$XQL diff --git a/tokio/src/runtime/io/registration_set.rs b/tokio/src/runtime/io/registration_set.rs index da4c42f76d4..eaaedb0d0fe 100644 --- a/tokio/src/runtime/io/registration_set.rs +++ b/tokio/src/runtime/io/registration_set.rs @@ -62,8 +62,6 @@ impl RegistrationSet { // Push a ref into the list of all resources. synced.registrations.push_front(ret.clone()); - // Fix miri error in https://github.com/tokio-rs/tokio/issues/6926 - super::EXPOSE_IO.expose_provenance(&*ret); Ok(ret) }