New format for extensions [part 4]

2 files changed, 9 insertions, 17 deletions

diff --git a/stdlib/source/library/lux/world/net.lux b/stdlib/source/library/lux/world/net.lux
index 93716afa9..fccb47177 100644
--- a/stdlib/source/library/lux/world/net.lux
+++ b/stdlib/source/library/lux/world/net.lux
@@ -1,8 +1,8 @@
 (.require
  [library
-  [lux (.except Location)]])
+  [lux (.except #host)]])
 
-(type .public Address
+(type .public Host
   Text)
 
 (type .public Port
@@ -11,7 +11,7 @@
 (type .public URL
   Text)
 
-(type .public Location
+(type .public Address
   (Record
-   [#address Address
+   [#host Host
     #port Port]))
diff --git a/stdlib/source/library/lux/world/net/http.lux b/stdlib/source/library/lux/world/net/http.lux
index 0ca8327aa..b90c770f5 100644
--- a/stdlib/source/library/lux/world/net/http.lux
+++ b/stdlib/source/library/lux/world/net/http.lux
@@ -7,7 +7,7 @@
      [frp (.only Channel)]]]
    [data
     [binary (.only Binary)]]]]
- [// (.only URL)
+ [// (.only Address)
   [uri (.only URI)]
   [//
    ["[0]" environment
@@ -28,9 +28,6 @@
    {#Options}
    {#Trace}))
 
-(type .public Port
-  Nat)
-
 (type .public Status
   Nat)
 
@@ -52,30 +49,25 @@
    {#HTTP}
    {#HTTPS}))
 
-(type .public Address
-  (Record
-   [#port Port
-    #host Text]))
-
 (type .public Identification
   (Record
-   [#local  Address
+   [#local Address
     #remote Address]))
 
 (type .public Protocol
   (Record
    [#version Version
-    #scheme  Scheme]))
+    #scheme Scheme]))
 
 (type .public Resource
   (Record
    [#method Method
-    #uri    URI]))
+    #uri URI]))
 
 (type .public (Message !)
   (Record
    [#headers Headers
-    #body    (Body !)]))
+    #body (Body !)]))
 
 (type .public (Request !)
   [Identification Protocol Resource (Message !)])