From 0bca91fee06217b9ba0af5b86cd3f0fee25b22d2 Mon Sep 17 00:00:00 2001
From: Jack Firth <jackhfirth@gmail.com>
Date: Thu, 26 Jun 2025 22:42:13 -0700
Subject: [PATCH 1/9] Use `define-deprecated-alias` for legacy aliases

---
 typed-racket-lib/typed/racket/base.rkt | 115 +++++++++++++++++++++++--
 1 file changed, 109 insertions(+), 6 deletions(-)

diff --git a/typed-racket-lib/typed/racket/base.rkt b/typed-racket-lib/typed/racket/base.rkt
index 41d8807fe..a94144cd0 100644
--- a/typed-racket-lib/typed/racket/base.rkt
+++ b/typed-racket-lib/typed/racket/base.rkt
@@ -15,15 +15,118 @@
            (basics #%module-begin #%top-interaction)
            (ts-except with-type-shallow with-type-optional))
 
-(require typed-racket/base-env/extra-procs
+(require racket/deprecation
+         typed-racket/base-env/extra-procs
          (except-in typed-racket/base-env/prims
-           require-typed-struct-legacy
-           require/typed-legacy
-           require-typed-signature)
+                    require-typed-struct-legacy
+                    require/typed-legacy
+                    require-typed-signature)
          typed-racket/base-env/base-types
          (except-in typed-racket/base-env/base-types-extra Distinction Unit))
-(provide (rename-out [define-type-alias define-type])
+(provide define-type
          (all-from-out typed-racket/base-env/prims)
          (all-from-out typed-racket/base-env/base-types)
          (all-from-out typed-racket/base-env/base-types-extra)
-         assert defined? with-type for for*)
+         assert defined? with-type for for*
+         case-lambda:
+         struct:
+         define-struct:
+         define-typed-struct
+         define-struct/exec:
+         for:
+         for/and:
+         for/first:
+         for/flvector:
+         for/extflvector:
+         for/fold:
+         for/foldr:
+         for/hash:
+         for/hasheq:
+         for/hasheqv:
+         for/hashalw:
+         for/last:
+         for/list:
+         for/lists:
+         for/set:
+         for/or:
+         for/product:
+         for/sum:
+         for/vector:
+         for/and:
+         for*/first:
+         for*/flvector:
+         for*/extflvector:
+         for*/fold:
+         for*/foldr:
+         for*/hash:
+         for*/hasheq:
+         for*/hasheqv:
+         for*/hashalw:
+         for*/last:
+         for*/list:
+         for*/lists:
+         for*/set:
+         for*/or:
+         for*/product:
+         for*/sum:
+         for*/vector:
+         do:
+         define-type-alias
+         define-typed-struct
+         Un
+         mu
+         Tuple
+         Parameter
+         Pair)
+
+
+(define-deprecated-alias case-lambda: case-lambda)
+(define-deprecated-alias struct: struct)
+(define-deprecated-alias define-struct: define-struct)
+(define-deprecated-alias define-typed-struct define-struct)
+(define-deprecated-alias define-struct/exec: define-struct/exec)
+(define-deprecated-alias for: for)
+(define-deprecated-alias for/and: for/and)
+(define-deprecated-alias for/first: for/first)
+(define-deprecated-alias for/flvector: for/flvector)
+(define-deprecated-alias for/extflvector: for/extflvector)
+(define-deprecated-alias for/fold: for/fold)
+(define-deprecated-alias for/foldr: for/foldr)
+(define-deprecated-alias for/hash: for/hash)
+(define-deprecated-alias for/hasheq: for/hasheq)
+(define-deprecated-alias for/hasheqv: for/hasheqv)
+(define-deprecated-alias for/hashalw: for/hashalw)
+(define-deprecated-alias for/last: for/last)
+(define-deprecated-alias for/list: for/list)
+(define-deprecated-alias for/lists: for/lists)
+(define-deprecated-alias for/set: for/set)
+(define-deprecated-alias for/or: for/or)
+(define-deprecated-alias for/product: for/product)
+(define-deprecated-alias for/sum: for/sum)
+(define-deprecated-alias for/vector: for/vector)
+(define-deprecated-alias for/and: for/and)
+(define-deprecated-alias for*/first: for*/first)
+(define-deprecated-alias for*/flvector: for*/flvector)
+(define-deprecated-alias for*/extflvector: for*/extflvector)
+(define-deprecated-alias for*/fold: for*/fold)
+(define-deprecated-alias for*/foldr: for*/foldr)
+(define-deprecated-alias for*/hash: for*/hash)
+(define-deprecated-alias for*/hasheq: for*/hasheq)
+(define-deprecated-alias for*/hasheqv: for*/hasheqv)
+(define-deprecated-alias for*/hashalw: for*/hashalw)
+(define-deprecated-alias for*/last: for*/last)
+(define-deprecated-alias for*/list: for*/list)
+(define-deprecated-alias for*/lists: for*/lists)
+(define-deprecated-alias for*/set: for*/set)
+(define-deprecated-alias for*/or: for*/or)
+(define-deprecated-alias for*/product: for*/product)
+(define-deprecated-alias for*/sum: for*/sum)
+(define-deprecated-alias for*/vector: for*/vector)
+(define-deprecated-alias do: do)
+(define-deprecated-alias define-type-alias define-type)
+(define-deprecated-alias define-typed-struct define-struct)
+(define-deprecated-alias Un U)
+(define-deprecated-alias mu Rec)
+(define-deprecated-alias Tuple List)
+(define-deprecated-alias Parameter Parameterof)
+(define-deprecated-alias Pair Pairof)

