---

yaml
---
r: 63131
b: refs/heads/snap-stage3
c: fe3ad0a
h: refs/heads/master
i:
  63129: 65175ab
  63127: 849790a
v: v3

Author: thestinger

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 53b83525521960b4ae6f9dc90b82429013346708
+refs/heads/snap-stage3: fe3ad0a204656b43ecec7605161603d2943b0582
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/arc.rs

@@ -263,7 +263,7 @@ impl Drop for PoisonOnFail {
 
 fn PoisonOnFail<'r>(failed: &'r mut bool) -> PoisonOnFail {
     PoisonOnFail {
-        failed: ptr::to_mut_unsafe_ptr(failed)
+        failed: failed
     }
 }
 

branches/snap-stage3/src/librustc/lib/llvm.rs

@@ -2117,8 +2117,7 @@ pub fn struct_tys(struct_ty: TypeRef) -> ~[TypeRef] {
             return ~[];
         }
         let mut elts = vec::from_elem(n_elts, ptr::null());
-        llvm::LLVMGetStructElementTypes(
-            struct_ty, ptr::to_mut_unsafe_ptr(&mut elts[0]));
+        llvm::LLVMGetStructElementTypes(struct_ty, &mut elts[0]);
         return elts;
     }
 }

branches/snap-stage3/src/librustc/middle/trans/cabi_mips.rs

@@ -38,8 +38,7 @@ fn struct_tys(ty: TypeRef) -> ~[TypeRef] {
         return ~[];
     }
         let mut elts = vec::from_elem(n as uint, ptr::null());
-        llvm::LLVMGetStructElementTypes(ty,
-            ptr::to_mut_unsafe_ptr(&mut elts[0]));
+        llvm::LLVMGetStructElementTypes(ty, &mut elts[0]);
         return elts;
     }
 }

branches/snap-stage3/src/librustc/middle/trans/common.rs

@@ -964,9 +964,7 @@ pub fn T_tydesc_field(cx: @CrateContext, field: uint) -> TypeRef {
         let mut tydesc_elts: ~[TypeRef] =
             vec::from_elem::<TypeRef>(abi::n_tydesc_fields,
                                      T_nil());
-        llvm::LLVMGetStructElementTypes(
-            cx.tydesc_type,
-            ptr::to_mut_unsafe_ptr(&mut tydesc_elts[0]));
+        llvm::LLVMGetStructElementTypes(cx.tydesc_type, &mut tydesc_elts[0]);
         let t = llvm::LLVMGetElementType(tydesc_elts[field]);
         return t;
     }

branches/snap-stage3/src/librustpkg/package_id.rs

@@ -12,8 +12,9 @@ pub use package_path::{RemotePath, LocalPath, normalize, hash};
 use extra::semver;
 use core::prelude::*;
 use core::result;
-use core::prelude::*;
-use version::{default_version, try_getting_version, Version};
+
+/// Placeholder
+pub fn default_version() -> Version { ExactRevision(0.1) }
 
 /// Path-fragment identifier of a package such as
 /// 'github.com/graydon/test'; path must be a relative
@@ -48,17 +49,11 @@ impl PkgId {
         let remote_path = RemotePath(p);
         let local_path = normalize(copy remote_path);
         let short_name = (copy local_path).filestem().expect(fmt!("Strange path! %s", s));
-
-        let version = match try_getting_version(remote_path) {
-            Some(v) => v,
-            None => default_version()
-        };
-
         PkgId {
             local_path: local_path,
             remote_path: remote_path,
             short_name: short_name,
-            version: version
+            version: default_version()
         }
     }
 
@@ -79,3 +74,59 @@ impl ToStr for PkgId {
         fmt!("%s-%s", self.local_path.to_str(), self.version.to_str())
     }
 }
+
+/// A version is either an exact revision,
+/// or a semantic version
+pub enum Version {
+    ExactRevision(float),
+    SemVersion(semver::Version)
+}
+
+
+impl Ord for Version {
+    fn lt(&self, other: &Version) -> bool {
+        match (self, other) {
+            (&ExactRevision(f1), &ExactRevision(f2)) => f1 < f2,
+            (&SemVersion(ref v1), &SemVersion(ref v2)) => v1 < v2,
+            _ => false // incomparable, really
+        }
+    }
+    fn le(&self, other: &Version) -> bool {
+        match (self, other) {
+            (&ExactRevision(f1), &ExactRevision(f2)) => f1 <= f2,
+            (&SemVersion(ref v1), &SemVersion(ref v2)) => v1 <= v2,
+            _ => false // incomparable, really
+        }
+    }
+    fn ge(&self, other: &Version) -> bool {
+        match (self, other) {
+            (&ExactRevision(f1), &ExactRevision(f2)) => f1 > f2,
+            (&SemVersion(ref v1), &SemVersion(ref v2)) => v1 > v2,
+            _ => false // incomparable, really
+        }
+    }
+    fn gt(&self, other: &Version) -> bool {
+        match (self, other) {
+            (&ExactRevision(f1), &ExactRevision(f2)) => f1 >= f2,
+            (&SemVersion(ref v1), &SemVersion(ref v2)) => v1 >= v2,
+            _ => false // incomparable, really
+        }
+    }
+
+}
+
+impl ToStr for Version {
+    fn to_str(&self) -> ~str {
+        match *self {
+            ExactRevision(ref n) => n.to_str(),
+            SemVersion(ref v) => v.to_str()
+        }
+    }
+}
+
+pub fn parse_vers(vers: ~str) -> result::Result<semver::Version, ~str> {
+    match semver::parse(vers) {
+        Some(vers) => result::Ok(vers),
+        None => result::Err(~"could not parse version: invalid")
+    }
+}

