---

yaml
---
r: 6773
b: refs/heads/master
c: 10cf4a1
h: refs/heads/master
i:
  6771: 384dec6
v: v3

Author: Elly Jones

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c758e11fd37f54ddfa9a628466fde7c92c027947
+refs/heads/master: 10cf4a1b0a90787ed50f3153f481e7128cffbec7

trunk/LICENSE.txt

@@ -223,32 +223,9 @@ included:
   details.
 
 
-* Additional copyright may be retained by contributors other
-  than Mozilla or the parties enumerated in this file. Such
-  copyright can be determined on a case-by-case basis by
-  examining the author of each portion of a file in the
-  revision-control commit records of the project, or by
-  consulting representative comments claiming copyright
-  ownership for a file.
-
-   For example, the text:
-
-      "Copyright (c) 2011 Google Inc."
-
-   appears in some files, and these files thereby denote
-   that their author and copyright-holder is Google Inc.
-
-   In all such cases, the absence of explicit licensing text
-   indicates that the contributor chose to license their
-   work for distribution under identical terms to those
-   Mozilla has chosen for the collective work, enumerated
-   below.  The only difference is the retention of copyright
-   itself, held by the contributor.
-
-
 The remaining code and documentation in the collective work
 presented here, as well as the collective work itslf, is
-distributed under the following terms ("The Rust License"):
+distributed under the following terms:
 
     Copyright (c) 2006-2011 Graydon Hoare
     Copyright (c) 2009-2011 Mozilla Foundation

trunk/Makefile.in

@@ -289,31 +289,19 @@ ifdef CFG_DISABLE_SHAREDSTD
     $$(HLIB$(1)_H_$(3))/libcore.rlib
   TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
     $$(TLIB$(1)_T_$(2)_H_$(3))/libcore.rlib
-
   HSTDLIB_DEFAULT$(1)_H_$(3) = \
     $$(HLIB$(1)_H_$(3))/libstd.rlib
   TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
     $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
-
-  HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
-    $$(HLIB$(1)_H_$(3))/librustc.rlib
-  TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
-    $$(TLIB$(1)_T_$(2)_H_$(3))/librustc.rlib
 else
   HCORELIB_DEFAULT$(1)_H_$(3) = \
     $$(HLIB$(1)_H_$(3))/$(CFG_CORELIB)
   TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
     $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB)
-
   HSTDLIB_DEFAULT$(1)_H_$(3) = \
     $$(HLIB$(1)_H_$(3))/$(CFG_STDLIB)
   TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
     $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB)
-
-  HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
-    $$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC)
-  TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
-    $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC)
 endif
 
 # Preqrequisites for using the stageN compiler
@@ -323,7 +311,6 @@ HSREQ$(1)_H_$(3) = \
 	$$(HLIB$(1)_H_$(3))/$$(CFG_RUSTLLVM) \
 	$$(HCORELIB_DEFAULT$(1)_H_$(3)) \
 	$$(HSTDLIB_DEFAULT$(1)_H_$(3)) \
-	$$(HLIBRUSTC_DEFAULT$(1)_H_$(3)) \
 	$$(MKFILE_DEPS)
 
 # Prerequisites for using the stageN compiler to build target artifacts
@@ -337,8 +324,7 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
 SREQ$(1)_T_$(2)_H_$(3) = \
 	$$(TSREQ$(1)_T_$(2)_H_$(3)) \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
-	$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)  \
-	$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
+	$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)
 
 ifeq ($(1),0)
 # Don't run the the stage0 compiler under valgrind - that ship has sailed

trunk/doc/tutorial/ffi.md

@@ -189,7 +189,7 @@ microsecond-resolution timer.
     use std;
     type timeval = {mutable tv_sec: u32,
                     mutable tv_usec: u32};
-    #[nolink]
+    #[link_name = ""]
     native mod libc {
         fn gettimeofday(tv: *timeval, tz: *()) -> i32;
     }
@@ -199,7 +199,7 @@ microsecond-resolution timer.
         ret (x.tv_sec as u64) * 1000_000_u64 + (x.tv_usec as u64);
     }
 
-The `#[nolink]` sets the name of the native module to the
+The `#[link_name = ""]` sets the name of the native module to the
 empty string to prevent the rust compiler from trying to link it.
 The standard C library is already linked with Rust programs.
 

trunk/mk/host.mk

@@ -68,14 +68,6 @@ $$(HLIB$(2)_H_$(4))/libstd.rlib: \
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$< $$@
 
-$$(HLIB$(2)_H_$(4))/librustc.rlib: \
-	$$(TLIB$(1)_T_$(4)_H_$(3))/librustc.rlib \
-	$$(HLIB$(2)_H_$(4))/libcore.rlib \
-	$$(HLIB$(2)_H_$(4))/libstd.rlib \
-	$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME)
-	@$$(call E, cp: $$@)
-	$$(Q)cp $$< $$@
-
 $$(HLIB$(2)_H_$(4))/$$(CFG_RUSTLLVM): \
 	$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_RUSTLLVM)
 	@$$(call E, cp: $$@)

trunk/mk/install.mk

@@ -40,8 +40,6 @@ install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
 		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB))
 	$$(Q)$$(call INSTALL_LIB, \
 		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB))
-	$$(Q)$$(call INSTALL_LIB, \
-		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB))
 	$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),intrinsics.bc)
 	$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
 endef
@@ -68,11 +66,9 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
 	$(Q)mkdir -p $(PREFIX_LIB)
 	$(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
 	$(Q)$(call INSTALL,$(HB),$(PHB),rustc$(X))
-	$(Q)$(call INSTALL,$(HB),$(PHB),cargo$(X))
 	$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
 	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
 	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))
-	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB))
 	$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM))
 	$(Q)$(call INSTALL,$(S)/man, \
 	     $(PREFIX_ROOT)/share/man/man1,rustc.1)

trunk/mk/stage0.mk

@@ -21,10 +21,6 @@ $(HLIB0_H_$(CFG_HOST_TRIPLE))/$(CFG_STDLIB): \
 		$(HBIN0_H_$(CFG_HOST_TRIPLE))/rustc$(X)
 	$(Q)touch $@
 
-$(HLIB0_H_$(CFG_HOST_TRIPLE))/$(CFG_LIBRUSTC): \
-		$(HBIN0_H_$(CFG_HOST_TRIPLE))/rustc$(X)
-	$(Q)touch $@
-
 $(HLIB0_H_$(CFG_HOST_TRIPLE))/$(CFG_RUSTLLVM): \
 		$(HBIN0_H_$(CFG_HOST_TRIPLE))/rustc$(X)
 	$(Q)touch $@
@@ -56,11 +52,6 @@ $$(HLIB0_H_$(1))/$(CFG_STDLIB): \
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$$(STDLIB_GLOB) $$@
 
-$$(HLIB0_H_$(1))/$(CFG_LIBRUSTC): \
-		$$(TLIB$(2)_T_$(1)_H_$(3))/$$(CFG_LIBRUSTC)
-	@$$(call E, cp: $$@)
-	$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$$(LIBRUSTC_GLOB) $$@
-
 $$(HLIB0_H_$(1))/$(CFG_RUSTLLVM): \
 		$$(TLIB$(2)_T_$(1)_H_$(3))/$$(CFG_RUSTLLVM)
 	@$$(call E, cp: $$@)

trunk/mk/target.mk

@@ -49,17 +49,14 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X):				\
 		$$(COMPILER_CRATE) $$(COMPILER_INPUTS)		\
 		$$(TSREQ$(1)_T_$(2)_H_$(3))					\
 		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM)	\
-		$$(TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3))      \
-		$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3))       \
-		$$(TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3))
+		$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3))  -o $$@ $$<
 
 $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC):		\
 		$$(COMPILER_CRATE) $$(COMPILER_INPUTS)		\
 		$$(TSREQ$(1)_T_$(2)_H_$(3))					\
 		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM)	\
-		$$(TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3))      \
 		$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3))  --lib -o $$@ $$< && touch $$@

trunk/src/cargo/cargo.rc

@@ -2,13 +2,15 @@
 
 // cargo.rs - Rust package manager
 
-use std;
-use rustc;
-
 // Local Variables:
 // fill-column: 78;
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
 // compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
+
+#[link(name = "cargo",
+       vers = "0.1",
+       uuid = "9ff87a04-8fed-4295-9ff8-f99bb802650b",
+       url = "http://rust-lang.org/doc/cargo")];