From a2f616d8cd030f3094cc5d1bc3eddcd0ce875361 Mon Sep 17 00:00:00 2001
From: Jack Firth <jackhfirth@gmail.com>
Date: Fri, 27 Jun 2025 01:27:42 -0700
Subject: [PATCH 2/9] Get things to compile

---
 .../typed-racket/base-env/prims.rkt           | 49 +++++++++++++++----
 typed-racket-lib/typed/racket/base.rkt        |  8 ++-
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/typed-racket-lib/typed-racket/base-env/prims.rkt b/typed-racket-lib/typed-racket/base-env/prims.rkt
index e039520e6..a4d5019b4 100644
--- a/typed-racket-lib/typed-racket/base-env/prims.rkt
+++ b/typed-racket-lib/typed-racket/base-env/prims.rkt
@@ -34,22 +34,55 @@ the typed racket language.
                      def-redirect
                      define-for*-variants with-handlers: with-handlers*: define-for/acc:-variants
                      base-for/flvector: base-for/vector -define -do -let
-                     -let* -let*-values -let-values -let/cc -let/ec -letrec -letrec-values)
+                     -let* -let*-values -let-values -let/cc -let/ec -letrec -letrec-values
+                     for:
+                     for/and:
+                     for/first:
+                     for/flvector:
+                     for/extflvector:
+                     for/fold:
+                     for/foldr:
+                     for/hash:
+                     for/hasheq:
+                     for/hasheqv:
+                     for/hashalw:
+                     for/last:
+                     for/list:
+                     for/lists:
+                     for/set:
+                     for/or:
+                     for/product:
+                     for/sum:
+                     for/vector:
+                     for/and:
+                     for*/first:
+                     for*/flvector:
+                     for*/extflvector:
+                     for*/fold:
+                     for*/foldr:
+                     for*/hash:
+                     for*/hasheq:
+                     for*/hasheqv:
+                     for*/hashalw:
+                     for*/last:
+                     for*/list:
+                     for*/lists:
+                     for*/set:
+                     for*/or:
+                     for*/product:
+                     for*/sum:
+                     for*/vector:)
          (all-from-out "top-interaction.rkt")
          (except-out (all-from-out "prims-lambda.rkt") -lambda)
          (all-from-out (submod "prims-contract.rkt" forms))
-         define-type-alias
          define-new-subtype
