---

yaml
---
r: 105906
b: refs/heads/auto
c: f079c94
h: refs/heads/master
v: v3

Author: pongad

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 2eebeb81372e320510a1c1e2eef96eb5146a1e1f
+refs/heads/auto: f079c94f723f8c67319da8c727324b2011d7b36f
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/mk/docs.mk

@@ -147,10 +147,6 @@ SHOULD_BUILD_PDF_DOC_$(1) = 1
 endef
 $(foreach docname,$(PDF_DOCS),$(eval $(call DEF_SHOULD_BUILD_PDF_DOC,$(docname))))
 
-doc/footer.tex: $(D)/footer.inc | doc/
-	@$(call E, pandoc: $@)
-	$(CFG_PANDOC) --from=html --to=latex $< --output=$@
-
 define DEF_DOC
 
 # HTML (rustdoc)
@@ -167,6 +163,10 @@ doc/$(1).epub: $$(D)/$(1).md | doc/
 	@$$(call E, pandoc: $$@)
 	$$(CFG_PANDOC) $$(PANDOC_EPUB_OPTS) $$< --output=$$@
 
+doc/footer.tex: $(D)/footer.inc | doc/
+	@$$(call E, pandoc: $$@)
+	$$(CFG_PANDOC) --from=html --to=latex $$< --output=$$@
+
 # PDF (md =(pandoc)=> tex =(pdflatex)=> pdf)
 DOC_TARGETS += doc/$(1).tex
 doc/$(1).tex: $$(D)/$(1).md doc/footer.tex doc/version.tex | doc/

branches/auto/src/compiletest/compiletest.rs

