From 3c51e88785e4d97cdb55f070feccc525c4be9349 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Mon, 10 Nov 2008 23:04:46 +0000 Subject: [PATCH] Removing unneccessary mutation svn: r12381 --- .../configuration-table-structs.ss | 21 +++++++------------ collects/web-server/managers/manager.ss | 9 +++----- collects/web-server/private/cache-table.ss | 3 +-- .../web-server/private/response-structs.ss | 9 +++----- collects/web-server/private/servlet.ss | 6 ++---- 5 files changed, 16 insertions(+), 32 deletions(-) diff --git a/collects/web-server/configuration/configuration-table-structs.ss b/collects/web-server/configuration/configuration-table-structs.ss index 733507fb83..0685f648a2 100644 --- a/collects/web-server/configuration/configuration-table-structs.ss +++ b/collects/web-server/configuration/configuration-table-structs.ss @@ -7,32 +7,25 @@ ; configuration-table = (make-configuration-table nat nat num host-table (listof (cons str host-table))) (define-struct configuration-table - (port max-waiting initial-connection-timeout default-host virtual-hosts) - #:mutable) + (port max-waiting initial-connection-timeout default-host virtual-hosts)) ; host-table = (make-host-table (listof str) sym messages timeouts paths) -(define-struct host-table (indices log-format messages timeouts paths) - #:mutable) +(define-struct host-table (indices log-format messages timeouts paths)) -(define-struct host (indices log-format log-path passwords responders timeouts paths) - #:mutable) +(define-struct host (indices log-format log-path passwords responders timeouts paths)) (define-struct responders - (servlet servlet-loading authentication servlets-refreshed passwords-refreshed file-not-found protocol collect-garbage) - #:mutable) + (servlet servlet-loading authentication servlets-refreshed passwords-refreshed file-not-found protocol collect-garbage)) ; messages = (make-messages str^6) (define-struct messages - (servlet authentication servlets-refreshed passwords-refreshed file-not-found protocol collect-garbage) - #:mutable) + (servlet authentication servlets-refreshed passwords-refreshed file-not-found protocol collect-garbage)) ; timeouts = (make-timeouts nat^5) -(define-struct timeouts (default-servlet password servlet-connection file-per-byte file-base) - #:mutable) +(define-struct timeouts (default-servlet password servlet-connection file-per-byte file-base)) ; paths = (make-paths str^6) -(define-struct paths (conf host-base log htdocs servlet mime-types passwords) - #:mutable) +(define-struct paths (conf host-base log htdocs servlet mime-types passwords)) (provide/contract [struct configuration-table diff --git a/collects/web-server/managers/manager.ss b/collects/web-server/managers/manager.ss index 7d48b870e7..8862a74315 100644 --- a/collects/web-server/managers/manager.ss +++ b/collects/web-server/managers/manager.ss @@ -6,13 +6,10 @@ adjust-timeout! clear-continuations! continuation-store! - continuation-lookup) - #:mutable) + continuation-lookup)) -(define-struct (exn:fail:servlet-manager:no-instance exn:fail) (expiration-handler) - #:mutable) -(define-struct (exn:fail:servlet-manager:no-continuation exn:fail) (expiration-handler) - #:mutable) +(define-struct (exn:fail:servlet-manager:no-instance exn:fail) (expiration-handler)) +(define-struct (exn:fail:servlet-manager:no-continuation exn:fail) (expiration-handler)) (provide/contract [struct manager ([create-instance ((-> void) . -> . number?)] diff --git a/collects/web-server/private/cache-table.ss b/collects/web-server/private/cache-table.ss index 6b1a058d6e..2b761a329b 100644 --- a/collects/web-server/private/cache-table.ss +++ b/collects/web-server/private/cache-table.ss @@ -1,8 +1,7 @@ #lang scheme/base (require mzlib/contract) -(define-struct cache-table (hash semaphore) - #:mutable) +(define-struct cache-table (hash semaphore) #:mutable) (define (new-cache-table) ; Only eq? tables are not locked diff --git a/collects/web-server/private/response-structs.ss b/collects/web-server/private/response-structs.ss index b7133694e3..6b33641d3f 100644 --- a/collects/web-server/private/response-structs.ss +++ b/collects/web-server/private/response-structs.ss @@ -5,12 +5,9 @@ (define TEXT/HTML-MIME-TYPE #"text/html; charset=utf-8") -(define-struct response/basic (code message seconds mime headers) - #:mutable) -(define-struct (response/full response/basic) (body) - #:mutable) -(define-struct (response/incremental response/basic) (generator) - #:mutable) +(define-struct response/basic (code message seconds mime headers)) +(define-struct (response/full response/basic) (body)) +(define-struct (response/incremental response/basic) (generator)) ; response = (cons string (listof string)), where the first string is a mime-type ; | x-expression diff --git a/collects/web-server/private/servlet.ss b/collects/web-server/private/servlet.ss index c7faf977d5..f35ba1c7a9 100644 --- a/collects/web-server/private/servlet.ss +++ b/collects/web-server/private/servlet.ss @@ -5,12 +5,10 @@ "../private/response-structs.ss") (define servlet-prompt (make-continuation-prompt-tag 'servlet)) -(define-struct (exn:fail:servlet:instance exn:fail) () - #:mutable) +(define-struct (exn:fail:servlet:instance exn:fail) ()) (define-struct servlet (custodian namespace manager directory handler) #:mutable) -(define-struct execution-context (request) - #:mutable) +(define-struct execution-context (request)) (define current-servlet (make-parameter #f)) (define current-servlet-instance-id (make-parameter #f))