From 8eceb4fe9d0caad5ff774952f6a4fe0e4453635b Mon Sep 17 00:00:00 2001
From: Kodi Arfer <git@arfer.net>
Date: Mon, 26 Dec 2016 14:44:59 -0800
Subject: [PATCH] Move contrib.anaphoric to contrib.extra

---
 docs/contrib/index.rst                             | 5 ++++-
 docs/{contrib => extra}/anaphoric.rst              | 4 ++--
 docs/extra/index.rst                               | 2 ++
 hy/{contrib => extra}/anaphoric.hy                 | 0
 tests/__init__.py                                  | 2 +-
 tests/native_tests/extra/__init__.hy               | 0
 tests/native_tests/{contrib => extra}/anaphoric.hy | 2 +-
 7 files changed, 10 insertions(+), 5 deletions(-)
 rename docs/{contrib => extra}/anaphoric.rst (97%)
 rename hy/{contrib => extra}/anaphoric.hy (100%)
 create mode 100644 tests/native_tests/extra/__init__.hy
 rename tests/native_tests/{contrib => extra}/anaphoric.hy (99%)

diff --git a/docs/contrib/index.rst b/docs/contrib/index.rst
index f9f2d92..79ac3fc 100644
--- a/docs/contrib/index.rst
+++ b/docs/contrib/index.rst
@@ -2,12 +2,15 @@
 Contributor Modules Index
 =========================
 
+These modules are experimental additions to Hy. Once deemed mature,
+they will be moved to the ``hy.extra`` namespace or loaded by
+default.
+
 Contents:
 
 .. toctree::
    :maxdepth: 3
 
-   anaphoric
    flow
    loop
    multi
diff --git a/docs/contrib/anaphoric.rst b/docs/extra/anaphoric.rst
similarity index 97%
rename from docs/contrib/anaphoric.rst
rename to docs/extra/anaphoric.rst
index 40341da..070f87e 100644
--- a/docs/contrib/anaphoric.rst
+++ b/docs/extra/anaphoric.rst
@@ -13,9 +13,9 @@ concise and easy to read.
 
     -- Wikipedia (https://en.wikipedia.org/wiki/Anaphoric_macro)
 
-To use these macros you need to require the hy.contrib.anaphoric module like so:
+To use these macros you need to require the ``hy.extra.anaphoric`` module like so:
 
-``(require [hy.contrib.anaphoric [*]])``
+``(require [hy.extra.anaphoric [*]])``
 
 .. _ap-if:
 
diff --git a/docs/extra/index.rst b/docs/extra/index.rst
index 5cc726f..4748949 100644
--- a/docs/extra/index.rst
+++ b/docs/extra/index.rst
@@ -10,3 +10,5 @@ Contents:
 
 .. toctree::
    :maxdepth: 3
+
+   anaphoric
diff --git a/hy/contrib/anaphoric.hy b/hy/extra/anaphoric.hy
similarity index 100%
rename from hy/contrib/anaphoric.hy
rename to hy/extra/anaphoric.hy
diff --git a/tests/__init__.py b/tests/__init__.py
index 9c11bd9..abed3e7 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -14,7 +14,7 @@ from .native_tests.core import *  # noqa
 from .native_tests.reader_macros import *  # noqa
 from .native_tests.shadow import *  # noqa
 from .native_tests.with_test import *  # noqa
-from .native_tests.contrib.anaphoric import *  # noqa
+from .native_tests.extra.anaphoric import *  # noqa
 from .native_tests.contrib.loop import *  # noqa
 from .native_tests.contrib.meth import *  # noqa
 from .native_tests.contrib.walk import *  # noqa
diff --git a/tests/native_tests/extra/__init__.hy b/tests/native_tests/extra/__init__.hy
new file mode 100644
index 0000000..e69de29
diff --git a/tests/native_tests/contrib/anaphoric.hy b/tests/native_tests/extra/anaphoric.hy
similarity index 99%
rename from tests/native_tests/contrib/anaphoric.hy
rename to tests/native_tests/extra/anaphoric.hy
index 7caec76..f2253d3 100644
--- a/tests/native_tests/contrib/anaphoric.hy
+++ b/tests/native_tests/extra/anaphoric.hy
@@ -19,7 +19,7 @@
 ;; DEALINGS IN THE SOFTWARE.
 
 (import [hy.errors [HyMacroExpansionError]])
-(require [hy.contrib.anaphoric [*]])
+(require [hy.extra.anaphoric [*]])
 
 ;;;; some simple helpers