---

jakejscott · jakejscott · commit 3c9a1e021224 · 2014-08-10T14:12:15.000+12:00
yaml --- r: 132642 b: refs/heads/dist-snap c: e7db11c h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 457a3c991d79b971be07fce75f9d0c12848fb37c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: be6c7cf882bacc9da96df5304679af678390d5b0
+refs/heads/dist-snap: e7db11c90b1a7f1f5ebae00785931dbfb4f35fbf
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
diff --git a/branches/dist-snap/CONTRIBUTING.md b/branches/dist-snap/CONTRIBUTING.md
@@ -16,8 +16,7 @@ please do two things:
 
 2. Run the full Rust test suite with the `make check` command.  You're
    not off the hook even if you just stick to documentation; code
-   examples in the docs are tested as well! Although for simple
-   wording or grammar fixes, this is probably unnecessary.
+   examples in the docs are tested as well!
 
 Pull requests will be treated as "review requests", and we will give
 feedback we expect to see corrected on
diff --git a/branches/dist-snap/mk/main.mk b/branches/dist-snap/mk/main.mk
@@ -139,10 +139,6 @@ endif
 RUSTFLAGS_STAGE0 += -C prefer-dynamic
 RUSTFLAGS_STAGE1 += -C prefer-dynamic
 
-# Landing pads require a lot of codegen. We can get through bootstrapping faster
-# by not emitting them.
-RUSTFLAGS_STAGE0 += -Z no-landing-pads
-
 # platform-specific auto-configuration
 include $(CFG_SRC_DIR)mk/platform.mk
 
diff --git a/branches/dist-snap/src/doc/guide-pointers.md b/branches/dist-snap/src/doc/guide-pointers.md
@@ -655,7 +655,7 @@ This part is coming soon.
 # Returning Pointers
 
 In many languages with pointers, you'd return a pointer from a function
-so as to avoid a copying a large data structure. For example:
+so as to avoid copying a large data structure. For example:
 
 ```{rust}
 struct BigStruct {
diff --git a/branches/dist-snap/src/librustdoc/html/layout.rs b/branches/dist-snap/src/librustdoc/html/layout.rs
@@ -106,7 +106,7 @@ r##"<!DOCTYPE html>
             </p>
             <p>
                 Accepted types are: <code>fn</code>, <code>mod</code>,
-                <code>struct</code>, <code>enum</code>,
+                <code>struct</code> (or <code>str</code>), <code>enum</code>,
                 <code>trait</code>, <code>typedef</code> (or
                 <code>tdef</code>).
             </p>
diff --git a/branches/dist-snap/src/librustdoc/html/static/main.js b/branches/dist-snap/src/librustdoc/html/static/main.js
@@ -368,19 +368,18 @@
         }
 
         function getQuery() {
-            var matches, type, query, raw = $('.search-input').val();
-            query = raw;
+            var matches, type, query = $('.search-input').val();
 
-            matches = query.match(/^(fn|mod|struct|enum|trait|t(ype)?d(ef)?)\s*:\s*/i);
+            matches = query.match(/^(fn|mod|str(uct)?|enum|trait|t(ype)?d(ef)?)\s*:\s*/i);
             if (matches) {
                 type = matches[1].replace(/^td$/, 'typedef')
+                                 .replace(/^str$/, 'struct')
                                  .replace(/^tdef$/, 'typedef')
                                  .replace(/^typed$/, 'typedef');
                 query = query.substring(matches[0].length);
             }
 
             return {
-                raw: raw,
                 query: query,
                 type: type,
                 id: query + type,
@@ -536,10 +535,10 @@
             if (browserSupportsHistoryApi()) {
                 if (!history.state && !params.search) {
                     history.pushState(query, "", "?search=" +
-                                                encodeURIComponent(query.raw));
+                                                encodeURIComponent(query.query));
                 } else {
                     history.replaceState(query, "", "?search=" +
-                                                encodeURIComponent(query.raw));
+                                                encodeURIComponent(query.query));
                 }
             }
 