branches/snap-stage3/src/librustpkg/rustpkg.rc

@@ -18,7 +18,6 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[no_core];
 #[no_std];
 
 extern mod core(name = "std");
@@ -54,7 +53,6 @@ mod target;
 #[cfg(test)]
 mod tests;
 mod util;
-mod version;
 mod workspace;
 
 pub mod usage;

branches/snap-stage3/src/librustpkg/tests.rs

@@ -18,8 +18,7 @@ use core::prelude::*;
 use core::result;
 use extra::tempfile::mkdtemp;
 use package_path::*;
-use package_id::PkgId;
-use version::{default_version, ExactRevision};
+use package_id::{PkgId, default_version};
 use path_util::{target_executable_in_workspace, target_library_in_workspace,
                target_test_in_workspace, target_bench_in_workspace,
                make_dir_rwx, u_rwx,
@@ -54,16 +53,6 @@ fn remote_pkg() -> PkgId {
     }
 }
 
-fn remote_versioned_pkg() -> PkgId {
-    let remote = RemotePath(Path("github.com/catamorphism/test_pkg_version"));
-    PkgId {
-        local_path: normalize(copy remote),
-        remote_path: remote,
-        short_name: ~"test_pkg_version",
-        version: default_version()
-    }
-}
-
 fn writeFile(file_path: &Path, contents: &str) {
     let out: @io::Writer =
         result::get(&io::file_writer(file_path,
@@ -253,18 +242,3 @@ fn test_package_ids_must_be_relative_path_like() {
     }
 
 }
-
-#[test]
-fn test_package_version() {
-    let workspace = mkdtemp(&os::tmpdir(), "test").expect("couldn't create temp dir");
-    let sysroot = test_sysroot();
-    debug!("sysroot = %s", sysroot.to_str());
-    let ctxt = fake_ctxt(Some(@sysroot));
-    let temp_pkg_id = PkgId::new("github.com/catamorphism/test_pkg_version");
-    match temp_pkg_id.version {
-        ExactRevision(0.2) => (),
-        _ => fail!(fmt!("test_package_version: package version was %?, expected Some(0.2)",
-                        temp_pkg_id.version))
-    }
-    // also check that file paths are right
-}

branches/snap-stage3/src/librustpkg/version.rs

@@ -47,7 +47,7 @@ pub static neg_infinity: float = -1.0/0.0;
 /* Module: consts */
 pub mod consts {
     // FIXME (requires Issue #1433 to fix): replace with mathematical
-    // constants from cmath.
+    // staticants from cmath.
     /// Archimedes' constant
     pub static pi: float = 3.14159265358979323846264338327950288;
 

branches/snap-stage3/src/libstd/num/float.rs

@@ -1179,7 +1179,7 @@ pub fn real_args() -> ~[~str] {
 #[cfg(windows)]
 pub fn real_args() -> ~[~str] {
     let mut nArgs: c_int = 0;
-    let lpArgCount = ptr::to_mut_unsafe_ptr(&mut nArgs);
+    let lpArgCount: *mut c_int = &mut nArgs;
     let lpCmdLine = unsafe { GetCommandLineW() };
     let szArgList = unsafe { CommandLineToArgvW(lpCmdLine, lpArgCount) };
 

branches/snap-stage3/src/libstd/os.rs

@@ -1315,8 +1315,8 @@ pub fn swap<T>(v: &mut [T], a: uint, b: uint) {
     unsafe {
         // Can't take two mutable loans from one vector, so instead just cast
         // them to their raw pointers to do the swap
-        let pa: *mut T = ptr::to_mut_unsafe_ptr(&mut v[a]);
-        let pb: *mut T = ptr::to_mut_unsafe_ptr(&mut v[b]);
+        let pa: *mut T = &mut v[a];
+        let pb: *mut T = &mut v[b];
         ptr::swap_ptr(pa, pb);
     }
 }

branches/snap-stage3/src/libstd/vec.rs

@@ -26,8 +26,7 @@ pub fn main() {
 
 fn do_swap(test: &mut TestDescAndFn) {
     unsafe {
-        ptr::swap_ptr(ptr::to_mut_unsafe_ptr(test),
-                      ptr::to_mut_unsafe_ptr(test));
+        ptr::swap_ptr(test, test);
     }
 }