From 551db6c1ef816df82e66acbd1a46e0781b2bf22a Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Sun, 28 Jan 2018 14:45:35 -0600
Subject: [PATCH] corret c98b0e6 so that empty? is not provided by racket/base

also do the same treatment with cons? as with empty?
---
 racket/collects/racket/contract/private/helpers.rkt | 12 +++++++-----
 racket/collects/racket/list.rkt                     |  3 +--
 racket/collects/racket/private/list-predicates.rkt  |  6 ++++++
 racket/collects/racket/private/list.rkt             |  6 +-----
 4 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 racket/collects/racket/private/list-predicates.rkt

diff --git a/racket/collects/racket/contract/private/helpers.rkt b/racket/collects/racket/contract/private/helpers.rkt
index 66cffa72b9..ce12964d00 100644
--- a/racket/collects/racket/contract/private/helpers.rkt
+++ b/racket/collects/racket/contract/private/helpers.rkt
@@ -13,9 +13,10 @@
 
 (require setup/main-collects
          racket/struct-info
-         (only-in racket/private/list empty?)
+         (only-in racket/private/list-predicates empty? cons?)
          (for-template racket/base
-                       (only-in racket/private/list empty?)))
+                       (only-in racket/private/list-predicates
+                                empty? cons?)))
 
 (define (update-loc stx loc)
   (datum->syntax stx (syntax-e stx) loc))
@@ -191,7 +192,7 @@
              string<=?
              #:key symbol->string)))
 
--- also add empty? to the above
+-- also add empty? and cons? to the above
 
 |#
 
@@ -370,8 +371,9 @@
          (weak-box? . #t)
          (will-executor? . #t)
          (zero? . #t)
-         ;; from racket/private/list
-         (empty? . #t)))
+         ;; from racket/private/list-predicates
+         (empty? . #t)
+         (cons? . #t)))
 
 (define (known-good-contract? id)
   (define r-id (syntax-e id))
diff --git a/racket/collects/racket/list.rkt b/racket/collects/racket/list.rkt
index 798e5ff69c..11b47609d6 100644
--- a/racket/collects/racket/list.rkt
+++ b/racket/collects/racket/list.rkt
@@ -62,7 +62,7 @@
          remf*)
 
 (require (for-syntax racket/base)
-         (only-in racket/private/list empty?))
+         "private/list-predicates.rkt")
 
 (define (first x)
   (if (and (pair? x) (list? x))
@@ -112,7 +112,6 @@
     (cdr l)
     (raise-argument-error 'rest "(and/c list? (not/c empty?))" l)))
 
-(define (cons? l) (pair? l))
 (define empty '())
 
 (define (make-list n x)
diff --git a/racket/collects/racket/private/list-predicates.rkt b/racket/collects/racket/private/list-predicates.rkt
new file mode 100644
index 0000000000..3f840a5566
--- /dev/null
+++ b/racket/collects/racket/private/list-predicates.rkt
@@ -0,0 +1,6 @@
+#lang racket/base
+
+(provide empty? cons?)
+
+(define (empty? l) (null? l))
+(define (cons? l) (pair? l))
diff --git a/racket/collects/racket/private/list.rkt b/racket/collects/racket/private/list.rkt
index 1eed448bff..f53bf09974 100644
--- a/racket/collects/racket/private/list.rkt
+++ b/racket/collects/racket/private/list.rkt
@@ -30,11 +30,7 @@
            reverse
 
            compose
-           compose1
-
-           empty?)
-
-  (define (empty? l) (null? l))
+           compose1)
 
   (#%require (rename "sort.rkt" raw-sort sort)
              (for-syntax "stxcase-scheme.rkt")