Merge pull request #82 from rust-lang-nursery/bye-xargo

embedonomicon: remove mentions of Xargo and the intrinsics / compiler_builtins chapters

Author: jamesmunns

books/embedonomicon/src/SUMMARY.md

@@ -16,10 +16,8 @@
 - [Interlude II](./interlude-ii.md)
   - [Modular linker scripts](./modular-linker-scripts.md)
 - [Life before `main`](./before-main.md)
-- [Compiler intrinsics](./intrinsics.md)
 - [Less unstable](./less-unstable.md)
   - [`#[used]`](./less-unstable/used.md)
   - [`#[linkage = "weak"]`](./less-unstable/weak.md)
-  - [`compiler_builtins`](./less-unstable/compiler-builtins.md)
   - [`start` / `termination`](./less-unstable/start.md)
   - [`asm!`](./less-unstable/asm.md)

books/embedonomicon/src/cargo-config.md

@@ -19,12 +19,12 @@ rustflags = [
 target = "thumbv7m-none-eabi"
 ```
 
-Now `xargo build` does pretty much the same thing as the long `xargo rustc` invocation did. I have
+Now `cargo build` does pretty much the same thing as the long `cargo rustc` invocation did. I have
 left out the `-e` linker flag because we'll be using something different in the next chapter. If you
 test this out you should get the empty output binary.
 
 ``` console
-$ xargo build
+$ cargo build
 
 $ arm-none-eabi-size target/thumbv7m-none-eabi/debug/app
    text    data     bss     dec     hex filename

books/embedonomicon/src/exceptions/struct.md

@@ -251,7 +251,7 @@ ASSERT(_evector == ORIGIN(FLASH) + 0x40, "you forgot to call `exceptions!`");
 Now if the user forgets to call the `exceptions!` they'll get the following error:
 
 ``` console
-$ xargo build
+$ cargo build
 error: linking with `arm-none-eabi-ld` failed: exit code: 1
   |
   = note: "arm-none-eabi-ld" "-L" (..)

books/embedonomicon/src/glue-crate.md

@@ -67,13 +67,13 @@ glue = { path = "glue" }
 ```
 
 ``` console
-$ xargo build
+$ cargo build
 
 $ arm-none-eabi-size target/thumbv7m-none-eabi/debug/app
    text    data     bss     dec     hex filename
       0       0       0       0       0 target/thumbv7m-none-eabi/debug/app
 
-$ xargo rustc -- -C link-arg=-emain
+$ cargo rustc -- -C link-arg=-emain
 
 $ arm-none-eabi-size target/thumbv7m-none-eabi/debug/app
    text    data     bss     dec     hex filename

books/embedonomicon/src/intrinsics.md

@@ -3,7 +3,7 @@
 If you try to link the previous program you'll get an error:
 
 ``` console
-$ xargo build --target thumbv7m-none-eabi
+$ cargo build --target thumbv7m-none-eabi
 error: linking with `arm-none-eabi-gcc` failed: exit code: 1
   |
   = note: "arm-none-eabi-gcc" "-L" (..)
@@ -23,7 +23,7 @@ in a bunch of C stuff to make the program more POSIX-y but we don't need all tha
 linker to `ld` we'll be free of the C stuff so let's do that:
 
 ``` console
-$ xargo rustc --target thumbv7m-none-eabi -- \
+$ cargo rustc --target thumbv7m-none-eabi -- \
     -C linker=arm-none-eabi-ld -Z linker-flavor=ld
 ```
 
@@ -45,7 +45,7 @@ We can tell the linker what we want the entry point to be by passing the `-e` fl
 let's use `main` (the one produced by `rustc`) as the entry point.
 
 ``` console
-$ xargo rustc --target thumbv7m-none-eabi -- \
+$ cargo rustc --target thumbv7m-none-eabi -- \
     -C linker=arm-none-eabi-ld -Z linker-flavor=ld -C link-arg=-emain
 ```
 

books/embedonomicon/src/less-unstable/compiler-builtins.md

@@ -57,7 +57,7 @@ target = "thumbv7m-none-eabi"
 ```
 
 ``` console
-$ xargo rustc -- -C link-arg=-emain
+$ cargo rustc -- -C link-arg=-emain
 
 $ arm-none-eabi-objdump -Cd target/thumbv7m-none-eabi/debug/app
 ```

books/embedonomicon/src/linking.md

@@ -17,6 +17,6 @@ fn main() {}
 ```
 
 ``` console
-$ xargo build --target thumbv7m-none-eabi
+$ cargo build --target thumbv7m-none-eabi
 error: language item required, but not found: `panic_fmt`
 ```

books/embedonomicon/src/memory.md

@@ -41,6 +41,6 @@ unsafe extern "C" fn panic_fmt(
 ```
 
 ``` console
-$ xargo build --target thumbv7m-none-eabi
+$ cargo build --target thumbv7m-none-eabi
 error: requires `start` lang_item
 ```

books/embedonomicon/src/no-std-binary.md

@@ -102,7 +102,7 @@ Let's first turn the crate into an object file using:
 
 ``` console
 $ # NOTE disable incremental compilation to reproduce these steps
-$ xargo rustc --target thumbv7m-none-eabi -- --emit=obj -C linker=true # don't link
+$ cargo rustc --target thumbv7m-none-eabi -- --emit=obj -C linker=true # don't link
 
 $ find -name '*.o'
 ./target/thumbv7m-none-eabi/debug/deps/app-6e6a2da6f83262fd.o