auto merge of #11148 : alexcrichton/rust/snapshots, r=luqmana

bors · bors · commit f74b8f0d3a90 · 2013-12-26T11:36:37.000-08:00
C++ is gone for good and `crate_id` is the new `pkgid`.
diff --git a/mk/rt.mk b/mk/rt.mk
@@ -74,7 +74,6 @@ endif
 
 RUNTIME_CS_$(1)_$(2) := \
               rt/rust_builtin.c \
-              rt/rust_upcall.c \
               rt/miniz.c \
               rt/rust_android_dummy.c \
               rt/rust_test_helpers.c
diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs
@@ -20,8 +20,6 @@ Rust extras are part of the standard Rust distribution.
 
 */
 
-// NOTE: remove after snapshot
-#[pkgid = "extra#0.9-pre"];
 #[crate_id = "extra#0.9-pre"];
 #[comment = "Rust extras"];
 #[license = "MIT/ASL2"];
diff --git a/src/libgreen/lib.rs b/src/libgreen/lib.rs
@@ -17,7 +17,6 @@
 //! This can be optionally linked in to rust programs in order to provide M:N
 //! functionality inside of 1:1 programs.
 
-#[pkgid = "green#0.9-pre"];
 #[crate_id = "green#0.9-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs
@@ -14,7 +14,6 @@
 //! runtime. In addition, all I/O provided by this crate is the thread blocking
 //! version of I/O.
 
-#[pkgid = "native#0.9-pre"];
 #[crate_id = "native#0.9-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// NOTE: remove after snapshot
-#[pkgid = "rustc#0.9-pre"];
 #[crate_id = "rustc#0.9-pre"];
 #[comment = "The Rust compiler"];
 #[license = "MIT/ASL2"];
diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs
@@ -828,8 +828,7 @@ fn check_heap_item(cx: &Context, it: &ast::item) {
 }
 
 static crate_attrs: &'static [&'static str] = &[
-// NOTE: remove pkgid after snapshot
-    "crate_type", "feature", "no_uv", "no_main", "no_std", "pkgid", "crate_id",
+    "crate_type", "feature", "no_uv", "no_main", "no_std", "crate_id",
     "desc", "comment", "license", "copyright", // not used in rustc now
 ];
 
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// NOTE: remove after snapshot
-#[pkgid = "rustdoc#0.9-pre"];
 #[crate_id = "rustdoc#0.9-pre"];
 #[desc = "rustdoc, the Rust documentation extractor"];
 #[license = "MIT/ASL2"];
diff --git a/src/librustpkg/lib.rs b/src/librustpkg/lib.rs
@@ -10,8 +10,6 @@
 
 // rustpkg - a package manager and build system for Rust
 
-// NOTE: remove after snapshot
-#[pkgid = "rustpkg#0.9-pre"];
 #[crate_id = "rustpkg#0.9-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];
diff --git a/src/librustuv/lib.rs b/src/librustuv/lib.rs
@@ -34,8 +34,6 @@ via `close` and `delete` methods.
 
 */
 
-// NOTE: remove after snapshot
-#[pkgid = "rustuv#0.9-pre"];
 #[crate_id = "rustuv#0.9-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
@@ -43,8 +43,6 @@
 //!
 //!     use std::prelude::*;
 
-// NOTE: remove after snapshot
-#[pkgid = "std#0.9-pre"];
 #[crate_id = "std#0.9-pre"];
 #[comment = "The Rust standard library"];
 #[license = "MIT/ASL2"];
diff --git a/src/libstd/rtdeps.rs b/src/libstd/rtdeps.rs
@@ -43,28 +43,3 @@ extern {}
 #[cfg(target_os = "macos")]
 #[link(name = "pthread")]
 extern {}
-
-// NOTE: remove after snapshot
-// stage0-generated code still depends on c++
-#[cfg(stage0)]
-mod stage0 {
-    #[cfg(target_os = "linux")]
-    #[link(name = "stdc++")]
-    extern {}
-
-    #[cfg(target_os = "android")]
-    #[link(name = "supc++")]
-    extern {}
-
-    #[cfg(target_os = "freebsd")]
-    #[link(name = "stdc++")]
-    extern {}
-
-    #[cfg(target_os = "macos")]
-    #[link(name = "stdc++")]
-    extern {}
-
-    #[cfg(target_os = "win32")]
-    #[link(name = "stdc++")]
-    extern {}
-}
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
@@ -13,8 +13,6 @@
  *  macros.
  */
 
-// NOTE: remove pkgid after snapshot
-#[pkgid = "syntax#0.9-pre"];
 #[crate_id = "syntax#0.9-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];
diff --git a/src/rt/rust_upcall.c b/src/rt/rust_upcall.c
diff --git a/src/snapshots.txt b/src/snapshots.txt
@@ -1,3 +1,11 @@
+S 2013-12-25 cab6af5
+  freebsd-x86_64 bf06667e19a24ffad3a4111c704e9e919f08b076
+  linux-i386 1d3c54daa6192f823dab694e5ea42c636633df6b
+  linux-x86_64 1af14ca2b248061d5a999062d6bb0825420c0add
+  macos-i386 7cee8aefd84c8d93cde40b89bf787b669e911171
+  macos-x86_64 d4a4ef8f2b28d3d5eafbccf0df07999efd8115af
+  winnt-i386 847e8858bcae47cd56bf1ea3b3c0d536897c8d68
+
 S 2013-12-17 d5798b3
   freebsd-x86_64 8f71dbd1aef6c59867ce6287cc82c6033e1ee5e5
   linux-i386 3a6e8950ef704ec57ab690b30beda19d7a63a537

Original file line number	Diff line number	Diff line change
`@@ -828,8 +828,7 @@ fn check_heap_item(cx: &Context, it: &ast::item) {`
`828`	`828`	`}`
`829`	`829`
`830`	`830`	`static crate_attrs: &'static [&'static str] = &[`
`831`		`-// NOTE: remove pkgid after snapshot`
`832`		`- "crate_type", "feature", "no_uv", "no_main", "no_std", "pkgid", "crate_id",`
	`831`	`+ "crate_type", "feature", "no_uv", "no_main", "no_std", "crate_id",`
`833`	`832`	`"desc", "comment", "license", "copyright", // not used in rustc now`
`834`	`833`	`];`
`835`	`834`