---

yaml
---
r: 194671
b: refs/heads/master
c: c5b8763
h: refs/heads/master
i:
  194669: 2044e8f
  194667: 8b9e772
  194663: 47edbc5
  194655: 17f16fb
v: v3

Author: erickt

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8eb918e9701f927fde42d0f2ea0ab4438bbd6c79
+refs/heads/master: c5b876375312410c6e0df6e72155c8d0fac62c2c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 552080181c58beef03493a110b4a38b20b6b5da5
 refs/heads/try: 961e0358e1a5c0faaef606e31e9965742c1643bf

trunk/src/doc/trpl/README.md

@@ -29,12 +29,7 @@ and will be able to understand most Rust code and write more complex programs.
 
 In a similar fashion to "Intermediate," this section is full of individual,
 deep-dive chapters, which stand alone and can be read in any order. These
-chapters focus on the most complex features,
+chapters focus on the most complex features, as well as some things that
+are only available in upcoming versions of Rust.
 
-<h2 class="section-header"><a href="unstable.html">Unstable</a></h2>
-
-In a similar fashion to "Intermediate," this section is full of individual,
-deep-dive chapters, which stand alone and can be read in any order.
-
-This chapter contains things that are only available on the nightly channel of
-Rust.
+After reading "Advanced," you'll be a Rust expert!

trunk/src/doc/trpl/SUMMARY.md

@@ -36,12 +36,6 @@
     * [FFI](ffi.md)
     * [Unsafe Code](unsafe.md)
     * [Advanced Macros](advanced-macros.md)
-* [Unstable Rust](unstable.md)
     * [Compiler Plugins](plugins.md)
-    * [Inline Assembly](inline-assembly.md)
-    * [No stdlib](no-stdlib.md)
-    * [Intrinsics](intrinsics.md)
-    * [Lang items](lang-items.md)
-    * [Link args](link-args.md)
 * [Conclusion](conclusion.md)
 * [Glossary](glossary.md)

trunk/src/doc/trpl/advanced-macros.md

@@ -206,6 +206,8 @@ the [Bitwise Cyclic Tag](http://esolangs.org/wiki/Bitwise_Cyclic_Tag) automaton
 within Rust's macro system.
 
 ```rust
+#![feature(trace_macros)]
+
 macro_rules! bct {
     // cmd 0:  d ... => ...
     (0, $($ps:tt),* ; $_d:tt)
@@ -227,6 +229,13 @@ macro_rules! bct {
     ( $($ps:tt),* ; )
         => (());
 }
+
+fn main() {
+    trace_macros!(true);
+# /* just check the definition
+    bct!(0, 0, 1, 1, 1 ; 1, 0, 1);
+# */
+}
 ```
 
 Exercise: use macros to reduce duplication in the above definition of the

trunk/src/doc/trpl/ffi.md

@@ -366,6 +366,31 @@ A few examples of how this model can be used are:
 
 On OSX, frameworks behave with the same semantics as a dynamic library.
 
+## The `link_args` attribute
+
+There is one other way to tell rustc how to customize linking, and that is via
+the `link_args` attribute. This attribute is applied to `extern` blocks and
+specifies raw flags which need to get passed to the linker when producing an
+artifact. An example usage would be:
+
+``` no_run
+#![feature(link_args)]
+
+#[link_args = "-foo -bar -baz"]
+extern {}
+# fn main() {}
+```
+
+Note that this feature is currently hidden behind the `feature(link_args)` gate
+because this is not a sanctioned way of performing linking. Right now rustc
+shells out to the system linker, so it makes sense to provide extra command line
+arguments, but this will not always be the case. In the future rustc may use
+LLVM directly to link native libraries in which case `link_args` will have no
+meaning.
+
+It is highly recommended to *not* use this attribute, and rather use the more
+formal `#[link(...)]` attribute on `extern` blocks instead.
+
 # Unsafe blocks
 
 Some operations, like dereferencing unsafe pointers or calling functions that have been marked