Merge branch 'incoming' into reg-snap

Author: catamorphism

src/cargo/cargo.rs

@@ -8,7 +8,7 @@ import rustc::metadata::filesearch::{get_cargo_root, get_cargo_root_nearest,
 import syntax::diagnostic;
 
 import result::{ok, err};
-import io::writer_util;
+import io::WriterUtil;
 import std::{map, json, tempfile, term, sort, getopts};
 import map::hashmap;
 import to_str::to_str;

src/compiletest/procsrv.rs

@@ -1,5 +1,5 @@
 import run::spawn_process;
-import io::writer_util;
+import io::WriterUtil;
 import libc::{c_int, pid_t};
 
 import pipes::chan;
@@ -45,8 +45,8 @@ fn run(lib_path: ~str,
     let pipe_out = os::pipe();
     let pipe_err = os::pipe();
     let pid = spawn_process(prog, args,
-                            some(env + target_env(lib_path, prog)),
-                            none, pipe_in.in, pipe_out.out, pipe_err.out);
+                            &some(env + target_env(lib_path, prog)),
+                            &none, pipe_in.in, pipe_out.out, pipe_err.out);
 
     os::close(pipe_in.in);
     os::close(pipe_out.out);

src/compiletest/runtest.rs

@@ -1,4 +1,4 @@
-import io::writer_util;
+import io::WriterUtil;
 
 import common::mode_run_pass;
 import common::mode_run_fail;
@@ -339,7 +339,7 @@ fn compose_and_run_compiler(
                     config.compile_lib_path, input)
 }
 
