---

yaml
---
r: 174548
b: refs/heads/tmp
c: b7afe5e
h: refs/heads/master
v: v3

Author: barosl

[refs]

@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 5431727b6e521548419ec2606ef22ffa43097f72
+refs/heads/tmp: b7afe5ec2762cb295b6adffd94ec6bec3b7c0f15

branches/tmp/mk/tests.mk

@@ -1011,7 +1011,8 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
 	    $$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)) \
 	    "$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))" \
 	    "$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
-	    $(1)
+	    $(1) \
+	    $$(S)
 	@touch $$@
 else
 # FIXME #11094 - The above rule doesn't work right for multiple targets

branches/tmp/src/doc/guide-crates.md

@@ -1,4 +1,4 @@
 % The (old) Rust Crates and Modules Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/crates-and-modules.html).

branches/tmp/src/doc/guide-error-handling.md

@@ -1,4 +1,4 @@
 % Error Handling in Rust
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/error-handling.html).

branches/tmp/src/doc/guide-ffi.md

@@ -1,4 +1,4 @@
 % The (old) Rust Foreign Function Interface Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/ffi.html).

branches/tmp/src/doc/guide-macros.md

@@ -1,4 +1,4 @@
 % The (old) Rust Macros Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/macros.html).

branches/tmp/src/doc/guide-ownership.md

@@ -1,4 +1,4 @@
 % The (old) Rust Ownership Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/ownership.html).

branches/tmp/src/doc/guide-plugins.md

@@ -1,4 +1,4 @@
 % The (old) Rust Compiler Plugins Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/plugins.html).

branches/tmp/src/doc/guide-pointers.md

@@ -1,4 +1,4 @@
 % The (old) Rust Pointer Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/pointers.html).

branches/tmp/src/doc/guide-strings.md

@@ -1,4 +1,4 @@
 % The (old) Guide to Rust Strings
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/strings.html).

branches/tmp/src/doc/guide-tasks.md

@@ -1,4 +1,4 @@
 % The (old) Rust Threads and Communication Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/tasks.html).

branches/tmp/src/doc/guide-testing.md

@@ -1,4 +1,4 @@
 % The (old) Rust Testing Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/testing.html).

branches/tmp/src/doc/guide-unsafe.md

@@ -1,4 +1,4 @@
 % Writing Safe Low-level and Unsafe Code in Rust
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/unsafe.html).

branches/tmp/src/doc/guide.md

@@ -1,4 +1,4 @@
 % The (old) Rust Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/README.html).

branches/tmp/src/doc/reference.md

@@ -2451,7 +2451,7 @@ There are three different types of inline attributes:
 * `#[inline(always)]` asks the compiler to always perform an inline expansion.
 * `#[inline(never)]` asks the compiler to never perform an inline expansion.
 
-### Derive
+### `derive`
 
 The `derive` attribute allows certain traits to be automatically implemented
 for data structures. For example, the following will create an `impl` for the

branches/tmp/src/doc/trpl/unsafe.md

@@ -447,7 +447,7 @@ in the same format as C:
 
 ```
 #![no_std]
-#![feature(lang_items)]
+#![feature(lang_items, start)]
 
 // Pull in the system libc library for what crt0.o likely requires
 extern crate libc;
@@ -475,7 +475,7 @@ compiler's name mangling too:
 ```ignore
 #![no_std]
 #![no_main]
-#![feature(lang_items)]
+#![feature(lang_items, start)]
 
 extern crate libc;
 
@@ -529,7 +529,7 @@ vectors provided from C, using idiomatic Rust practices.
 
 ```
 #![no_std]
-#![feature(lang_items)]
+#![feature(lang_items, start)]
 
 # extern crate libc;
 extern crate core;
@@ -653,7 +653,7 @@ sugar for dynamic allocations via `malloc` and `free`:
 
 ```
 #![no_std]
-#![feature(lang_items, box_syntax)]
+#![feature(lang_items, box_syntax, start)]
 
 extern crate libc;
 

branches/tmp/src/etc/generate-deriving-span-tests.py

@@ -12,8 +12,8 @@
 
 """
 This script creates a pile of compile-fail tests check that all the
-derivings have spans that point to the fields, rather than the
-#[deriving(...)] line.
+derives have spans that point to the fields, rather than the
+#[derive(...)] line.
 
 sample usage: src/etc/generate-deriving-span-tests.py
 """
@@ -46,29 +46,29 @@
 """
 
 ENUM_STRING = """
-#[deriving({traits})]
+#[derive({traits})]
 enum Enum {{
    A(
      Error {errors}
      )
 }}
 """
 ENUM_STRUCT_VARIANT_STRING = """
-#[deriving({traits})]
+#[derive({traits})]
 enum Enum {{
    A {{
      x: Error {errors}
    }}
 }}
 """
 STRUCT_STRING = """
-#[deriving({traits})]
+#[derive({traits})]
 struct Struct {{
     x: Error {errors}
 }}
 """
 STRUCT_TUPLE_STRING = """
-#[deriving({traits})]
+#[derive({traits})]
 struct Struct(
     Error {errors}
 );
@@ -80,14 +80,14 @@ def create_test_case(type, trait, super_traits, number_of_errors):
     string = [ENUM_STRING, ENUM_STRUCT_VARIANT_STRING, STRUCT_STRING, STRUCT_TUPLE_STRING][type]
     all_traits = ','.join([trait] + super_traits)
     super_traits = ','.join(super_traits)
-    error_deriving = '#[deriving(%s)]' % super_traits if super_traits else ''
+    error_deriving = '#[derive(%s)]' % super_traits if super_traits else ''
 
     errors = '\n'.join('//~%s ERROR' % ('^' * n) for n in range(error_count))
     code = string.format(traits = all_traits, errors = errors)
     return TEMPLATE.format(year = YEAR, error_deriving=error_deriving, code = code)
 
 def write_file(name, string):
-    test_file = os.path.join(TEST_DIR, 'deriving-span-%s.rs' % name)
+    test_file = os.path.join(TEST_DIR, 'derives-span-%s.rs' % name)
 
     # set write permission if file exists, so it can be changed
     if os.path.exists(test_file):