-         define-typed-struct
-         define-typed-struct/exec
          ann inst row-inst
          :
-         (rename-out [define-typed-struct define-struct:]
-                     [define-typed-struct define-struct]
+         (rename-out [define-typed-struct define-struct]
+                     [define-type-alias define-type]
                      [-lambda lambda]
                      [-lambda λ]
                      [-struct struct]
-                     [-struct struct:]
                      [-define define]
                      [-let let]
                      [-let* let*]
@@ -102,10 +135,8 @@ the typed racket language.
                      [for/set: for/set]
                      [for*/set: for*/set]
                      [-do do]
-                     [-do do:]
                      [with-handlers: with-handlers]
                      [with-handlers*: with-handlers*]
-                     [define-typed-struct/exec define-struct/exec:]
                      [define-typed-struct/exec define-struct/exec]))
 
 (require "colon.rkt"
diff --git a/typed-racket-lib/typed/racket/base.rkt b/typed-racket-lib/typed/racket/base.rkt
index a94144cd0..fdabe2c3d 100644
--- a/typed-racket-lib/typed/racket/base.rkt
+++ b/typed-racket-lib/typed/racket/base.rkt
@@ -23,8 +23,7 @@
                     require-typed-signature)
          typed-racket/base-env/base-types
          (except-in typed-racket/base-env/base-types-extra Distinction Unit))
-(provide define-type
-         (all-from-out typed-racket/base-env/prims)
+(provide (all-from-out typed-racket/base-env/prims)
          (all-from-out typed-racket/base-env/base-types)
          (all-from-out typed-racket/base-env/base-types-extra)
          assert defined? with-type for for*
@@ -80,6 +79,7 @@
          Pair)
 
 
+(define-deprecated-alias define-type-alias define-type)
 (define-deprecated-alias case-lambda: case-lambda)
 (define-deprecated-alias struct: struct)
 (define-deprecated-alias define-struct: define-struct)
@@ -104,7 +104,7 @@
 (define-deprecated-alias for/product: for/product)
 (define-deprecated-alias for/sum: for/sum)
 (define-deprecated-alias for/vector: for/vector)
-(define-deprecated-alias for/and: for/and)
+(define-deprecated-alias for*/and: for/and)
 (define-deprecated-alias for*/first: for*/first)
 (define-deprecated-alias for*/flvector: for*/flvector)
 (define-deprecated-alias for*/extflvector: for*/extflvector)
@@ -123,8 +123,6 @@
 (define-deprecated-alias for*/sum: for*/sum)
 (define-deprecated-alias for*/vector: for*/vector)
 (define-deprecated-alias do: do)
-(define-deprecated-alias define-type-alias define-type)
-(define-deprecated-alias define-typed-struct define-struct)
 (define-deprecated-alias Un U)
 (define-deprecated-alias mu Rec)
 (define-deprecated-alias Tuple List)

From ced7cf94fb7e24e55ececb163eb26d2897c51bf1 Mon Sep 17 00:00:00 2001
From: Jack Firth <jackhfirth@gmail.com>
Date: Fri, 27 Jun 2025 02:18:57 -0700
Subject: [PATCH 3/9] Move alias to separate module

---
 .../typed/scheme/base.rkt                     |   2 +
 .../base-env/prims-deprecated.rkt             | 108 ++++++++++++++++++
 typed-racket-lib/typed/racket/base.rkt        | 107 +----------------
 3 files changed, 114 insertions(+), 103 deletions(-)
 create mode 100644 typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt

diff --git a/typed-racket-compatibility/typed/scheme/base.rkt b/typed-racket-compatibility/typed/scheme/base.rkt
index 669f4cc69..d706b1835 100644
--- a/typed-racket-compatibility/typed/scheme/base.rkt
+++ b/typed-racket-compatibility/typed/scheme/base.rkt
@@ -23,11 +23,13 @@
              require-typed-signature)
            (require-typed-struct-legacy require-typed-struct)
            (require/typed-legacy require/typed))
