From b19fdcced22d36bd50974e1da3062439e8a656b2 Mon Sep 17 00:00:00 2001
From: Lenny222 <github@kudling.de>
Date: Tue, 17 Jan 2012 19:43:29 +0100
Subject: libstd => libcore

---
 src/libcore/core.rc        |  2 ++
 src/libcore/tuple.rs       | 28 ++++++++++++++++++++++++++++
 src/libstd/std.rc          |  3 +--
 src/libstd/tuple.rs        | 28 ----------------------------
 src/rustdoc/attr_parser.rs |  2 +-
 5 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 src/libcore/tuple.rs
 delete mode 100644 src/libstd/tuple.rs

(limited to 'src')

diff --git a/src/libcore/core.rc b/src/libcore/core.rc
index d97992da618..9fdba5c469b 100644
--- a/src/libcore/core.rc
+++ b/src/libcore/core.rc
@@ -13,6 +13,7 @@ export either, option, result;
 export ctypes, sys, unsafe, comm, task, logging;
 export extfmt;
 export math;
+export tuple;
 
 // Built-in-type support modules
 
@@ -41,6 +42,7 @@ mod unicode;
 mod either;
 mod option;
 mod result;
+mod tuple;
 
 
 // Runtime and language-primitive support
diff --git a/src/libcore/tuple.rs b/src/libcore/tuple.rs
new file mode 100644
index 00000000000..9d24f428d42
--- /dev/null
+++ b/src/libcore/tuple.rs
@@ -0,0 +1,28 @@
+/*
+Module: tuple
+*/
+
+// FIXME #1546: Would rather write fst<T, U>(+pair: (T, U)) -> T
+fn first<T:copy, U:copy>(pair: (T, U)) -> T {
+    let (t, _) = pair;
+    ret t;
+}
+
+fn second<T:copy, U:copy>(pair: (T, U)) -> U {
+    let (_, u) = pair;
+    ret u;
+}
+
+fn swap<T:copy, U:copy>(pair: (T, U)) -> (U, T) {
+    let (t, u) = pair;
+    ret (u, t);
+}
+
+
+#[test]
+fn test_tuple() {
+    assert first((948, 4039.48)) == 948;
+    assert second((34.5, "foo")) == "foo";
+    assert swap(('a', 2)) == (2, 'a');
+}
+
diff --git a/src/libstd/std.rc b/src/libstd/std.rc
index 34297b1aaef..d96b6b7b666 100644
--- a/src/libstd/std.rc
+++ b/src/libstd/std.rc
@@ -12,7 +12,7 @@ export c_vec, four, tri, util;
 export bitv, deque, fun_treemap, list, map, smallintmap, sort, treemap, ufind;
 export rope;
 export ebml, dbg, getopts, json, rand, sha1, term, time;
-export extfmt, test, tempfile, tuple;
+export extfmt, test, tempfile;
 // FIXME: generic_os and os_fs shouldn't be exported
 export generic_os, os, os_fs;
 
@@ -61,7 +61,6 @@ mod md4;
 mod tempfile;
 mod term;
 mod time;
-mod tuple;
 
 #[cfg(unicode)]
 mod unicode;
diff --git a/src/libstd/tuple.rs b/src/libstd/tuple.rs
deleted file mode 100644
index 9d24f428d42..00000000000
--- a/src/libstd/tuple.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Module: tuple
-*/
-
-// FIXME #1546: Would rather write fst<T, U>(+pair: (T, U)) -> T
-fn first<T:copy, U:copy>(pair: (T, U)) -> T {
-    let (t, _) = pair;
-    ret t;
-}
-
-fn second<T:copy, U:copy>(pair: (T, U)) -> U {
-    let (_, u) = pair;
-    ret u;
-}
-
-fn swap<T:copy, U:copy>(pair: (T, U)) -> (U, T) {
-    let (t, u) = pair;
-    ret (u, t);
-}
-
-
-#[test]
-fn test_tuple() {
-    assert first((948, 4039.48)) == 948;
-    assert second((34.5, "foo")) == "foo";
-    assert swap(('a', 2)) == (2, 'a');
-}
-
diff --git a/src/rustdoc/attr_parser.rs b/src/rustdoc/attr_parser.rs
index 5b8b8eeffa1..10e4a8af2fe 100644
--- a/src/rustdoc/attr_parser.rs
+++ b/src/rustdoc/attr_parser.rs
@@ -1,6 +1,6 @@
 import rustc::syntax::ast;
 import rustc::front::attr;
-import std::tuple;
+import core::tuple;
 
 export fn_attrs, arg_attrs;
 export parse_fn;
-- 
cgit 1.4.1-3-g733a5