@@ -191,13 +191,13 @@ pub fn opt_str2(maybestr: Option<~str>) -> ~str {
 }
 
 pub fn str_mode(s: ~str) -> mode {
-    match s {
-      ~"compile-fail" => mode_compile_fail,
-      ~"run-fail" => mode_run_fail,
-      ~"run-pass" => mode_run_pass,
-      ~"pretty" => mode_pretty,
-      ~"debug-info" => mode_debug_info,
-      ~"codegen" => mode_codegen,
+    match s.as_slice() {
+      "compile-fail" => mode_compile_fail,
+      "run-fail" => mode_run_fail,
+      "run-pass" => mode_run_pass,
+      "pretty" => mode_pretty,
+      "debug-info" => mode_debug_info,
+      "codegen" => mode_codegen,
       _ => fail!("invalid mode")
     }
 }

branches/auto/src/compiletest/runtest.rs

@@ -38,9 +38,9 @@ use test::MetricMap;
 
 pub fn run(config: config, testfile: ~str) {
 
-    match config.target {
+    match config.target.as_slice() {
 
-        ~"arm-linux-androideabi" => {
+        "arm-linux-androideabi" => {
             if !config.adb_device_status {
                 fail!("android device not available");
             }
@@ -277,8 +277,8 @@ fn run_debuginfo_test(config: &config, props: &TestProps, testfile: &Path) {
     let exe_file = make_exe_name(config, testfile);
 
     let mut proc_args;
-    match config.target {
-        ~"arm-linux-androideabi" => {
+    match config.target.as_slice() {
+        "arm-linux-androideabi" => {
 
             cmds = cmds.replace("run","continue");
 
@@ -682,9 +682,9 @@ fn exec_compiled_test(config: &config, props: &TestProps,
 
     let env = props.exec_env.clone();
 
-    match config.target {
+    match config.target.as_slice() {
 
-        ~"arm-linux-androideabi" => {
+        "arm-linux-androideabi" => {
             _arm_exec_compiled_test(config, props, testfile, env)
         }
 
@@ -735,9 +735,9 @@ fn compose_and_run_compiler(
                 &auxres);
         }
 
-        match config.target {
+        match config.target.as_slice() {
 
-            ~"arm-linux-androideabi" => {
+            "arm-linux-androideabi" => {
                 _arm_push_aux_shared_library(config, testfile);
             }
 

branches/auto/src/doc/index.md

@@ -35,10 +35,8 @@ li {list-style-type: none; }
 * [The `getopts` argument parsing library](getopts/index.html)
 * [The `glob` file path matching library](glob/index.html)
 * [The `green` M:N runtime library](green/index.html)
-* [The `hexfloat` library for hexadecimal floating-point literals](hexfloat/index.html)
 * [The `native` 1:1 threading runtime](native/index.html)
 * [The `num` arbitrary precision numerics library](num/index.html)
-* [The `rand` library for random numbers and distributions](rand/index.html)
 * [The `rustc` compiler](rustc/index.html)
 * [The `rustuv` M:N I/O library](rustuv/index.html)
 * [The `semver` version collation library](semver/index.html)

branches/auto/src/doc/rust.md

@@ -1472,6 +1472,7 @@ and are instead terminated by a semicolon.
 
 ~~~~
 # use std::libc::{c_char, FILE};
+# #[nolink]
 
 extern {
     fn fopen(filename: *c_char, mode: *c_char) -> *FILE;

branches/auto/src/etc/emacs/rust-mode-tests.el

@@ -570,11 +570,6 @@ fn indenting_middle_of_line() {
                pull_me_back_in();
 }
 }
-
-fn indented_already() {
-    
-    // The previous line already has its spaces
-}
 "
 
       ;; Symbol -> (line column)
@@ -601,15 +596,7 @@ fn indented_already() {
                                   (after-whitespace-indent-start (13 1))
                                   (after-whitespace-indent-target (13 8))
                                   (middle-pull-indent-start (15 19))
-                                  (middle-pull-indent-target (15 12))
-                                  (blank-line-indented-already-bol-start (20 0))
-                                  (blank-line-indented-already-bol-target (20 4))
-                                  (blank-line-indented-already-middle-start (20 2))
-                                  (blank-line-indented-already-middle-target (20 4))
-                                  (nonblank-line-indented-already-bol-start (21 0))
-                                  (nonblank-line-indented-already-bol-target (21 4))
-                                  (nonblank-line-indented-already-middle-start (21 2))
-                                  (nonblank-line-indented-already-middle-target (21 4))))
+                                  (middle-pull-indent-target (15 12))))
 
 (defun rust-get-buffer-pos (pos-symbol)
   "Get buffer position from POS-SYMBOL.
@@ -806,31 +793,3 @@ All positions are position symbols found in `rust-test-positions-alist'."
    'middle-pull-indent-start
    'middle-pull-indent-target
    #'indent-for-tab-command))
-
-(ert-deftest indent-line-blank-line-indented-already-bol ()
-  (rust-test-motion
-   rust-test-indent-motion-string
-   'blank-line-indented-already-bol-start
-   'blank-line-indented-already-bol-target
-   #'indent-for-tab-command))
-
-(ert-deftest indent-line-blank-line-indented-already-middle ()
-  (rust-test-motion
-   rust-test-indent-motion-string
-   'blank-line-indented-already-middle-start
-   'blank-line-indented-already-middle-target
-   #'indent-for-tab-command))
-
-(ert-deftest indent-line-nonblank-line-indented-already-bol ()
-  (rust-test-motion
-   rust-test-indent-motion-string
-   'nonblank-line-indented-already-bol-start
-   'nonblank-line-indented-already-bol-target
-   #'indent-for-tab-command))
-
-(ert-deftest indent-line-nonblank-line-indented-already-middle ()
-  (rust-test-motion
-   rust-test-indent-motion-string
-   'nonblank-line-indented-already-middle-start
-   'nonblank-line-indented-already-middle-target
-   #'indent-for-tab-command))

branches/auto/src/etc/emacs/rust-mode.el

@@ -140,14 +140,14 @@
                     ;; Otherwise, we are continuing the same expression from the previous line,
                     ;; so add one additional indent level
                     (+ baseline rust-indent-offset))))))))))
-
-    ;; If we're at the beginning of the line (before or at the current
-    ;; indentation), jump with the indentation change.  Otherwise, save the
-    ;; excursion so that adding the indentations will leave us at the
-    ;; equivalent position within the line to where we were before.
-    (if (<= (current-column) (current-indentation))
-        (indent-line-to indent)
-      (save-excursion (indent-line-to indent)))))
+    (when (not (eq (current-indentation) indent))
+      ;; If we're at the beginning of the line (before or at the current
+      ;; indentation), jump with the indentation change.  Otherwise, save the
+      ;; excursion so that adding the indentations will leave us at the
+      ;; equivalent position within the line to where we were before.
+      (if (<= (current-column) (current-indentation))
+          (indent-line-to indent)
+        (save-excursion (indent-line-to indent))))))
 
 
 ;; Font-locking definitions and helpers