Stop using Either, removed in rust-lang/rust#11149

Author: chris-morgan

src/codegen/status.rs

@@ -9,12 +9,14 @@
 
 use std::ascii::StrAsciiExt;
 use std::hashmap::HashSet;
-use std::either::{Either, Left, Right};
 use std::vec;
 use std::io::Writer;
 use super::get_writer;
 
-type HeadingOrStatus = Either<&'static str, Status>;
+enum HeadingOrStatus {
+    Heading(&'static str),
+    Status(Status),
+}
 
 struct Status {
     code: uint,
@@ -24,12 +26,12 @@ struct Status {
 
 /// Status with comment
 fn StatusC(code: uint, reason: &'static str, comment: &'static str) -> HeadingOrStatus {
-    Right(Status { code: code, reason: reason, comment: Some(comment) })
+    Status(Status { code: code, reason: reason, comment: Some(comment) })
 }
 
 /// Status without comment
 fn StatusN(code: uint, reason: &'static str) -> HeadingOrStatus {
-    Right(Status { code: code, reason: reason, comment: None })
+    Status(Status { code: code, reason: reason, comment: None })
 }
 
 impl Status {
@@ -72,12 +74,12 @@ static mut longest_reason: uint = 0;
 pub fn generate(output_dir: &Path) {
     let mut out = get_writer(output_dir, "status.rs");
     let entries = [
-        Left("1xx Informational"),
+        Heading("1xx Informational"),
         StatusN(100, "Continue"),
         StatusN(101, "Switching Protocols"),
         StatusC(102, "Processing", "WebDAV; RFC 2518"),
 
-        Left("2xx Success"),
+        Heading("2xx Success"),
         StatusN(200, "OK"),
         StatusN(201, "Created"),
         StatusN(202, "Accepted"),
@@ -89,7 +91,7 @@ pub fn generate(output_dir: &Path) {
         StatusC(208, "Already Reported", "WebDAV; RFC 5842"),
         StatusC(226, "IM Used", "RFC 3229"),
 
-        Left("3xx Redirection"),
+        Heading("3xx Redirection"),
         StatusN(300, "Multiple Choices"),
         StatusN(301, "Moved Permanently"),
         StatusN(302, "Found"),
@@ -100,7 +102,7 @@ pub fn generate(output_dir: &Path) {
         StatusC(307, "Temporary Redirect", "since HTTP/1.1"),
         StatusC(308, "Permanent Redirect", "approved as experimental RFC: http://tools.ietf.org/html/draft-reschke-http-status-308"),
 
-        Left("4xx Client Error"),
+        Heading("4xx Client Error"),
         StatusN(400, "Bad Request"),
         StatusN(401, "Unauthorized"),
         StatusN(402, "Payment Required"),
@@ -132,7 +134,7 @@ pub fn generate(output_dir: &Path) {
         StatusC(431, "Request Header Fields Too Large", "RFC 6585"),
         StatusC(451, "Unavailable For Legal Reasons", "Internet draft"),
 
-        Left("5xx Server Error"),
+        Heading("5xx Server Error"),
         StatusN(500, "Internal Server Error"),
         StatusN(501, "Not Implemented"),
         StatusN(502, "Bad Gateway"),
@@ -147,12 +149,12 @@ pub fn generate(output_dir: &Path) {
         ];
     unsafe {
         longest_ident = entries.iter().map(|&e| match e {
-            Left(_heading) => 0,
-            Right(status) => status.ident().len(),
+            Heading(_heading) => 0,
+            Status(status) => status.ident().len(),
         }).max_by(|&i| i).unwrap();
         longest_reason = entries.iter().map(|&e| match e {
-            Left(_heading) => 0,
-            Right(status) => status.reason.len(),
+            Heading(_heading) => 0,
+            Status(status) => status.reason.len(),
         }).max_by(|&i| i).unwrap();
     }
     out.write("// This file is automatically generated file is used as http::status.
@@ -166,8 +168,8 @@ pub enum Status {
 ".as_bytes());
     for &entry in entries.iter() {
         match entry {
-            Left(heading) => write!(out, "\n    // {}\n", heading),
-            Right(status) => match status.comment {
+            Heading(heading) => write!(out, "\n    // {}\n", heading),
+            Status(status) => match status.comment {
                 None => write!(out, "    {},\n", status.ident()),
                 Some(comment) => write!(out, "    {},  // {}\n", status.ident(), comment),
             },
@@ -186,8 +188,8 @@ impl Status {
 ".as_bytes());
     for &entry in entries.iter() {
         match entry {
-            Left(heading) => write!(out, "\n            // {}\n", heading),
-            Right(status) => write!(out, "            {} => {},\n",
+            Heading(heading) => write!(out, "\n            // {}\n", heading),
+            Status(status) => write!(out, "            {} => {},\n",
                                                 status.padded_ident(), status.code),
         }
     }
@@ -202,8 +204,8 @@ impl Status {
 ".as_bytes());
     for &entry in entries.iter() {
         match entry {
-            Left(heading) => write!(out, "\n            // {}\n", heading),
-            Right(status) => write!(out, "            {} => ~\"{}\",\n",
+            Heading(heading) => write!(out, "\n            // {}\n", heading),
+            Status(status) => write!(out, "            {} => ~\"{}\",\n",
                                                 status.padded_ident(), status.reason)
         }
     }
@@ -219,8 +221,8 @@ impl Status {
 ".as_bytes());
     for &entry in entries.iter() {
         match entry {
-            Left(heading) => write!(out, "\n            // {}\n", heading),
-            Right(status) => write!(out, "            ({}, \"{}\"){} => {},\n",
+            Heading(heading) => write!(out, "\n            // {}\n", heading),
+            Status(status) => write!(out, "            ({}, \"{}\"){} => {},\n",
                                                 status.code,
                                                 status.reason.to_ascii_lower(),
                                                 status.reason_padding_spaces(),
@@ -292,8 +294,8 @@ impl FromPrimitive for Status {
     let mut matched_numbers = HashSet::new();
     for &entry in entries.iter() {
         match entry {
-            Left(heading) => write!(out, "\n            // {}\n", heading),
-            Right(status) => {
+            Heading(heading) => write!(out, "\n            // {}\n", heading),
+            Status(status) => {
                 if !matched_numbers.contains(&status.code) {
                     // Purpose: FailedDependency and MethodFailure both use 424,
                     // but clearly they mustn't both go in here