From 8013f2e8156a2cd44ebbf3a0d329b6d858843ba8 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 18 Jul 2013 19:53:27 -0600
Subject: [PATCH] move `planet/resolver' back to core

In consultation with Sam, partially reverts efba034e01. The default
module name resolver uses `planet/resolver' for the build-in
`(planet ....)' form. The `raco planet' command is still in
"planet-lib", though.
---
 pkgs/planet-lib/planet/lang/reader.rkt                        | 2 +-
 pkgs/planet-lib/planet/util.rkt                               | 4 ++--
 .../lib/collects}/planet/private/linkage.rkt                  | 0
 .../lib/collects}/planet/private/parsereq.rkt                 | 0
 .../lib/collects}/planet/private/resolver.rkt                 | 0
 .../lib/collects}/planet/private/short-syntax-helpers.rkt     | 0
 {pkgs/planet-lib => racket/lib/collects}/planet/resolver.rkt  | 0
 .../planet-lib => racket/lib/collects}/planet/terse-info.rkt  | 0
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename {pkgs/planet-lib => racket/lib/collects}/planet/private/linkage.rkt (100%)
 rename {pkgs/planet-lib => racket/lib/collects}/planet/private/parsereq.rkt (100%)
 rename {pkgs/planet-lib => racket/lib/collects}/planet/private/resolver.rkt (100%)
 rename {pkgs/planet-lib => racket/lib/collects}/planet/private/short-syntax-helpers.rkt (100%)
 rename {pkgs/planet-lib => racket/lib/collects}/planet/resolver.rkt (100%)
 rename {pkgs/planet-lib => racket/lib/collects}/planet/terse-info.rkt (100%)

diff --git a/pkgs/planet-lib/planet/lang/reader.rkt b/pkgs/planet-lib/planet/lang/reader.rkt
index e225b00fcb..a2007ea87a 100644
--- a/pkgs/planet-lib/planet/lang/reader.rkt
+++ b/pkgs/planet-lib/planet/lang/reader.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require syntax/module-reader
-         "../resolver.rkt")
+         planet/resolver)
 
 (provide (rename-out [planet-read read]
                      [planet-read-syntax read-syntax]
diff --git a/pkgs/planet-lib/planet/util.rkt b/pkgs/planet-lib/planet/util.rkt
index 197efaff34..5c34bb3eaf 100644
--- a/pkgs/planet-lib/planet/util.rkt
+++ b/pkgs/planet-lib/planet/util.rkt
@@ -4,9 +4,9 @@
          planet/planet-archives
          
          planet/private/planet-shared
-         "private/linkage.rkt"
+         planet/private/linkage
          
-         "private/resolver.rkt"
+         planet/private/resolver
          "private/version.rkt"
          
          net/url
diff --git a/pkgs/planet-lib/planet/private/linkage.rkt b/racket/lib/collects/planet/private/linkage.rkt
similarity index 100%
rename from pkgs/planet-lib/planet/private/linkage.rkt
rename to racket/lib/collects/planet/private/linkage.rkt
diff --git a/pkgs/planet-lib/planet/private/parsereq.rkt b/racket/lib/collects/planet/private/parsereq.rkt
similarity index 100%
rename from pkgs/planet-lib/planet/private/parsereq.rkt
rename to racket/lib/collects/planet/private/parsereq.rkt
diff --git a/pkgs/planet-lib/planet/private/resolver.rkt b/racket/lib/collects/planet/private/resolver.rkt
similarity index 100%
rename from pkgs/planet-lib/planet/private/resolver.rkt
rename to racket/lib/collects/planet/private/resolver.rkt
diff --git a/pkgs/planet-lib/planet/private/short-syntax-helpers.rkt b/racket/lib/collects/planet/private/short-syntax-helpers.rkt
similarity index 100%
rename from pkgs/planet-lib/planet/private/short-syntax-helpers.rkt
rename to racket/lib/collects/planet/private/short-syntax-helpers.rkt
diff --git a/pkgs/planet-lib/planet/resolver.rkt b/racket/lib/collects/planet/resolver.rkt
similarity index 100%
rename from pkgs/planet-lib/planet/resolver.rkt
rename to racket/lib/collects/planet/resolver.rkt
diff --git a/pkgs/planet-lib/planet/terse-info.rkt b/racket/lib/collects/planet/terse-info.rkt
similarity index 100%
rename from pkgs/planet-lib/planet/terse-info.rkt
rename to racket/lib/collects/planet/terse-info.rkt