diff --git a/collects/compatibility/mpair.rkt b/collects/compatibility/mlist.rkt similarity index 100% rename from collects/compatibility/mpair.rkt rename to collects/compatibility/mlist.rkt diff --git a/collects/compatibility/scribblings/compatibility.scrbl b/collects/compatibility/scribblings/compatibility.scrbl index d58dc1e8fb..87b2eceb40 100644 --- a/collects/compatibility/scribblings/compatibility.scrbl +++ b/collects/compatibility/scribblings/compatibility.scrbl @@ -15,7 +15,7 @@ We @emph{strongly} recommend using these alternatives. @include-section["defmacro.scrbl"] @include-section["package.scrbl"] -@include-section["mpairs.scrbl"] +@include-section["mlists.scrbl"] @(bibliography (bib-entry #:key "Waddell99" diff --git a/collects/compatibility/scribblings/mpairs.scrbl b/collects/compatibility/scribblings/mlists.scrbl similarity index 96% rename from collects/compatibility/scribblings/mpairs.scrbl rename to collects/compatibility/scribblings/mlists.scrbl index 9ed5f15dd4..2e35f45f54 100644 --- a/collects/compatibility/scribblings/mpairs.scrbl +++ b/collects/compatibility/scribblings/mlists.scrbl @@ -1,14 +1,14 @@ #lang scribble/doc @(require scribblings/reference/mz scribble/racket - (for-label compatibility/mpair)) + (for-label compatibility/mlist)) @title[#:tag "mlists"]{Mutable List Functions} @(define reference '(lib "scribblings/reference/reference.scrbl")) -@defmodule[compatibility/mpair] +@defmodule[compatibility/mlist] -This @racketmodname[compatibility/mpair] library provides support for +This @racketmodname[compatibility/mlist] library provides support for @tech[#:doc reference]{mutable list}s. Support is provided primarily to help porting Lisp/Scheme code to Racket. diff --git a/collects/meta/build/bundle b/collects/meta/build/bundle index dcfa6a380f..4bd0b71c2c 100755 --- a/collects/meta/build/bundle +++ b/collects/meta/build/bundle @@ -7,7 +7,7 @@ racket/list ; for use in specs too racket/string racket/file (only-in racket/system system) - (except-in compatibility/mpair mappend) + (except-in compatibility/mlist mappend) meta/checker (prefix-in dist: meta/dist-specs) meta/specs) (define (/-ify x) diff --git a/collects/mzlib/pconvert.rkt b/collects/mzlib/pconvert.rkt index 21d3896856..0557cbe0a9 100644 --- a/collects/mzlib/pconvert.rkt +++ b/collects/mzlib/pconvert.rkt @@ -2,7 +2,7 @@ (module pconvert mzscheme (require (only racket/base sort) - compatibility/mpair + compatibility/mlist "pconvert-prop.rkt" "class.rkt") diff --git a/collects/r5rs/r5rs.scrbl b/collects/r5rs/r5rs.scrbl index 34714c2860..ca1c55b33b 100644 --- a/collects/r5rs/r5rs.scrbl +++ b/collects/r5rs/r5rs.scrbl @@ -153,7 +153,7 @@ export from a module that is implemented in an @|r5rs|-like language. The @racket[cons] of @racketmodname[r5rs] corresponds to @racketmodname[racket/base]'s @racket[mcons]. Similarly, @racket[cdr] -is @racket[mcdr], and @racket[map] is @racketmodname[compatibility/mpair]'s +is @racket[mcdr], and @racket[map] is @racketmodname[compatibility/mlist]'s @racket[mmap], and so on. An @|r5rs| @defterm{environment} is implemented as a diff --git a/collects/racket/mpair.rkt b/collects/racket/mpair.rkt index 535e5271a4..52d2b82f19 100644 --- a/collects/racket/mpair.rkt +++ b/collects/racket/mpair.rkt @@ -1,6 +1,6 @@ #lang racket/base -;; compatibility library, see compatibility/mpair +;; compatibility library, see compatibility/mlist -(require compatibility/mpair) -(provide (all-from-out compatibility/mpair)) +(require compatibility/mlist) +(provide (all-from-out compatibility/mlist)) diff --git a/collects/scribblings/reference/mpairs.scrbl b/collects/scribblings/reference/mpairs.scrbl index 5d2ce10353..9858dae941 100644 --- a/collects/scribblings/reference/mpairs.scrbl +++ b/collects/scribblings/reference/mpairs.scrbl @@ -50,12 +50,3 @@ Changes the @tech{mutable pair} @racket[p] so that its first element is Changes the @tech{mutable pair} @racket[p] so that its second element is @racket[v].} - -@; ---------------------------------------- -@section{Mutable List Functions} - -@note-lib-only[racket/mpair] - -@deprecated[@racketmodname[compatibility/mpair]]{} - -Re-exports @racketmodname[compatibility/mpair]. diff --git a/collects/scribblings/reference/package.scrbl b/collects/scribblings/reference/package.scrbl deleted file mode 100644 index 6ef33b18f4..0000000000 --- a/collects/scribblings/reference/package.scrbl +++ /dev/null @@ -1,10 +0,0 @@ -#lang scribble/doc -@(require "mz.rkt" (for-label racket/package compatibility/package)) - -@title[#:tag "package"]{Limiting Scope: @racket[define-package], @racket[open-package], ...} - -@note-lib-only[racket/package] - -@deprecated[@racketmodname[compatibility/package]]{} - -Re-exports @racketmodname[compatibility/package]. diff --git a/collects/scribblings/reference/sequences.scrbl b/collects/scribblings/reference/sequences.scrbl index f2906347b3..e432a24162 100644 --- a/collects/scribblings/reference/sequences.scrbl +++ b/collects/scribblings/reference/sequences.scrbl @@ -3,7 +3,7 @@ (for-syntax racket/base) (for-label racket/generator racket/generic - compatibility/mpair)) + compatibility/mlist)) @(define (info-on-seq where what) @margin-note{See @secref[where] for information on using @|what| as diff --git a/collects/scribblings/reference/syntax.scrbl b/collects/scribblings/reference/syntax.scrbl index eaa100814c..1b10ac23f5 100644 --- a/collects/scribblings/reference/syntax.scrbl +++ b/collects/scribblings/reference/syntax.scrbl @@ -2727,9 +2727,6 @@ provides a hook to control interactive evaluation through @racket[load] (more precisely, the default @tech{load handler}) or @racket[read-eval-print-loop].} -@;------------------------------------------------------------------------ -@include-section["package.scrbl"] - @;------------------------------------------------------------------------ @include-section["block.scrbl"] diff --git a/collects/scribblings/scheme/scheme.scrbl b/collects/scribblings/scheme/scheme.scrbl index 81a2a2b008..845171971f 100644 --- a/collects/scribblings/scheme/scheme.scrbl +++ b/collects/scribblings/scheme/scheme.scrbl @@ -201,7 +201,7 @@ See also @racketmodname[scheme/runtime-config]. @compat[scheme/local racket/local] @compat[scheme/match racket/match] @compat[scheme/math racket/math] -@compat[scheme/mpair racket/mpair] +@compat[scheme/mpair compatibility/mlist] @;------------------------------------------------------------------------ @section[#:tag "nest"]{@racketmodname[scheme/nest]} @@ -253,7 +253,7 @@ than a precise prose description: @; ---------------------------------------- -@compat[scheme/package racket/package] +@compat[scheme/package compatibility/package] @compat[scheme/path racket/path] @compat[scheme/port racket/port] diff --git a/collects/tests/racket/benchmarks/shootout/lists.rkt b/collects/tests/racket/benchmarks/shootout/lists.rkt index 4fea39ddb0..b736a3e3e1 100644 --- a/collects/tests/racket/benchmarks/shootout/lists.rkt +++ b/collects/tests/racket/benchmarks/shootout/lists.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require compatibility/mpair) +(require compatibility/mlist) (define SIZE 10000) (define (sequence start stop) diff --git a/collects/tests/racket/benchmarks/shootout/typed/lists.rktl b/collects/tests/racket/benchmarks/shootout/typed/lists.rktl index ab219fe5e3..883b91b3fb 100644 --- a/collects/tests/racket/benchmarks/shootout/typed/lists.rktl +++ b/collects/tests/racket/benchmarks/shootout/typed/lists.rktl @@ -1,4 +1,4 @@ -(require compatibility/mpair) +(require compatibility/mlist) (define SIZE 10000) (: sequence (Integer Integer -> (MListof Integer))) diff --git a/collects/tests/racket/for.rktl b/collects/tests/racket/for.rktl index f126050650..be0ab8f294 100644 --- a/collects/tests/racket/for.rktl +++ b/collects/tests/racket/for.rktl @@ -3,7 +3,7 @@ (Section 'for) -(require compatibility/mpair +(require compatibility/mlist "for-util.rkt") (test-sequence [(0 1 2)] 3) diff --git a/collects/tests/typed-racket/optimizer/missed-optimizations/pair.rkt b/collects/tests/typed-racket/optimizer/missed-optimizations/pair.rkt index 140803ab26..779c2678ca 100644 --- a/collects/tests/typed-racket/optimizer/missed-optimizations/pair.rkt +++ b/collects/tests/typed-racket/optimizer/missed-optimizations/pair.rkt @@ -50,7 +50,7 @@ TR missed opt: pair.rkt 84:17 (set-mcdr! (ann (quote ()) (MListof Integer)) (ann ) #lang typed/racket -(require compatibility/mpair) +(require compatibility/mlist) ;; car/cdr can be optimized if they are guaranteed to be applied only to ;; non-empty lists. otherwise, we miss a potential optimization diff --git a/collects/typed-racket/base-env/base-env.rkt b/collects/typed-racket/base-env/base-env.rkt index 7dae4f5f5a..fa54da5086 100644 --- a/collects/typed-racket/base-env/base-env.rkt +++ b/collects/typed-racket/base-env/base-env.rkt @@ -15,7 +15,7 @@ (only-in racket/private/pre-base new-apply-proc) racket/promise racket/system racket/function - compatibility/mpair + compatibility/mlist racket/base racket/set racket/place