From b8c7a753d3e6c06190cbe3560610710c48131960 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Mon, 28 Mar 2011 14:56:25 -0500
Subject: [PATCH] removed the re-providing from internal files in the contract
 impl.

---
 collects/mzlib/contract.rkt                         |  6 +++++-
 collects/mzlib/private/contract-arr-checks.rkt      |  3 ++-
 collects/mzlib/private/contract-arr-obj-helpers.rkt |  4 +++-
 collects/mzlib/private/contract-arrow.rkt           |  2 ++
 collects/mzlib/private/contract-mutable.rkt         |  3 ++-
 collects/mzlib/private/contract-object.rkt          |  1 +
 collects/racket/contract/base.rkt                   | 11 ++++++++---
 collects/racket/contract/exists.rkt                 |  4 +++-
 collects/racket/contract/private/arr-i-old.rkt      |  2 ++
 collects/racket/contract/private/arr-i.rkt          |  1 +
 collects/racket/contract/private/arrow.rkt          |  2 ++
 collects/racket/contract/private/base.rkt           |  1 +
 collects/racket/contract/private/box.rkt            |  2 ++
 collects/racket/contract/private/ds.rkt             |  2 ++
 collects/racket/contract/private/guts.rkt           |  4 +---
 collects/racket/contract/private/hash.rkt           |  4 +++-
 collects/racket/contract/private/legacy.rkt         |  2 +-
 collects/racket/contract/private/misc.rkt           |  2 ++
 collects/racket/contract/private/object.rkt         |  1 +
 collects/racket/contract/private/opt-guts.rkt       |  3 ++-
 collects/racket/contract/private/opt.rkt            |  2 ++
 collects/racket/contract/private/struct.rkt         |  4 +++-
 collects/racket/contract/private/vector.rkt         |  4 +++-
 23 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/collects/mzlib/contract.rkt b/collects/mzlib/contract.rkt
index 01f022f5e9..d38bca45f2 100644
--- a/collects/mzlib/contract.rkt
+++ b/collects/mzlib/contract.rkt
@@ -47,6 +47,8 @@
          racket/contract/private/misc
          racket/contract/private/provide
          racket/contract/private/guts
+         racket/contract/private/prop
+         racket/contract/private/blame
          racket/contract/private/ds
          racket/contract/private/opt
          racket/contract/private/basic-opters)
@@ -67,7 +69,9 @@
  (rename-out [string-len/c string/len])
  (except-out (all-from-out racket/contract/private/guts)
              check-flat-contract
-             check-flat-named-contract))
+             check-flat-named-contract)
+ (all-from-out racket/contract/private/prop
+               racket/contract/private/blame))
 
 
 ;; copied here because not provided by racket/contract anymore
diff --git a/collects/mzlib/private/contract-arr-checks.rkt b/collects/mzlib/private/contract-arr-checks.rkt
index 19c887aeec..fbb579d97c 100644
--- a/collects/mzlib/private/contract-arr-checks.rkt
+++ b/collects/mzlib/private/contract-arr-checks.rkt
@@ -1,7 +1,8 @@
 #lang racket/base
 
 (provide (all-defined-out))