+         typed-racket/base-env/prims-deprecated
          typed-racket/base-env/base-types
          (except-in typed-racket/base-env/base-types-extra Distinction)
 	 (for-syntax (except-in typed-racket/base-env/base-types-extra Distinction)))
 (provide (rename-out [define-type-alias define-type])
          (all-from-out typed-racket/base-env/prims)
+         (all-from-out typed-racket/base-env/prims-deprecated)
          (all-from-out typed-racket/base-env/base-types)
          (all-from-out typed-racket/base-env/base-types-extra)
 	 assert defined? with-type for for*
diff --git a/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt b/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
new file mode 100644
index 000000000..9605ab271
--- /dev/null
+++ b/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
@@ -0,0 +1,108 @@
+#lang racket/base
+
+
+(provide case-lambda:
+         struct:
+         define-struct:
+         define-typed-struct
+         define-struct/exec:
+         for:
+         for/and:
+         for/first:
+         for/flvector:
+         for/extflvector:
+         for/fold:
+         for/foldr:
+         for/hash:
+         for/hasheq:
+         for/hasheqv:
+         for/hashalw:
+         for/last:
+         for/list:
+         for/lists:
+         for/set:
+         for/or:
+         for/product:
+         for/sum:
+         for/vector:
+         for/and:
+         for*/first:
+         for*/flvector:
+         for*/extflvector:
+         for*/fold:
+         for*/foldr:
+         for*/hash:
+         for*/hasheq:
+         for*/hasheqv:
+         for*/hashalw:
+         for*/last:
+         for*/list:
+         for*/lists:
+         for*/set:
+         for*/or:
+         for*/product:
+         for*/sum:
+         for*/vector:
+         do:
+         define-type-alias
+         define-typed-struct
+         Un
+         mu
+         Tuple
+         Parameter
+         Pair)
+
+
+(require racket/deprecation
+         typed-racket/base-env/prims)
+
+
+(define-deprecated-alias define-type-alias define-type)
+(define-deprecated-alias case-lambda: case-lambda)
+(define-deprecated-alias struct: struct)
+(define-deprecated-alias define-struct: define-struct)
+(define-deprecated-alias define-typed-struct define-struct)
+(define-deprecated-alias define-struct/exec: define-struct/exec)
+(define-deprecated-alias for: for)
+(define-deprecated-alias for/and: for/and)
+(define-deprecated-alias for/first: for/first)
+(define-deprecated-alias for/flvector: for/flvector)
+(define-deprecated-alias for/extflvector: for/extflvector)
+(define-deprecated-alias for/fold: for/fold)
+(define-deprecated-alias for/foldr: for/foldr)
+(define-deprecated-alias for/hash: for/hash)
+(define-deprecated-alias for/hasheq: for/hasheq)
+(define-deprecated-alias for/hasheqv: for/hasheqv)
+(define-deprecated-alias for/hashalw: for/hashalw)
+(define-deprecated-alias for/last: for/last)
+(define-deprecated-alias for/list: for/list)
+(define-deprecated-alias for/lists: for/lists)
+(define-deprecated-alias for/set: for/set)
+(define-deprecated-alias for/or: for/or)
+(define-deprecated-alias for/product: for/product)
+(define-deprecated-alias for/sum: for/sum)
+(define-deprecated-alias for/vector: for/vector)
+(define-deprecated-alias for*/and: for/and)
+(define-deprecated-alias for*/first: for*/first)
+(define-deprecated-alias for*/flvector: for*/flvector)
+(define-deprecated-alias for*/extflvector: for*/extflvector)
+(define-deprecated-alias for*/fold: for*/fold)
+(define-deprecated-alias for*/foldr: for*/foldr)
+(define-deprecated-alias for*/hash: for*/hash)
+(define-deprecated-alias for*/hasheq: for*/hasheq)
+(define-deprecated-alias for*/hasheqv: for*/hasheqv)
+(define-deprecated-alias for*/hashalw: for*/hashalw)
+(define-deprecated-alias for*/last: for*/last)
+(define-deprecated-alias for*/list: for*/list)
+(define-deprecated-alias for*/lists: for*/lists)
+(define-deprecated-alias for*/set: for*/set)
+(define-deprecated-alias for*/or: for*/or)
+(define-deprecated-alias for*/product: for*/product)
+(define-deprecated-alias for*/sum: for*/sum)
+(define-deprecated-alias for*/vector: for*/vector)
+(define-deprecated-alias do: do)
+(define-deprecated-alias Un U)
+(define-deprecated-alias mu Rec)
+(define-deprecated-alias Tuple List)
+(define-deprecated-alias Parameter Parameterof)
+(define-deprecated-alias Pair Pairof)
diff --git a/typed-racket-lib/typed/racket/base.rkt b/typed-racket-lib/typed/racket/base.rkt
index fdabe2c3d..31ad7e6c7 100644
--- a/typed-racket-lib/typed/racket/base.rkt
+++ b/typed-racket-lib/typed/racket/base.rkt
@@ -15,116 +15,17 @@
            (basics #%module-begin #%top-interaction)
            (ts-except with-type-shallow with-type-optional))
 
-(require racket/deprecation
-         typed-racket/base-env/extra-procs
+(require typed-racket/base-env/extra-procs
          (except-in typed-racket/base-env/prims
                     require-typed-struct-legacy
                     require/typed-legacy
                     require-typed-signature)
+         typed-racket/base-env/prims-deprecated
          typed-racket/base-env/base-types
          (except-in typed-racket/base-env/base-types-extra Distinction Unit))
 (provide (all-from-out typed-racket/base-env/prims)
+         (all-from-out typed-racket/base-env/prims-deprecated)
          (all-from-out typed-racket/base-env/base-types)
          (all-from-out typed-racket/base-env/base-types-extra)
-         assert defined? with-type for for*
-         case-lambda:
-         struct:
-         define-struct:
-         define-typed-struct
-         define-struct/exec:
-         for:
-         for/and:
-         for/first:
-         for/flvector:
-         for/extflvector:
-         for/fold:
-         for/foldr:
-         for/hash:
-         for/hasheq:
-         for/hasheqv:
-         for/hashalw:
-         for/last:
-         for/list:
-         for/lists:
-         for/set:
-         for/or:
-         for/product:
-         for/sum:
-         for/vector:
-         for/and:
-         for*/first:
-         for*/flvector:
-         for*/extflvector:
-         for*/fold:
-         for*/foldr:
-         for*/hash:
-         for*/hasheq:
-         for*/hasheqv:
-         for*/hashalw:
-         for*/last:
-         for*/list:
-         for*/lists:
-         for*/set:
-         for*/or:
-         for*/product:
-         for*/sum:
-         for*/vector:
-         do:
-         define-type-alias
-         define-typed-struct
-         Un
-         mu
-         Tuple
-         Parameter
-         Pair)
+         assert defined? with-type for for*)
 
-
-(define-deprecated-alias define-type-alias define-type)
-(define-deprecated-alias case-lambda: case-lambda)
-(define-deprecated-alias struct: struct)
-(define-deprecated-alias define-struct: define-struct)
-(define-deprecated-alias define-typed-struct define-struct)
-(define-deprecated-alias define-struct/exec: define-struct/exec)
-(define-deprecated-alias for: for)
-(define-deprecated-alias for/and: for/and)
-(define-deprecated-alias for/first: for/first)
-(define-deprecated-alias for/flvector: for/flvector)
-(define-deprecated-alias for/extflvector: for/extflvector)
-(define-deprecated-alias for/fold: for/fold)
-(define-deprecated-alias for/foldr: for/foldr)
-(define-deprecated-alias for/hash: for/hash)
-(define-deprecated-alias for/hasheq: for/hasheq)
-(define-deprecated-alias for/hasheqv: for/hasheqv)
-(define-deprecated-alias for/hashalw: for/hashalw)
-(define-deprecated-alias for/last: for/last)
-(define-deprecated-alias for/list: for/list)
-(define-deprecated-alias for/lists: for/lists)
-(define-deprecated-alias for/set: for/set)
-(define-deprecated-alias for/or: for/or)
-(define-deprecated-alias for/product: for/product)
-(define-deprecated-alias for/sum: for/sum)
-(define-deprecated-alias for/vector: for/vector)
-(define-deprecated-alias for*/and: for/and)
-(define-deprecated-alias for*/first: for*/first)
-(define-deprecated-alias for*/flvector: for*/flvector)
-(define-deprecated-alias for*/extflvector: for*/extflvector)
-(define-deprecated-alias for*/fold: for*/fold)
-(define-deprecated-alias for*/foldr: for*/foldr)
-(define-deprecated-alias for*/hash: for*/hash)
-(define-deprecated-alias for*/hasheq: for*/hasheq)
-(define-deprecated-alias for*/hasheqv: for*/hasheqv)
-(define-deprecated-alias for*/hashalw: for*/hashalw)
-(define-deprecated-alias for*/last: for*/last)
-(define-deprecated-alias for*/list: for*/list)
-(define-deprecated-alias for*/lists: for*/lists)
-(define-deprecated-alias for*/set: for*/set)
-(define-deprecated-alias for*/or: for*/or)
-(define-deprecated-alias for*/product: for*/product)
-(define-deprecated-alias for*/sum: for*/sum)
-(define-deprecated-alias for*/vector: for*/vector)
-(define-deprecated-alias do: do)
-(define-deprecated-alias Un U)
-(define-deprecated-alias mu Rec)
-(define-deprecated-alias Tuple List)
-(define-deprecated-alias Parameter Parameterof)
-(define-deprecated-alias Pair Pairof)

From 33e5edfaafdf077aa3798a428d018f2a334934a5 Mon Sep 17 00:00:00 2001
From: Jack Firth <jackhfirth@gmail.com>
Date: Fri, 27 Jun 2025 23:24:48 -0700
Subject: [PATCH 4/9] Fix more alias issues

---
 .../typed-racket/base-env/prims-deprecated.rkt       | 12 +-----------
 .../typed-racket/base-env/prims-lambda.rkt           |  1 -
 typed-racket-lib/typed-racket/base-env/prims.rkt     |  4 ++++
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt b/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
index 9605ab271..81f5cc61c 100644
--- a/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
+++ b/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
@@ -45,12 +45,7 @@
          for*/vector:
          do:
          define-type-alias
-         define-typed-struct
-         Un
-         mu
-         Tuple
-         Parameter
-         Pair)
+         define-typed-struct)
 
 
 (require racket/deprecation
@@ -101,8 +96,3 @@
 (define-deprecated-alias for*/sum: for*/sum)
 (define-deprecated-alias for*/vector: for*/vector)
 (define-deprecated-alias do: do)
-(define-deprecated-alias Un U)
-(define-deprecated-alias mu Rec)
-(define-deprecated-alias Tuple List)
-(define-deprecated-alias Parameter Parameterof)
-(define-deprecated-alias Pair Pairof)
diff --git a/typed-racket-lib/typed-racket/base-env/prims-lambda.rkt b/typed-racket-lib/typed-racket/base-env/prims-lambda.rkt
index 37f64db1b..4998980cf 100644
--- a/typed-racket-lib/typed-racket/base-env/prims-lambda.rkt
+++ b/typed-racket-lib/typed-racket/base-env/prims-lambda.rkt
@@ -16,7 +16,6 @@
                      syntax/parse/pre))
 
 (provide (rename-out [-case-lambda case-lambda]
-                     [-case-lambda case-lambda:]
                      [-case-lambda case-λ]
                      [lambda: λ:])
          pcase-lambda:
diff --git a/typed-racket-lib/typed-racket/base-env/prims.rkt b/typed-racket-lib/typed-racket/base-env/prims.rkt
index a4d5019b4..824de5536 100644
--- a/typed-racket-lib/typed-racket/base-env/prims.rkt
+++ b/typed-racket-lib/typed-racket/base-env/prims.rkt
@@ -103,6 +103,8 @@ the typed racket language.
                      [for: for]
                      [for/list: for/list]
                      [for/vector: for/vector]
+                     [for/flvector: for/flvector]
+                     [for/extflvector: for/extflvector]
                      [for/hash: for/hash]
                      [for/hasheq: for/hasheq]
                      [for/hasheqv: for/hasheqv]
@@ -120,6 +122,8 @@ the typed racket language.
                      [for*/list: for*/list]
                      [for*/lists: for*/lists]
                      [for*/vector: for*/vector]
+                     [for*/flvector: for*/flvector]
+                     [for*/extflvector: for*/extflvector]
                      [for*/hash: for*/hash]
                      [for*/hasheq: for*/hasheq]
                      [for*/hasheqv: for*/hasheqv]

From 39c818aabe3b9137b63b0917d130a52462a57048 Mon Sep 17 00:00:00 2001
From: Jack Firth <jackhfirth@gmail.com>
Date: Fri, 27 Jun 2025 23:46:14 -0700
Subject: [PATCH 5/9] Give up on flvector aliases

---
 .../typed-racket/base-env/prims-deprecated.rkt            | 8 --------
 typed-racket-lib/typed-racket/base-env/prims.rkt          | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt b/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
index 81f5cc61c..c827f0108 100644
--- a/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
+++ b/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
@@ -9,8 +9,6 @@
          for:
          for/and:
          for/first:
-         for/flvector:
-         for/extflvector:
          for/fold:
          for/foldr:
          for/hash:
@@ -27,8 +25,6 @@
          for/vector:
          for/and:
          for*/first:
-         for*/flvector:
-         for*/extflvector:
          for*/fold:
          for*/foldr:
          for*/hash:
@@ -61,8 +57,6 @@
 (define-deprecated-alias for: for)
 (define-deprecated-alias for/and: for/and)
 (define-deprecated-alias for/first: for/first)
-(define-deprecated-alias for/flvector: for/flvector)
-(define-deprecated-alias for/extflvector: for/extflvector)
 (define-deprecated-alias for/fold: for/fold)
 (define-deprecated-alias for/foldr: for/foldr)
 (define-deprecated-alias for/hash: for/hash)
@@ -79,8 +73,6 @@
 (define-deprecated-alias for/vector: for/vector)
 (define-deprecated-alias for*/and: for/and)
 (define-deprecated-alias for*/first: for*/first)
-(define-deprecated-alias for*/flvector: for*/flvector)
-(define-deprecated-alias for*/extflvector: for*/extflvector)
 (define-deprecated-alias for*/fold: for*/fold)
 (define-deprecated-alias for*/foldr: for*/foldr)
 (define-deprecated-alias for*/hash: for*/hash)
diff --git a/typed-racket-lib/typed-racket/base-env/prims.rkt b/typed-racket-lib/typed-racket/base-env/prims.rkt
index 824de5536..2fdff197e 100644
--- a/typed-racket-lib/typed-racket/base-env/prims.rkt
+++ b/typed-racket-lib/typed-racket/base-env/prims.rkt
@@ -38,8 +38,6 @@ the typed racket language.
                      for:
                      for/and:
                      for/first:
-                     for/flvector:
-                     for/extflvector:
                      for/fold:
                      for/foldr:
                      for/hash:
@@ -56,8 +54,6 @@ the typed racket language.
                      for/vector:
                      for/and:
                      for*/first:
-                     for*/flvector:
-                     for*/extflvector:
                      for*/fold:
                      for*/foldr:
                      for*/hash:
@@ -103,8 +99,6 @@ the typed racket language.
                      [for: for]
                      [for/list: for/list]
                      [for/vector: for/vector]
-                     [for/flvector: for/flvector]
-                     [for/extflvector: for/extflvector]
                      [for/hash: for/hash]
                      [for/hasheq: for/hasheq]
                      [for/hasheqv: for/hasheqv]
@@ -122,8 +116,6 @@ the typed racket language.
                      [for*/list: for*/list]
                      [for*/lists: for*/lists]
                      [for*/vector: for*/vector]
-                     [for*/flvector: for*/flvector]
-                     [for*/extflvector: for*/extflvector]
                      [for*/hash: for*/hash]
                      [for*/hasheq: for*/hasheq]
                      [for*/hasheqv: for*/hasheqv]

From a3819f62365bd8c79931380afbc3647d62aa1d9a Mon Sep 17 00:00:00 2001
From: Jack Firth <jackhfirth@gmail.com>
Date: Sat, 28 Jun 2025 00:02:09 -0700
Subject: [PATCH 6/9] Remove duplicate alias

---
 typed-racket-compatibility/typed/scheme/base.rkt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/typed-racket-compatibility/typed/scheme/base.rkt b/typed-racket-compatibility/typed/scheme/base.rkt
index d706b1835..0b339164b 100644
--- a/typed-racket-compatibility/typed/scheme/base.rkt
+++ b/typed-racket-compatibility/typed/scheme/base.rkt
@@ -27,8 +27,7 @@
          typed-racket/base-env/base-types
          (except-in typed-racket/base-env/base-types-extra Distinction)
 	 (for-syntax (except-in typed-racket/base-env/base-types-extra Distinction)))