-fn ensure_dir(path: path) {
+fn ensure_dir(path: Path) {
     if os::path_is_dir(path) { return; }
     if !os::make_dir(path, 0x1c0i32) {
         fail fmt!{"can't make dir %s", path};
@@ -455,7 +455,7 @@ fn dump_output_file(config: config, testfile: ~str,
                     out: ~str, extension: ~str) {
     let outfile = make_out_name(config, testfile, extension);
     let writer = result::get(
-        io::file_writer(outfile, ~[io::create, io::truncate]));
+        io::file_writer(outfile, ~[io::Create, io::Truncate]));
     writer.write_str(out);
 }
 

src/etc/combine-tests.py

@@ -54,7 +54,7 @@ def scrub(b):
 d.write("use std;\n")
 d.write("use run_pass_stage2;\n")
 d.write("import run_pass_stage2::*;\n")
-d.write("import io::writer_util;\n");
+d.write("import io::WriterUtil;\n");
 d.write("fn main() {\n");
 d.write("    let out = io::stdout();\n");
 i = 0

src/etc/emacs/README.md

@@ -4,7 +4,10 @@ rust-mode: A major emacs mode for editing Rust source code
 `rust-mode` makes editing [Rust](http://rust-lang.org) code with emacs
 enjoyable.
 
-To install, check out this repository and add this to your .emacs
+
+### Manual Installation
+
+To install manually, check out this repository and add this to your .emacs
 file:
 
     (add-to-list 'load-path "/path/to/rust-mode/")
@@ -25,3 +28,60 @@ it, and pressing `C-j`:
 
 Rust mode will automatically be associated with .rs and .rc files. To
 enable it explicitly, do `M-x rust-mode`.
+
+### package.el installation via Marmalade
+
+It can be more convenient to use Emacs's package manager to handle
+installation for you if you use many elisp libraries. If you have
+package.el but haven't added Marmalade, the community package source,
+yet, add this to ~/.emacs.d/init.el:
+
+```lisp
+(require 'package)
+(add-to-list 'package-archives
+             '("marmalade" . "http://marmalade-repo.org/packages/"))
+(package-initialize)
+```
+
+Then do this to load the package listing:
+
+* <kbd>M-x eval-buffer</kbd>
+* <kbd>M-x package-refresh-contents</kbd>
+
+If you use a version of Emacs prior to 24 that doesn't include
+package.el, you can get it from http://bit.ly/pkg-el23.
+
+If you have an older ELPA package.el installed from tromey.com, you
+should upgrade in order to support installation from multiple sources.
+The ELPA archive is deprecated and no longer accepting new packages,
+so the version there (1.7.1) is very outdated.
+
+From there you can install rust-mode or any other modes by choosing
+them from a list:
+
+* <kbd>M-x package-list-packages</kbd>
+
+Now, to install packages, move your cursor to them and press i. This
+will mark the packages for installation. When you're done with
+marking, press x, and ELPA will install the packages for you (under
+~/.emacs.d/elpa/).
+
+* or using <kbd>M-x package-install rust-mode
+
+#### Important
+
+In order to have cm-mode properly initialized after compilation prior
+to rust-mode.el compilation you will need to add these `advices` to
+your init file or if you are a melpa user install the `melpa` package.
+
+```lisp
+(defadvice package-download-tar
+  (after package-download-tar-initialize activate compile)
+  "initialize the package after compilation"
+  (package-initialize))
+
+(defadvice package-download-single
+  (after package-download-single-initialize activate compile)
+  "initialize the package after compilation"
+  (package-initialize))
+```

src/etc/emacs/cm-mode.el

@@ -1,8 +1,8 @@
 ;;; cm-mode.el --- Wrapper for CodeMirror-style Emacs modes
 
 ;; Version: 0.1.0
+;; Author: Mozilla
 ;; Url: https://github.com/mozilla/rust
-
 ;; Highlighting is done by running a stateful parser (with first-class
 ;; state object) over the buffer, line by line, using the output to
 ;; add 'face properties, and storing the parser state at the end of

src/etc/emacs/rust-mode.el

@@ -1,6 +1,7 @@
 ;;; rust-mode.el --- A major emacs mode for editing Rust source code
 
 ;; Version: 0.1.0
+;; Author: Mozilla
 ;; Package-Requires: ((cm-mode "0.1.0"))
 ;; Url: https://github.com/mozilla/rust
 

src/fuzzer/fuzzer.rs

@@ -1,4 +1,4 @@
-import io::writer_util;
+import io::WriterUtil;
 
 import syntax::{ast, ast_util, fold, visit, codemap};
 import syntax::parse;
@@ -10,7 +10,7 @@ type context = { mode: test_mode }; // + rng
 
 fn write_file(filename: ~str, content: ~str) {
     result::get(
-        io::file_writer(filename, ~[io::create, io::truncate]))
+        io::file_writer(filename, ~[io::Create, io::Truncate]))
         .write_str(content);
 }
 
@@ -216,9 +216,9 @@ fn under(n: uint, it: fn(uint)) {
     while i < n { it(i); i += 1u; }
 }
 
-fn devnull() -> io::writer { io::mem_buffer_writer(io::mem_buffer()) }
+fn devnull() -> io::Writer { io::mem_buffer_writer(io::mem_buffer()) }
 
-fn as_str(f: fn@(io::writer)) -> ~str {
+fn as_str(f: fn@(io::Writer)) -> ~str {
     let buf = io::mem_buffer();
     f(io::mem_buffer_writer(buf));
     io::mem_buffer_str(buf)

src/libcore/comm.rs

@@ -1,3 +1,6 @@
+// NB: transitionary, de-mode-ing.
+#[forbid(deprecated_mode)];
+#[forbid(deprecated_pattern)];
 /*!
  * Communication between tasks
  *
@@ -162,7 +165,7 @@ fn chan<T: send>(p: port<T>) -> chan<T> {
  * Sends data over a channel. The sent data is moved into the channel,
  * whereupon the caller loses access to it.
  */
-fn send<T: send>(ch: chan<T>, -data: T) {
+fn send<T: send>(ch: chan<T>, +data: T) {
     let chan_t(p) = ch;
     let data_ptr = ptr::addr_of(data) as *();
     let res = rustrt::rust_port_id_send(p, data_ptr);

src/libcore/core.rc

@@ -54,6 +54,7 @@ export send_map;
 export hash;
 export cmp;
 export num;
+export path;
 
 // NDM seems to be necessary for resolve to work
 export option_iter;
@@ -214,11 +215,16 @@ mod pipes;
 
 // Runtime and language-primitive support
 
+#[warn(non_camel_case_types)]
 mod io;
 mod libc;
+#[warn(non_camel_case_types)]
 mod os;
+#[warn(non_camel_case_types)]
 mod path;
+#[warn(non_camel_case_types)]
 mod rand;
+#[warn(non_camel_case_types)]
 mod run;
 #[warn(non_camel_case_types)]
 mod sys;

src/libcore/core.rs

@@ -4,7 +4,7 @@
 
 import option::{some, none};
 import option = option::option;
-import path = path::path;
+import Path = path::Path;
 import tuple::{TupleOps, ExtendedTupleOps};
 import str::{str_slice, unique_str};
 import vec::{const_vector, copyable_vector, immutable_vector};
@@ -14,7 +14,7 @@ import num::Num;
 import ptr::ptr;
 import to_str::ToStr;
 
-export path, option, some, none, unreachable;
+export Path, option, some, none, unreachable;
 export extensions;
 // The following exports are the extension impls for numeric types
 export Num, times, timesi;

src/libcore/hash.rs

@@ -1,3 +1,7 @@
+// NB: transitionary, de-mode-ing.
+#[forbid(deprecated_mode)];
+#[forbid(deprecated_pattern)];
+
 /*!
  * Implementation of SipHash 2-4
  *
@@ -9,8 +13,8 @@
  * CPRNG like rand::rng.
  */
 
-import io::writer;
-import io::writer_util;
+import io::Writer;
+import io::WriterUtil;
 
 export Streaming, State;
 export default_state;
@@ -122,7 +126,7 @@ fn SipState(key0: u64, key1: u64) -> SipState {
 }
 
 
-impl &SipState : io::writer {
+impl &SipState : io::Writer {
 
     // Methods for io::writer
     fn write(msg: &[const u8]) {
@@ -205,7 +209,7 @@ impl &SipState : io::writer {
         self.ntail = left;
     }
 
-    fn seek(_x: int, _s: io::seek_style) {
+    fn seek(_x: int, _s: io::SeekStyle) {
         fail;
     }
     fn tell() -> uint {
@@ -214,8 +218,8 @@ impl &SipState : io::writer {
     fn flush() -> int {
         0
     }
-    fn get_type() -> io::writer_type {
-        io::file
+    fn get_type() -> io::WriterType {
+        io::File
     }
 }
 
@@ -362,9 +366,9 @@ fn test_siphash() {
     let stream_inc = &State(k0,k1);
     let stream_full = &State(k0,k1);
 
-    fn to_hex_str(r:[u8]/8) -> ~str {
+    fn to_hex_str(r:  &[u8]/8) -> ~str {
         let mut s = ~"";
-        for vec::each(r) |b| { s += uint::to_str(b as uint, 16u); }
+        for vec::each(*r) |b| { s += uint::to_str(b as uint, 16u); }
         return s;
     }
 
@@ -379,7 +383,7 @@ fn test_siphash() {
         stream_full.input(buf);
         let f = stream_full.result_str();
         let i = stream_inc.result_str();
-        let v = to_hex_str(vecs[t]);
+        let v = to_hex_str(&vecs[t]);
         debug!{"%d: (%s) => inc=%s full=%s", t, v, i, f};
 
         assert f == i && f == v;