-(require racket/contract/private/guts)
+(require racket/contract/private/guts
+         racket/contract/private/blame)
 
 (define empty-case-lambda/c
   (flat-named-contract '(case->)
diff --git a/collects/mzlib/private/contract-arr-obj-helpers.rkt b/collects/mzlib/private/contract-arr-obj-helpers.rkt
index e42183f3cc..df53d20995 100644
--- a/collects/mzlib/private/contract-arr-obj-helpers.rkt
+++ b/collects/mzlib/private/contract-arr-obj-helpers.rkt
@@ -4,7 +4,9 @@
 
 (require (for-syntax scheme/base))
 (require (for-template scheme/base)
-         (for-template racket/contract/private/guts)
+         (for-template racket/contract/private/guts
+                       racket/contract/private/prop
+                       racket/contract/private/blame)
          (for-template "contract-arr-checks.rkt"))
 
 (provide make-/proc ->/h ->*/h ->d/h ->d*/h ->r/h 
diff --git a/collects/mzlib/private/contract-arrow.rkt b/collects/mzlib/private/contract-arrow.rkt
index 34f4d261ff..13da6f298f 100644
--- a/collects/mzlib/private/contract-arrow.rkt
+++ b/collects/mzlib/private/contract-arrow.rkt
@@ -1,6 +1,8 @@
 #lang racket/base
 
 (require racket/contract/private/guts
+         racket/contract/private/blame
+         racket/contract/private/prop
          racket/contract/private/opt
          "contract-arr-checks.rkt")
 (require (for-syntax racket/base)
diff --git a/collects/mzlib/private/contract-mutable.rkt b/collects/mzlib/private/contract-mutable.rkt
index 4e884a4941..e6708f8e8f 100644
--- a/collects/mzlib/private/contract-mutable.rkt
+++ b/collects/mzlib/private/contract-mutable.rkt
@@ -4,7 +4,8 @@
          (only-in racket/contract/private/vector
                   vector-immutableof vector-immutable/c)
          racket/contract/private/blame
-         racket/contract/private/guts)
+         racket/contract/private/guts
+         racket/contract/private/prop)
 
 (provide box/c box-immutable/c
          vector/c vectorof vector-immutableof vector-immutable/c)
diff --git a/collects/mzlib/private/contract-object.rkt b/collects/mzlib/private/contract-object.rkt
index 0188cb4069..31e4896640 100644
--- a/collects/mzlib/private/contract-object.rkt
+++ b/collects/mzlib/private/contract-object.rkt
@@ -1,6 +1,7 @@
 #lang racket/base
 (require "contract-arrow.rkt"
          racket/contract/private/guts
+         racket/contract/private/prop
          racket/private/class-internal
          "contract-arr-checks.rkt")
 
diff --git a/collects/racket/contract/base.rkt b/collects/racket/contract/base.rkt
index d63671714e..17409223f8 100644
--- a/collects/racket/contract/base.rkt
+++ b/collects/racket/contract/base.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-;; A stripped down version of scheme/contract for use in
+;; A stripped down version of racket/contract for use in
 ;; the PLT code base where appropriate.
 
 (require "private/arrow.rkt"
@@ -15,7 +15,9 @@
          "private/guts.rkt"
          "private/legacy.rkt"
          "private/ds.rkt"
-         "private/opt.rkt")
+         "private/opt.rkt"
+         "private/blame.rkt"
+         "private/prop.rkt")
 
 (provide
  opt/c define-opt/c ;(all-from-out "private/opt.rkt")
@@ -41,4 +43,7 @@
  (all-from-out "private/legacy.rkt")
  (except-out (all-from-out "private/guts.rkt")
              check-flat-contract
-             check-flat-named-contract))
+             check-flat-named-contract)
+ 
+ (except-out (all-from-out "private/blame.rkt") make-blame)
+ (all-from-out "private/prop.rkt"))
diff --git a/collects/racket/contract/exists.rkt b/collects/racket/contract/exists.rkt
index 94f15e80b6..86c53a86a3 100644
--- a/collects/racket/contract/exists.rkt
+++ b/collects/racket/contract/exists.rkt
@@ -1,6 +1,8 @@
 #lang racket/base
 
