---

yaml
---
r: 150863
b: refs/heads/try2
c: 45e4fad
h: refs/heads/master
i:
  150861: e7c8770
  150859: cd8dc17
  150855: 5640314
  150847: 786a295
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 1dec47711dc145fdfd675497fb6adb8ff80354ad
+refs/heads/try2: 45e4fad5d0693b9a4ffdcdb572c8f45157eb4baa
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/man/rustc.1

@@ -1,6 +1,6 @@
 .TH RUSTC "1" "March 2014" "rustc 0.11-pre" "User Commands"
 .SH NAME
-rustc \- rust compiler
+rustc \- The Rust compiler
 .SH SYNOPSIS
 .B rustc
 [\fIOPTIONS\fR] \fIINPUT\fR
@@ -33,9 +33,17 @@ List the symbols defined by a library crate
 \fB\-\-no\-trans\fR
 Run all passes except translation; no output
 .TP
-\fB\-g\fR, \fB\-\-debuginfo\fR
+\fB\-\-no\-analysis\fR
+Parse and expand the source, but run no analysis and produce no output
+.TP
+\fB\-g\fR
 Emit DWARF debug information into object files generated.
 .TP
+\fB\-\-debuginfo\fR LEVEL
+Emit DWARF debug info to the objects created: 0 = no debug info, 1 =
+line-tables only (for stacktraces and breakpoints), 2 = full debug
+info with variable and type information (same as -g).
+.TP
 \fB\-O\fR
 Equivalent to \fI\-\-opt\-level=2\fR
 .TP
@@ -58,6 +66,10 @@ Pretty-print the input instead of compiling; valid types are: normal
 expanded, with type annotations), or identified (fully parenthesized,
 AST nodes and blocks with IDs)
 .TP
+\fB\-\-dep-info\fR [FILENAME]
+Output dependency info to <filename> after compiling, in o format suitable
+for use by Makefiles.
+.TP
 \fB\-\-sysroot\fR PATH
 Override the system root
 .TP
@@ -151,15 +163,14 @@ level.
 Generates software floating point library calls instead of hardware
 instructions.
 .TP
-\fBgen-crate-map\fR
-Forces generate of a toplevel crate map. May be required for logging to work
-when rust is embedded into another application.
-.TP
 \fBprefer-dynamic\fR
 Prefers dynamic linking to static linking.
 .TP
 \fBno-integrated-as\fR
 Force usage of an external assembler rather than LLVM's integrated one.
+.TP
+\fBrelocation-model\fR=[pic,static,dynamic-no-pic]
+The relocation model to use. (default: pic)
 
 .SH "EXAMPLES"
 To build an executable from a source file with a main function:
@@ -182,7 +193,8 @@ rustdoc
 See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.
 
 .SH "AUTHOR"
-See \fBAUTHORS.txt\fR in the Rust source distribution.
+See \fBAUTHORS.txt\fR in the rust source distribution. Graydon Hoare
+<\fI[email protected]\fR> is the project leader.
 
 .SH "COPYRIGHT"
 This work is dual-licensed under Apache 2.0 and MIT terms.  See \fBCOPYRIGHT\fR

branches/try2/man/rustdoc.1

@@ -90,7 +90,8 @@ rustc
 See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.
 
 .SH "AUTHOR"
-See \fBAUTHORS.txt\fR in the Rust source distribution.
+See \fBAUTHORS.txt\fR in the rust source distribution. Graydon Hoare
+<\fI[email protected]\fR> is the project leader.
 
 .SH "COPYRIGHT"
 This work is dual-licensed under Apache 2.0 and MIT terms.  See \fBCOPYRIGHT\fR

branches/try2/mk/dist.mk

@@ -118,7 +118,7 @@ PKG_EXE = dist/$(PKG_NAME)-install.exe
 %.ico: $(S)src/etc/pkg/%.ico
 	cp $< $@
 
