Replace Vec::from_slice([...]) to vec!(...) macro

Kroisse · Kroisse · commit 61e8183a8fb7 · 2014-03-17T00:12:54.000+09:00
to improve readability and effecienty. Thanks to @Ogeon.
diff --git a/src/examples/server/apache_fake/main.rs b/src/examples/server/apache_fake/main.rs
@@ -46,7 +46,7 @@ impl Server for ApacheFakeServer {
                                 weak: false,
                                 opaque_tag: ~"501b29-b1-4a285ed47404a" });
         w.headers.accept_ranges = Some(headers::accept_ranges::RangeUnits(
-                                            Vec::from_slice([headers::accept_ranges::Bytes])));
+                                            vec!(headers::accept_ranges::Bytes)));
         w.headers.content_length = Some(177);
         w.headers.vary = Some(~"Accept-Encoding");
         w.headers.content_type = Some(headers::content_type::MediaType {
diff --git a/src/examples/server/hello_world/main.rs b/src/examples/server/hello_world/main.rs
@@ -28,7 +28,7 @@ impl Server for HelloWorldServer {
         w.headers.content_type = Some(MediaType {
             type_: ~"text",
             subtype: ~"plain",
-            parameters: Vec::from_slice([(~"charset", ~"UTF-8")])
+            parameters: vec!((~"charset", ~"UTF-8"))
         });
         w.headers.server = Some(~"Example");
 
diff --git a/src/examples/server/info/main.rs b/src/examples/server/info/main.rs
@@ -29,7 +29,7 @@ impl Server for InfoServer {
         w.headers.content_type = Some(MediaType {
             type_: ~"text",
             subtype: ~"html",
-            parameters: Vec::from_slice([(~"charset", ~"UTF-8")])
+            parameters: vec!((~"charset", ~"UTF-8"))
         });
         w.headers.server = Some(~"Rust Thingummy/0.0-pre");
         w.write(bytes!("<!DOCTYPE html><title>Rust HTTP server</title>")).unwrap();
diff --git a/src/examples/server/request_uri/main.rs b/src/examples/server/request_uri/main.rs
@@ -49,7 +49,7 @@ impl Server for RequestUriServer {
             (&Options, &Star) => {
                 // Querying server capabilities. That's nice and simple. I can handle these methods:
                 // (TODO: let user code override this, providing a default method.)
-                w.headers.allow = Some(Vec::from_slice([Get, Head, Post, Put, Delete, Trace, Options, Connect, Patch]));
+                w.headers.allow = Some(vec!(Get, Head, Post, Put, Delete, Trace, Options, Connect, Patch));
                 w.headers.content_length = Some(0);
                 return;
             },
diff --git a/src/http/headers/connection.rs b/src/http/headers/connection.rs
@@ -62,17 +62,17 @@ fn test_connection() {
     use headers::test_utils::{assert_conversion_correct,
                               assert_interpretation_correct,
                               assert_invalid};
-    assert_conversion_correct("close", Vec::from_slice([Close]));
-    assert_conversion_correct("Foo", Vec::from_slice([Token(~"Foo")]));
-    assert_conversion_correct("Foo, Keep-Alive", Vec::from_slice([Token(~"Foo"), Token(~"Keep-Alive")]));
-    assert_conversion_correct("Foo, close", Vec::from_slice([Token(~"Foo"), Close]));
-    assert_conversion_correct("close, Bar", Vec::from_slice([Close, Token(~"Bar")]));
+    assert_conversion_correct("close", vec!(Close));
+    assert_conversion_correct("Foo", vec!(Token(~"Foo")));
+    assert_conversion_correct("Foo, Keep-Alive", vec!(Token(~"Foo"), Token(~"Keep-Alive")));
+    assert_conversion_correct("Foo, close", vec!(Token(~"Foo"), Close));
+    assert_conversion_correct("close, Bar", vec!(Close, Token(~"Bar")));
 
-    assert_interpretation_correct("close", Vec::from_slice([Close]));
-    assert_interpretation_correct("foo", Vec::from_slice([Token(~"Foo")]));
-    assert_interpretation_correct("close \r\n , keep-ALIVE", Vec::from_slice([Close, Token(~"Keep-Alive")]));
-    assert_interpretation_correct("foo,close", Vec::from_slice([Token(~"Foo"), Close]));
-    assert_interpretation_correct("close, bar", Vec::from_slice([Close, Token(~"Bar")]));
+    assert_interpretation_correct("close", vec!(Close));
+    assert_interpretation_correct("foo", vec!(Token(~"Foo")));
+    assert_interpretation_correct("close \r\n , keep-ALIVE", vec!(Close, Token(~"Keep-Alive")));
+    assert_interpretation_correct("foo,close", vec!(Token(~"Foo"), Close));
+    assert_interpretation_correct("close, bar", vec!(Close, Token(~"Bar")));
     assert_interpretation_correct("CLOSE", Close);
 
     assert_invalid::<Vec<Connection>>("foo bar");
diff --git a/src/http/headers/content_type.rs b/src/http/headers/content_type.rs
@@ -78,11 +78,11 @@ fn test_content_type() {
                               assert_invalid};
     assert_conversion_correct("type/subtype", MediaType(~"type", ~"subtype", Vec::new()));
     assert_conversion_correct("type/subtype;key=value",
-                              MediaType(~"type", ~"subtype", Vec::from_slice([(~"key", ~"value")])));
+                              MediaType(~"type", ~"subtype", vec!((~"key", ~"value"))));
     assert_conversion_correct("type/subtype;key=value;q=0.1",
-            MediaType(~"type", ~"subtype", Vec::from_slice([(~"key", ~"value"), (~"q", ~"0.1")])));
+            MediaType(~"type", ~"subtype", vec!((~"key", ~"value"), (~"q", ~"0.1"))));
     assert_interpretation_correct("type/subtype ; key = value ; q = 0.1",
-            MediaType(~"type", ~"subtype", Vec::from_slice([(~"key", ~"value"), (~"q", ~"0.1")])));
+            MediaType(~"type", ~"subtype", vec!((~"key", ~"value"), (~"q", ~"0.1"))));
 
     assert_invalid::<MediaType>("");
     assert_invalid::<MediaType>("/");
diff --git a/src/http/headers/serialization_utils.rs b/src/http/headers/serialization_utils.rs
@@ -238,17 +238,17 @@ mod test {
     #[test]
     fn test_comma_split() {
         // Simple 0-element case
-        assert_eq!(comma_split(""), Vec::from_slice([~""]));
+        assert_eq!(comma_split(""), vec!(~""));
         // Simple 1-element case
-        assert_eq!(comma_split("foo"), Vec::from_slice([~"foo"]));
+        assert_eq!(comma_split("foo"), vec!(~"foo"));
         // Simple 2-element case
-        assert_eq!(comma_split("foo,bar"), Vec::from_slice([~"foo", ~"bar"]));
+        assert_eq!(comma_split("foo,bar"), vec!(~"foo", ~"bar"));
         // Simple >2-element case
-        assert_eq!(comma_split("foo,bar,baz,quux"), Vec::from_slice([~"foo", ~"bar", ~"baz", ~"quux"]));
+        assert_eq!(comma_split("foo,bar,baz,quux"), vec!(~"foo", ~"bar", ~"baz", ~"quux"));
         // Doesn't handle quoted-string intelligently
-        assert_eq!(comma_split("\"foo,bar\",baz"), Vec::from_slice([~"\"foo", ~"bar\"", ~"baz"]));
+        assert_eq!(comma_split("\"foo,bar\",baz"), vec!(~"\"foo", ~"bar\"", ~"baz"));
         // Doesn't do right trimming, but does left
-        assert_eq!(comma_split(" foo;q=0.8 , bar/* "), Vec::from_slice([~"foo;q=0.8 ", ~"bar/* "]));
+        assert_eq!(comma_split(" foo;q=0.8 , bar/* "), vec!(~"foo;q=0.8 ", ~"bar/* "));
     }
 
     #[test]
diff --git a/src/http/server/response.rs b/src/http/server/response.rs
@@ -85,7 +85,7 @@ impl<'a> ResponseWriter<'a> {
         // apply. In such a case, chunked MUST come last. This way prevents it from being extensible
         // thus, which is suboptimal.
         if self.headers.content_length == None {
-            self.headers.transfer_encoding = Some(Vec::from_slice([Chunked]));
+            self.headers.transfer_encoding = Some(vec!(Chunked));
         } else {
             self.headers.transfer_encoding = None;
         }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ impl<'a> ResponseWriter<'a> {`
`85`	`85`	`// apply. In such a case, chunked MUST come last. This way prevents it from being extensible`
`86`	`86`	`// thus, which is suboptimal.`
`87`	`87`	`if self.headers.content_length == None {`
`88`		`- self.headers.transfer_encoding = Some(Vec::from_slice([Chunked]));`
	`88`	`+ self.headers.transfer_encoding = Some(vec!(Chunked));`
`89`	`89`	`} else {`
`90`	`90`	`self.headers.transfer_encoding = None;`
`91`	`91`	`}`