-(require "private/guts.rkt")
+(require "private/guts.rkt"
+         "private/prop.rkt"
+         "private/blame.rkt")
 
 (provide new-∃/c
          new-∀/c
diff --git a/collects/racket/contract/private/arr-i-old.rkt b/collects/racket/contract/private/arr-i-old.rkt
index cafc586d73..ffc640a377 100644
--- a/collects/racket/contract/private/arr-i-old.rkt
+++ b/collects/racket/contract/private/arr-i-old.rkt
@@ -3,6 +3,8 @@
 (require "guts.rkt"
          "arrow.rkt"
          "opt.rkt"
+         "blame.rkt"
+         "prop.rkt"
          racket/stxparam
          
          (for-syntax racket/base
diff --git a/collects/racket/contract/private/arr-i.rkt b/collects/racket/contract/private/arr-i.rkt
index 0b4b47be51..884c4d2558 100644
--- a/collects/racket/contract/private/arr-i.rkt
+++ b/collects/racket/contract/private/arr-i.rkt
@@ -4,6 +4,7 @@
          "prop.rkt"
          "guts.rkt"
          "opt.rkt"
+         "blame.rkt"
          unstable/location
          (for-syntax racket/base
                      racket/stxparam-exptime
diff --git a/collects/racket/contract/private/arrow.rkt b/collects/racket/contract/private/arrow.rkt
index b235331d20..8d7bbb2999 100644
--- a/collects/racket/contract/private/arrow.rkt
+++ b/collects/racket/contract/private/arrow.rkt
@@ -20,6 +20,8 @@ v4 todo:
 
 (require "guts.rkt"
          "opt.rkt"
+         "blame.rkt"
+         "prop.rkt"
          racket/stxparam)
 (require (for-syntax racket/base)
          (for-syntax "opt-guts.rkt")
diff --git a/collects/racket/contract/private/base.rkt b/collects/racket/contract/private/base.rkt
index 6dbe71ba46..1a32f3ae43 100644
--- a/collects/racket/contract/private/base.rkt
+++ b/collects/racket/contract/private/base.rkt
@@ -19,6 +19,7 @@ improve method arity mismatch contract violation error messages?
          unstable/location
          "guts.rkt"
          "blame.rkt"
+         "prop.rkt"
          "arrow.rkt")
 
 (define-syntax-parameter current-contract-region
diff --git a/collects/racket/contract/private/box.rkt b/collects/racket/contract/private/box.rkt
index 0e490990ec..57539902c1 100644
--- a/collects/racket/contract/private/box.rkt
+++ b/collects/racket/contract/private/box.rkt
@@ -1,6 +1,8 @@
 #lang racket/base
 
 (require (for-syntax racket/base)
+         "prop.rkt"
+         "blame.rkt"
          "guts.rkt")
 
 (provide box-immutable/c 
diff --git a/collects/racket/contract/private/ds.rkt b/collects/racket/contract/private/ds.rkt
index ae1313c5a9..0d7c2e73a3 100644
--- a/collects/racket/contract/private/ds.rkt
+++ b/collects/racket/contract/private/ds.rkt
@@ -18,6 +18,8 @@ it around flattened out.
 |#
 
 (require "guts.rkt"
+         "prop.rkt"
+         "blame.rkt"
          "opt.rkt")
 (require (for-syntax scheme/base)
          (for-syntax "ds-helpers.rkt")
diff --git a/collects/racket/contract/private/guts.rkt b/collects/racket/contract/private/guts.rkt
index 13177dc58c..b79cb7f961 100644
--- a/collects/racket/contract/private/guts.rkt
+++ b/collects/racket/contract/private/guts.rkt
@@ -8,9 +8,7 @@
 (require (for-syntax racket/base
                      "helpers.rkt"))
 
-(provide (except-out (all-from-out "blame.rkt") make-blame)
-         (all-from-out "prop.rkt")
-         
+(provide 
          coerce-contract
          coerce-contracts
          coerce-flat-contract
diff --git a/collects/racket/contract/private/hash.rkt b/collects/racket/contract/private/hash.rkt
index b63239de6b..f47a3317b7 100644
--- a/collects/racket/contract/private/hash.rkt
+++ b/collects/racket/contract/private/hash.rkt
@@ -1,7 +1,9 @@
 #lang racket/base
 
 (require (for-syntax racket/base)
-         "guts.ss")
+         "guts.rkt"
+         "blame.rkt"
+         "prop.rkt")
 
 (provide (rename-out [wrap-hash/c hash/c]))
 
diff --git a/collects/racket/contract/private/legacy.rkt b/collects/racket/contract/private/legacy.rkt
index e919c7e27a..0aa7a45a31 100644
--- a/collects/racket/contract/private/legacy.rkt
+++ b/collects/racket/contract/private/legacy.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require "guts.rkt" "blame.rkt" unstable/srcloc)
+(require "guts.rkt" "blame.rkt" "prop.rkt" unstable/srcloc)
 
 (provide make-proj-contract
          raise-contract-error
diff --git a/collects/racket/contract/private/misc.rkt b/collects/racket/contract/private/misc.rkt
index 058ab846d6..a46a3a93bf 100644
--- a/collects/racket/contract/private/misc.rkt
+++ b/collects/racket/contract/private/misc.rkt
@@ -5,6 +5,8 @@
                      "opt-guts.rkt")
          racket/promise
          "opt.rkt"
+         "prop.rkt"
+         "blame.rkt"
          "guts.rkt")
 
 (provide flat-rec-contract
diff --git a/collects/racket/contract/private/object.rkt b/collects/racket/contract/private/object.rkt
index 23132838d8..c6d92b7f47 100644
--- a/collects/racket/contract/private/object.rkt
+++ b/collects/racket/contract/private/object.rkt
@@ -1,6 +1,7 @@
 #lang scheme/base
 (require "arrow.rkt"
          "guts.rkt"
+         "prop.rkt"
          racket/private/class-internal
          scheme/stxparam)
 
diff --git a/collects/racket/contract/private/opt-guts.rkt b/collects/racket/contract/private/opt-guts.rkt
index 84ba4b0c7d..cc80465ecb 100644
--- a/collects/racket/contract/private/opt-guts.rkt
+++ b/collects/racket/contract/private/opt-guts.rkt
@@ -1,7 +1,8 @@
 #lang racket/base
 (require syntax/private/boundmap ;; needs to be the private one, since the public one has contracts
          (for-template racket/base)
-         (for-template "guts.rkt")
+         (for-template "guts.rkt"
+                       "blame.rkt")
          (for-syntax racket/base))
 
 (provide get-opter reg-opter! opter
diff --git a/collects/racket/contract/private/opt.rkt b/collects/racket/contract/private/opt.rkt
index bcdb0dbfe8..71385d1a29 100644
--- a/collects/racket/contract/private/opt.rkt
+++ b/collects/racket/contract/private/opt.rkt
@@ -1,5 +1,7 @@
 #lang racket/base
 (require "guts.rkt"
+         "prop.rkt"
+         "blame.rkt"
          racket/stxparam)
 (require (for-syntax racket/base)
          (for-syntax "opt-guts.rkt")
diff --git a/collects/racket/contract/private/struct.rkt b/collects/racket/contract/private/struct.rkt
index 96ea124a32..747b2c1293 100644
--- a/collects/racket/contract/private/struct.rkt
+++ b/collects/racket/contract/private/struct.rkt
@@ -4,7 +4,9 @@
                      racket/list
                      racket/struct-info)
          racket/list
-         "guts.rkt")
+         "guts.rkt"
+         "blame.rkt"
+         "prop.rkt")
 
 (provide struct/c)
 
diff --git a/collects/racket/contract/private/vector.rkt b/collects/racket/contract/private/vector.rkt
index 0e1f1674d5..e9fbe72b74 100644
--- a/collects/racket/contract/private/vector.rkt
+++ b/collects/racket/contract/private/vector.rkt
@@ -1,7 +1,9 @@
 #lang racket/base
 
 (require (for-syntax racket/base)
-         "guts.ss")
+         "guts.ss"
+         "prop.rkt"
+         "blame.rkt")
 
 (provide (rename-out [wrap-vectorof vectorof]
                      [wrap-vector/c vector/c])