-$(PKG_EXE): rust.iss modpath.iss upgrade.iss LICENSE.txt rust-logo.ico \
+$(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \
             $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \
             dist-prepare-win
 	$(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py tmp/dist/win/bin

branches/try2/mk/prepare.mk

@@ -20,7 +20,13 @@
 #   PREPARE_TARGETS - the target triples, space separated
 #   PREPARE_DEST_DIR - the directory to put the image
 
+
+# On windows we install from stage3, but on unix only stage2
+ifdef CFG_WINDOWSY_$(CFG_BUILD)
+PREPARE_STAGE=3
+else
 PREPARE_STAGE=2
+endif
 
 DEFAULT_PREPARE_DIR_CMD = umask 022 && mkdir -p
 DEFAULT_PREPARE_BIN_CMD = install -m755

branches/try2/src/doc/complement-lang-faq.md

@@ -27,7 +27,7 @@ Some examples that demonstrate different aspects of the language:
 
 You may also be interested in browsing [GitHub's Rust][github-rust] page.
 
-[github-rust]: https://github.com/trending?l=rust
+[github-rust]: https://github.com/languages/Rust
 
 ## Does it run on Windows?
 
@@ -141,14 +141,8 @@ export RUST_LOG=hello
 ./hello
 ```
 
-**Long answer** RUST_LOG takes a 'logging spec' that consists of a
-comma-separated list of paths, where a path consists of the crate name and
-sequence of module names, each separated by double-colons. For standalone .rs
-files the crate is implicitly named after the source file, so in the above
-example we were setting RUST_LOG to the name of the hello crate. Multiple paths
-can be combined to control the exact logging you want to see. For example, when
-debugging linking in the compiler you might set
-`RUST_LOG=rustc::metadata::creader,rustc::util::filesearch,rustc::back::rpath`
-For a full description see [the language reference][1].
+**Long answer** RUST_LOG takes a 'logging spec' that consists of a comma-separated list of paths, where a path consists of the crate name and sequence of module names, each separated by double-colons. For standalone .rs files the crate is implicitly named after the source file, so in the above example we were setting RUST_LOG to the name of the hello crate. Multiple paths can be combined to control the exact logging you want to see. For example, when debugging linking in the compiler you might set `RUST_LOG=rustc::metadata::creader,rustc::util::filesearch,rustc::back::rpath`
+
+If you aren't sure which paths you need, try setting RUST_LOG to `::help` and running your program. This will print a list of paths available for logging. For a full description see [the language reference][1].
 
 [1]:http://doc.rust-lang.org/doc/master/rust.html#logging-system

branches/try2/src/doc/guide-unsafe.md

@@ -70,7 +70,7 @@ use std::cast;
 let mut x: u8 = 1;
 
 let ref_1: &mut u8 = &mut x;
-let ref_2: &mut u8 = unsafe { cast::transmute_mut_lifetime(ref_1) };
+let ref_2: &mut u8 = unsafe { cast::transmute_mut_region(ref_1) };
 
 // oops, ref_1 and ref_2 point to the same piece of data (x) and are
 // both usable

branches/try2/src/doc/rust.md

@@ -1586,10 +1586,10 @@ pub struct Bar {
     field: int
 }
 
-// Declare a public enum with two public variants
+// Declare a public enum with public and private variants
 pub enum State {
     PubliclyAccessibleState,
-    PubliclyAccessibleState2,
+    priv PrivatelyAccessibleState
 }
 ~~~~
 
@@ -4056,6 +4056,10 @@ crate name the crate is given a default name that matches the source file,
 with the extension removed. In that case, to turn on logging for a program
 compiled from, e.g. `helloworld.rs`, `RUST_LOG` should be set to `helloworld`.
 
+As a convenience, the logging spec can also be set to a special pseudo-crate,
+`::help`. In this case, when the application starts, the runtime will
+simply output a list of loaded modules containing log expressions, then exit.
+
 #### Logging Expressions
 
 Rust provides several macros to log information. Here's a simple Rust program

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

@@ -3,29 +3,17 @@
 ;; Version: 0.2.0
 ;; Author: Mozilla
 ;; Url: https://github.com/mozilla/rust
-;; Keywords: languages
-
-;;; Commentary:
-;;
-
-;;; Code:
 
+(eval-when-compile (require 'cl))
 (eval-when-compile (require 'misc))
 
-;; for GNU Emacs < 24.3
-(eval-when-compile
-  (unless (fboundp 'setq-local)
-    (defmacro setq-local (var val)
-      "Set variable VAR to value VAL in current buffer."
-      (list 'set (list 'make-local-variable (list 'quote var)) val))))
-
 ;; Syntax definitions and helpers
 (defvar rust-mode-syntax-table
   (let ((table (make-syntax-table)))
 
     ;; Operators
-    (dolist (i '(?+ ?- ?* ?/ ?& ?| ?^ ?! ?< ?> ?~ ?@))
-      (modify-syntax-entry i "." table))
+    (loop for i in '(?+ ?- ?* ?/ ?& ?| ?^ ?! ?< ?> ?~ ?@)
+          do (modify-syntax-entry i "." table))
 
     ;; Strings
     (modify-syntax-entry ?\" "\"" table)
@@ -42,14 +30,10 @@
 
     table))
 
-(defgroup rust-mode nil
-  "Support for Rust code."
-  :link '(url-link "http://www.rust-lang.org/")
-  :group 'languages)
+(defgroup rust-mode nil "Support for Rust code.")
 
 (defcustom rust-indent-offset 4
-  "Indent Rust code by this number of spaces."
-  :type 'integer
+  "*Indent Rust code by this number of spaces."
   :group 'rust-mode)
 
 (defun rust-paren-level () (nth 0 (syntax-ppss)))
@@ -242,16 +226,17 @@
      )
 
    ;; Item definitions
-   (mapcar #'(lambda (x)
-               (list (rust-re-item-def (car x))
-                     1 (cdr x)))
-           '(("enum" . font-lock-type-face)
-             ("struct" . font-lock-type-face)
-             ("type" . font-lock-type-face)
-             ("mod" . font-lock-type-face)
-             ("use" . font-lock-type-face)
-             ("fn" . font-lock-function-name-face)
-             ("static" . font-lock-constant-face)))))
+   (loop for (item . face) in
+
+         '(("enum" . font-lock-type-face)
+           ("struct" . font-lock-type-face)
+           ("type" . font-lock-type-face)
+           ("mod" . font-lock-type-face)
+           ("use" . font-lock-type-face)
+           ("fn" . font-lock-function-name-face)
+           ("static" . font-lock-constant-face))
+
+         collect `(,(rust-re-item-def item) 1 ,face))))
 
 (defun rust-fill-prefix-for-comment-start (line-start)
   "Determine what to use for `fill-prefix' based on what is at the beginning of a line."
@@ -365,17 +350,17 @@
 
 ;;; Imenu support
 (defvar rust-imenu-generic-expression
-  (append (mapcar #'(lambda (x)
-                      (list nil (rust-re-item-def x) 1))
-                  '("enum" "struct" "type" "mod" "fn" "trait"))
+  (append (loop for item in
+                '("enum" "struct" "type" "mod" "fn" "trait")
+                collect `(nil ,(rust-re-item-def item) 1))
           `(("Impl" ,(rust-re-item-def "impl") 1)))
   "Value for `imenu-generic-expression' in Rust mode.
 
 Create a flat index of the item definitions in a Rust file.
 
 Imenu will show all the enums, structs, etc. at the same level.
-Implementations will be shown under the `Impl` subheading.  Use
-idomenu (imenu with `ido-mode') for best mileage.")
+Implementations will be shown under the `Impl` subheading.
+Use idomenu (imenu with ido-mode) for best mileage.")
 
 ;;; Defun Motions
 
@@ -384,7 +369,8 @@ idomenu (imenu with `ido-mode') for best mileage.")
       (concat "^\\s-*\\(?:priv\\|pub\\)?\\s-*"
               (regexp-opt
                '("enum" "struct" "type" "mod" "use" "fn" "static" "impl"
-                 "extern" "impl" "static" "trait"))))
+                 "extern" "impl" "static" "trait"
+                 ))))
 
 (defun rust-beginning-of-defun (&optional arg)
   "Move backward to the beginning of the current defun.
@@ -425,43 +411,52 @@ This is written mainly to be used as `end-of-defun-function' for Rust."
 (define-derived-mode rust-mode rust-parent-mode "Rust"
   "Major mode for Rust code."
   :group 'rust-mode
-  :syntax-table rust-mode-syntax-table
+
+  ;; Basic syntax
+  (set-syntax-table rust-mode-syntax-table)
 
   ;; Indentation
-  (setq-local indent-line-function 'rust-mode-indent-line)
+  (set (make-local-variable 'indent-line-function)
+       'rust-mode-indent-line)
 
   ;; Fonts
-  (setq-local font-lock-defaults '(rust-mode-font-lock-keywords nil nil nil nil))
+  (set (make-local-variable 'font-lock-defaults)
+       '(rust-mode-font-lock-keywords nil nil nil nil))
 
   ;; Misc
-  (setq-local comment-start "// ")
-  (setq-local comment-end   "")
-  (setq-local indent-tabs-mode nil)
+  (set (make-local-variable 'comment-start) "// ")
+  (set (make-local-variable 'comment-end)   "")
+  (set (make-local-variable 'indent-tabs-mode) nil)
 
   ;; Allow paragraph fills for comments
-  (setq-local comment-start-skip "\\(?://[/!]*\\|/\\*[*!]?\\)[[:space:]]*")
-  (setq-local paragraph-start
+  (set (make-local-variable 'comment-start-skip)
+       "\\(?://[/!]*\\|/\\*[*!]?\\)[[:space:]]*")
+  (set (make-local-variable 'paragraph-start)
        (concat "[[:space:]]*\\(?:" comment-start-skip "\\|\\*/?[[:space:]]*\\|\\)$"))
-  (setq-local paragraph-separate paragraph-start)
-  (setq-local normal-auto-fill-function 'rust-do-auto-fill)
-  (setq-local fill-paragraph-function 'rust-fill-paragraph)
-  (setq-local fill-forward-paragraph-function 'rust-fill-forward-paragraph)
-  (setq-local adaptive-fill-function 'rust-find-fill-prefix)
-  (setq-local comment-multi-line t)
-  (setq-local comment-line-break-function 'rust-comment-indent-new-line)
-  (setq-local imenu-generic-expression rust-imenu-generic-expression)
-  (setq-local beginning-of-defun-function 'rust-beginning-of-defun)
-  (setq-local end-of-defun-function 'rust-end-of-defun))
+  (set (make-local-variable 'paragraph-separate) paragraph-start)
+  (set (make-local-variable 'normal-auto-fill-function) 'rust-do-auto-fill)
+  (set (make-local-variable 'fill-paragraph-function) 'rust-fill-paragraph)
+  (set (make-local-variable 'fill-forward-paragraph-function) 'rust-fill-forward-paragraph)
+  (set (make-local-variable 'adaptive-fill-function) 'rust-find-fill-prefix)
+  (set (make-local-variable 'comment-multi-line) t)
+  (set (make-local-variable 'comment-line-break-function) 'rust-comment-indent-new-line)
+  (set (make-local-variable 'imenu-generic-expression) rust-imenu-generic-expression)
+  (set (make-local-variable 'beginning-of-defun-function) 'rust-beginning-of-defun)
+  (set (make-local-variable 'end-of-defun-function) 'rust-end-of-defun)
+  )
+
 
 ;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
+(add-to-list 'auto-mode-alist '("\\.rs$" . rust-mode))
 
 (defun rust-mode-reload ()
   (interactive)
   (unload-feature 'rust-mode)
   (require 'rust-mode)
   (rust-mode))
 
+(provide 'rust-mode)
+
 ;; Issue #6887: Rather than inheriting the 'gnu compilation error
 ;; regexp (which is broken on a few edge cases), add our own 'rust
 ;; compilation error regexp and use it instead.
@@ -485,6 +480,4 @@ See `compilation-error-regexp-alist for help on their format.")
                   (cons 'rustc rustc-compilation-regexps))
      (add-to-list 'compilation-error-regexp-alist 'rustc)))
 
-(provide 'rust-mode)
-
 ;;; rust-mode.el ends here

branches/try2/src/etc/pkg/modpath.iss

@@ -164,7 +164,7 @@ begin
 end;
 
 
-procedure ModPathCurStepChanged(CurStep: TSetupStep);
+procedure CurStepChanged(CurStep: TSetupStep);
 var
 	taskname:	String;
 begin

branches/try2/src/etc/pkg/rust.iss

@@ -49,15 +49,4 @@ begin
 	setArrayLength(Result, 1)
 	Result[0] := ExpandConstant('{app}\bin');
 end;
-
-#include "modpath.iss"
-#include "upgrade.iss"
-
-// Both modpath.iss and upgrade.iss want to overload CurStepChanged.
-// This version does the overload then delegates to each.
-
-procedure CurStepChanged(CurStep: TSetupStep);
-begin
-  UpgradeCurStepChanged(CurStep);
-  ModPathCurStepChanged(CurStep);
-end;
+#include "modpath.iss"