-(provide (rename-out [define-type-alias define-type])
-         (all-from-out typed-racket/base-env/prims)
+(provide (all-from-out typed-racket/base-env/prims)
          (all-from-out typed-racket/base-env/prims-deprecated)
          (all-from-out typed-racket/base-env/base-types)
          (all-from-out typed-racket/base-env/base-types-extra)

From d32a19a26b63617981283b2dff37d64766b8c229 Mon Sep 17 00:00:00 2001
From: Jacqueline Firth <jackhfirth@gmail.com>
Date: Sat, 28 Jun 2025 00:15:50 -0700
Subject: [PATCH 7/9] Update
 typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt b/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
index c827f0108..5a2b07036 100644
--- a/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
+++ b/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
@@ -23,7 +23,6 @@
          for/product:
          for/sum:
          for/vector:
-         for/and:
          for*/first:
          for*/fold:
          for*/foldr:
@@ -40,8 +39,7 @@
          for*/sum:
          for*/vector:
          do:
-         define-type-alias
-         define-typed-struct)
+         define-type-alias)
 
 
 (require racket/deprecation

From e65fa502735709223610a6b6659ebd4fe05bd315 Mon Sep 17 00:00:00 2001
From: Jack Firth <jackhfirth@gmail.com>
Date: Sat, 28 Jun 2025 00:16:52 -0700
Subject: [PATCH 8/9] Add missing alias

---
 typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt b/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
index 5a2b07036..ec3be495f 100644
--- a/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
+++ b/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt
@@ -23,6 +23,7 @@
          for/product:
          for/sum:
          for/vector:
+         for*/and:
          for*/first:
          for*/fold:
          for*/foldr:

From ff30e31ca0d76b9cc9fb0d2f0a4e7c06acbb9049 Mon Sep 17 00:00:00 2001
From: Jack Firth <jackhfirth@gmail.com>
Date: Sat, 28 Jun 2025 00:25:58 -0700
Subject: [PATCH 9/9] Fix typo

---
 typed-racket-lib/typed-racket/base-env/prims.rkt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/typed-racket-lib/typed-racket/base-env/prims.rkt b/typed-racket-lib/typed-racket/base-env/prims.rkt
index 2fdff197e..05a998ce7 100644
--- a/typed-racket-lib/typed-racket/base-env/prims.rkt
+++ b/typed-racket-lib/typed-racket/base-env/prims.rkt
@@ -52,7 +52,7 @@ the typed racket language.
                      for/product:
                      for/sum:
                      for/vector:
-                     for/and:
+                     for*/and:
                      for*/first:
                      for*/fold:
                      for*/foldr: