From c7638edf5293dd471d951e64671d60febd0b628c Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Fri, 15 Jun 2018 04:07:09 +0200
Subject: [PATCH] Rename alloc::arc to alloc::sync, to match std::sync

---
 src/liballoc/lib.rs              | 4 ++--
 src/liballoc/{arc.rs => sync.rs} | 0
 src/liballoc/task.rs             | 2 +-
 src/libstd/sync/mod.rs           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/liballoc/{arc.rs => sync.rs} (100%)

diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 9e1740473fea..8ec5a9ed1938 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -40,7 +40,7 @@
 //!
 //! ## Atomically reference counted pointers
 //!
-//! The [`Arc`](arc/index.html) type is the threadsafe equivalent of the `Rc`
+//! The [`Arc`](sync/index.html) type is the threadsafe equivalent of the `Rc`
 //! type. It provides all the same functionality of `Rc`, except it requires
 //! that the contained type `T` is shareable. Additionally, `Arc<T>` is itself
 //! sendable while `Rc<T>` is not.
@@ -164,7 +164,7 @@ mod boxed {
 mod boxed_test;
 pub mod collections;
 #[cfg(target_has_atomic = "ptr")]
-pub mod arc;
+pub mod sync;
 pub mod rc;
 pub mod raw_vec;
 
diff --git a/src/liballoc/arc.rs b/src/liballoc/sync.rs
similarity index 100%
rename from src/liballoc/arc.rs
rename to src/liballoc/sync.rs
diff --git a/src/liballoc/task.rs b/src/liballoc/task.rs
index 7b1947b56b8c..f14fe3a20da9 100644
--- a/src/liballoc/task.rs
+++ b/src/liballoc/task.rs
@@ -18,10 +18,10 @@ pub use self::if_arc::*;
 #[cfg(target_has_atomic = "ptr")]
 mod if_arc {
     use super::*;
-    use arc::Arc;
     use core::marker::PhantomData;
     use core::mem;
     use core::ptr::{self, NonNull};
+    use sync::Arc;
 
     /// A way of waking up a specific task.
     ///
diff --git a/src/libstd/sync/mod.rs b/src/libstd/sync/mod.rs
index 642b284c6c79..e12ef8d9eda2 100644
--- a/src/libstd/sync/mod.rs
+++ b/src/libstd/sync/mod.rs
@@ -18,7 +18,7 @@
 #![stable(feature = "rust1", since = "1.0.0")]
 
 #[stable(feature = "rust1", since = "1.0.0")]
-pub use alloc_crate::arc::{Arc, Weak};
+pub use alloc_crate::sync::{Arc, Weak};
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use core::sync::atomic;