---

yaml
---
r: 107607
b: refs/heads/dist-snap
c: fa84593
h: refs/heads/master
i:
  107605: 9f98d75
  107603: 47d2274
  107599: 961d2e6
v: v3

Author: klutzy

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 9f4e5b6f3182da3a5dacd9edec2e73b7cd792f25
+refs/heads/dist-snap: fa84593fc3098c4631be0887b772f0665b731a31
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/Makefile.in

@@ -367,7 +367,7 @@ LLVM_COMPONENTS=x86 arm mips ipo bitreader bitwriter linker asmparser jit mcjit
                 interpreter instrumentation
 
 # Only build these LLVM tools
-LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt llvm-extract
+LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt
 
 define DEF_LLVM_VARS
 # The configure script defines these variables with the target triples

branches/dist-snap/doc/guide-ffi.md

@@ -230,7 +230,7 @@ impl<T: Send> Drop for Unique<T> {
             // We need to move the object out of the box, so that
             // the destructor is called (at the end of this scope.)
             ptr::replace_ptr(self.ptr, x);
-            free(self.ptr as *mut c_void)
+            free(self.ptr as *c_void)
         }
     }
 }

branches/dist-snap/doc/tutorial.md

@@ -3071,8 +3071,7 @@ The effect it has on your module hierarchy mirrors aspects of both `mod` and `us
   The linkage information the binary needs to use the library `foo`.
 
 - But like `use`, all `extern mod` statements that refer to the same library are interchangeable,
-  as each one really just presents an alias to an external module (the crate root of the library
-  you're linking against).
+  as each one really just presents an alias to an external module (the crate root of the library your linking against).
 
 Remember how `use`-statements have to go before local declarations because the latter shadows the former?
 Well, `extern mod` statements also have their own rules in that regard:

branches/dist-snap/man/rustc.1

@@ -122,8 +122,8 @@ To build an executable from a source file with a main function:
 To build a library from a source file:
     $ rustc --lib hello-lib.rs
 
-To build either with a crate (.rs) file:
-    $ rustc hello.rs
+To build either with a crate (.rc) file:
+    $ rustc hello.rc
 
 To build an executable with debug info (experimental):
     $ rustc -Z debug-info -o hello hello.rs

branches/dist-snap/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang

@@ -5,7 +5,7 @@
 <language id="rust" _name="Rust" version="2.0" _section="Sources">
   <metadata>
     <property name="mimetypes">text/x-rust</property>
-    <property name="globs">*.rs</property>
+    <property name="globs">*.rs;*.rc</property>
     <property name="line-comment-start">//</property>
     <property name="block-comment-start">/*</property>
     <property name="block-comment-end">*/</property>

branches/dist-snap/src/etc/gedit/share/mime/packages/rust.xml

@@ -2,5 +2,6 @@
   <mime-type type="text/x-rust">
     <comment>Rust Source</comment>
     <glob pattern="*.rs"/>
+    <glob pattern="*.rc"/>
   </mime-type>
 </mime-info>

branches/dist-snap/src/etc/kate/rust.xml

@@ -7,7 +7,7 @@
 	<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
 	<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
 ]>
-<language name="Rust" version="0.10-pre" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/x-rust" priority="15">
+<language name="Rust" version="0.10-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
 <highlighting>
 	<list name="fn">
 		<item> fn </item>

branches/dist-snap/src/etc/vim/ftdetect/rust.vim

@@ -1 +1 @@
-au BufRead,BufNewFile *.rs set filetype=rust
+au BufRead,BufNewFile *.rs,*.rc set filetype=rust

branches/dist-snap/src/libextra/c_vec.rs

@@ -172,7 +172,7 @@ mod tests {
             let mem = malloc_raw(n);
 
             CVec::new_with_dtor(mem as *mut u8, n,
-                proc() { libc::free(mem as *mut c_void); })
+                proc() { libc::free(mem as *c_void); })
         }
     }
 

branches/dist-snap/src/libextra/flate.rs

@@ -53,7 +53,7 @@ fn deflate_bytes_internal(bytes: &[u8], flags: c_int) -> ~[u8] {
         assert!(res as int != 0);
             let out = vec::raw::from_buf_raw(res as *u8,
                                              outsz as uint);
-        libc::free(res as *mut c_void);
+        libc::free(res);
         out
     }
 }
@@ -76,7 +76,7 @@ fn inflate_bytes_internal(bytes: &[u8], flags: c_int) -> ~[u8] {
         assert!(res as int != 0);
         let out = vec::raw::from_buf_raw(res as *u8,
                                          outsz as uint);
-        libc::free(res as *mut c_void);
+        libc::free(res);
         out
     }
 }

branches/dist-snap/src/libnative/bookkeeping.rs

@@ -45,6 +45,5 @@ pub fn wait_for_other_tasks() {
             TASK_LOCK.wait();
         }
         TASK_LOCK.unlock();
-        TASK_LOCK.destroy();
     }
 }

branches/dist-snap/src/libnative/io/file.rs

@@ -548,13 +548,13 @@ pub fn readdir(p: &CString) -> IoResult<~[Path]> {
             let p = Path::new(p);
             let star = p.join("*");
             as_utf16_p(star.as_str().unwrap(), |path_ptr| {
-                let wfd_ptr = malloc_raw(rust_list_dir_wfd_size() as uint);
+                let wfd_ptr = malloc_raw(rust_list_dir_wfd_size() as uint) as *c_void;
                 let find_handle = FindFirstFileW(path_ptr, wfd_ptr as HANDLE);
                 if find_handle as libc::c_int != INVALID_HANDLE_VALUE {
                     let mut paths = ~[];
                     let mut more_files = 1 as libc::c_int;
                     while more_files != 0 {
-                        let fp_buf = rust_list_dir_wfd_fp_buf(wfd_ptr as *c_void);
+                        let fp_buf = rust_list_dir_wfd_fp_buf(wfd_ptr);
                         if fp_buf as uint == 0 {
                             fail!("os::list_dir() failure: got null ptr from wfd");
                         }
@@ -567,7 +567,7 @@ pub fn readdir(p: &CString) -> IoResult<~[Path]> {
                         more_files = FindNextFileW(find_handle, wfd_ptr as HANDLE);
                     }
                     FindClose(find_handle);
-                    free(wfd_ptr as *mut c_void);
+                    free(wfd_ptr);
                     Ok(paths)
                 } else {
                     Err(super::last_error())

branches/dist-snap/src/libnative/io/mod.rs

@@ -46,22 +46,6 @@ pub mod file;
 pub mod process;
 pub mod net;
 
-#[cfg(target_os = "macos")]
-#[cfg(target_os = "freebsd")]
-#[path = "timer_other.rs"]
-pub mod timer;
-
-#[cfg(target_os = "linux")]
-#[cfg(target_os = "android")]
-#[path = "timer_timerfd.rs"]
-pub mod timer;
-
-#[cfg(target_os = "win32")]
-#[path = "timer_win32.rs"]
-pub mod timer;
-
-mod timer_helper;
-
 type IoResult<T> = Result<T, IoError>;
 
 fn unimpl() -> IoError {
@@ -265,7 +249,7 @@ impl rtio::IoFactory for IoFactory {
 
     // misc
     fn timer_init(&mut self) -> IoResult<~RtioTimer> {
-        timer::Timer::new().map(|t| ~t as ~RtioTimer)
+        Err(unimpl())
     }
     fn spawn(&mut self, config: ProcessConfig)
             -> IoResult<(~RtioProcess, ~[Option<~RtioPipe>])> {