---

yaml
---
r: 37319
b: refs/heads/try
c: 4edb881
h: refs/heads/master
i:
  37317: e68a968
  37315: f764cf6
  37311: 6f807a8
v: v3

Author: paulstansifer

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
-refs/heads/try: 191d16265be6b9db3d48ef87944b7d42b5dffe0d
+refs/heads/try: 4edb88112409c111790dacacb06c22de2ef8da06
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/doc/tutorial-macros.md

@@ -2,11 +2,11 @@
 
 # Introduction
 
-Functions are the primary tool that programmers can use to build
-abstractions. Sometimes, though, programmers want to abstract over
-compile-time, syntactic structures rather than runtime values. For example,
-the following two code fragments both pattern-match on their input and return
-early in one case, doing nothing otherwise:
+Functions are the primary tool that programmers can use to build abstractions.
+Sometimes, however, programmers want to perform abstractions over things that are not
+runtime values. Macros provide a syntactic abstraction. For an example of how this
+can be useful, consider the following two code fragments, which both pattern-match
+on their input and return early in one case, and do nothing otherwise:
 
 ~~~~
 # enum t { special_a(uint), special_b(uint) };

branches/try/src/libstd/net_tcp.rs

@@ -1387,8 +1387,7 @@ mod test {
             let sock = result::unwrap(move connect_result);
 
             // This is what we are actually testing!
-            assert net::ip::format_addr(&sock.get_peer_addr()) ==
-                ~"127.0.0.1";
+            assert net::ip::format_addr(&sock.get_peer_addr()) == ~"127.0.0.1";
             assert net::ip::get_port(&sock.get_peer_addr()) == 8887;
 
             // Fulfill the protocol the test server expects

branches/try/src/libstd/uv_ll.rs

@@ -1484,7 +1484,7 @@ pub mod test {
     fn impl_uv_tcp_server_and_request() unsafe {
         let bind_ip = ~"0.0.0.0";
         let request_ip = ~"127.0.0.1";
-        let port = 8886;
+        let port = 8887;
         let kill_server_msg = ~"does a dog have buddha nature?";
         let server_resp_msg = ~"mu!";
         let client_port = core::comm::Port::<~str>();