From a074f3dc6d42c96d9e111b0d01a4a652aaa62dca Mon Sep 17 00:00:00 2001
From: Sam Tobin-Hochstadt <samth@racket-lang.org>
Date: Thu, 9 Sep 2010 14:06:43 -0400
Subject: [PATCH] `require' changes

original commit: 7a1b29c8f27328cacc01b34c8e01f0ac361ccc3d
---
 collects/typed-scheme/typecheck/tc-funapp.rkt       |  7 ++-----
 collects/typed-scheme/typecheck/tc-let-unit.rkt     |  8 ++++----
 .../typed-scheme/typecheck/tc-metafunctions.rkt     | 13 ++++++-------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/collects/typed-scheme/typecheck/tc-funapp.rkt b/collects/typed-scheme/typecheck/tc-funapp.rkt
index f4403c78..b2df3743 100644
--- a/collects/typed-scheme/typecheck/tc-funapp.rkt
+++ b/collects/typed-scheme/typecheck/tc-funapp.rkt
@@ -5,11 +5,9 @@
          "tc-app-helper.rkt" "find-annotation.rkt"
          "tc-subst.rkt" "check-below.rkt"
          (prefix-in c: racket/contract)
-         syntax/parse racket/match racket/list 
-	 unstable/sequence unstable/debug
+         syntax/parse racket/match racket/list unstable/sequence
          ;; fixme - don't need to be bound in this phase - only to make syntax/parse happy
-         racket/bool
-         racket/unsafe/ops
+         racket/bool racket/unsafe/ops
          (only-in racket/private/class-internal make-object do-make-object)
          (only-in '#%kernel [apply k:apply])
          ;; end fixme
@@ -17,7 +15,6 @@
          (private type-annotation)
          (types utils abbrev union subtype resolve convenience type-table substitute)
          (utils tc-utils)
-         (only-in srfi/1 alist-delete)
          (except-in (env type-env-structs tvar-env index-env) extend)
          (rep type-rep filter-rep object-rep rep-utils)
          (r:infer infer)
diff --git a/collects/typed-scheme/typecheck/tc-let-unit.rkt b/collects/typed-scheme/typecheck/tc-let-unit.rkt
index aa4a8967..5506bb2f 100644
--- a/collects/typed-scheme/typecheck/tc-let-unit.rkt
+++ b/collects/typed-scheme/typecheck/tc-let-unit.rkt
@@ -1,24 +1,24 @@
 #lang racket/unit
 
-(require (rename-in "../utils/utils.rkt" [infer r:infer]))
-(require "signatures.rkt" "tc-metafunctions.rkt" "tc-subst.rkt"
+(require (rename-in "../utils/utils.rkt" [infer r:infer])
+         "signatures.rkt" "tc-metafunctions.rkt" "tc-subst.rkt"
          "check-below.rkt"
          (types utils convenience)
          (private type-annotation parse-type)
 	 (env lexical-env type-alias-env global-env type-env-structs)
          (rep type-rep)
          syntax/free-vars
-         racket/trace unstable/debug
+         ;racket/trace unstable/debug
          racket/match (prefix-in c: racket/contract)
          (except-in racket/contract -> ->* one-of/c)
          syntax/kerncase syntax/parse
+         unstable/debug
          (for-template 
           racket/base
           "internal-forms.rkt"))
 
 (require (only-in srfi/1/list s:member))
 
-
 (import tc-expr^)
 (export tc-let^)
 
diff --git a/collects/typed-scheme/typecheck/tc-metafunctions.rkt b/collects/typed-scheme/typecheck/tc-metafunctions.rkt
index a047f084..3b6977e8 100644
--- a/collects/typed-scheme/typecheck/tc-metafunctions.rkt
+++ b/collects/typed-scheme/typecheck/tc-metafunctions.rkt
@@ -1,14 +1,13 @@
-#lang scheme/base
+#lang racket/base
 
-(require "../utils/utils.rkt")
-(require (rename-in (types subtype convenience remove-intersect union utils filter-ops)                   
+(require "../utils/utils.rkt"
+         (rename-in (types subtype convenience remove-intersect union utils filter-ops)                   
                     [-> -->]
                     [->* -->*]
                     [one-of/c -one-of/c])
-         (rep type-rep filter-rep rep-utils) scheme/list
-         scheme/contract racket/match unstable/match racket/trace
-         unstable/debug
-         (for-syntax scheme/base))
+         (rep type-rep filter-rep rep-utils) racket/list
+         racket/contract racket/match unstable/match
+         (for-syntax racket/base))
 
 ;; this implements the sequence invariant described on the first page relating to Bot