Merge pull request #1222 from Rosto75/pr

Fix several shell output and code highlights.

Author: marioidival

src/attribute/cfg/custom.md

@@ -18,7 +18,7 @@ Try to run this to see what happens without the custom `cfg` flag.
 
 With the custom `cfg` flag:
 
-```bash
+```shell
 $ rustc --cfg some_condition custom.rs && ./custom
 condition met!
 ```

src/attribute/crate.md

@@ -33,7 +33,7 @@ pub fn indirect_access() {
 When the `crate_type` attribute is used, we no longer need to pass the
 `--crate-type` flag to `rustc`.
 
-```bash
+```shell
 $ rustc lib.rs
 $ ls lib*
 library.rlib

src/cargo/test.md

@@ -23,13 +23,13 @@ Each file in `tests` is a separate integration test.
 
 `cargo` naturally provides an easy way to run all of your tests!
 
-```sh
-cargo test
+```shell
+$ cargo test
 ```
 
 You should see output like this:
 
-```txt
+```shell
 $ cargo test
    Compiling blah v0.1.0 (file:///nobackup/blah)
     Finished dev [unoptimized + debuginfo] target(s) in 0.89 secs
@@ -46,11 +46,11 @@ test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
 
 You can also run tests whose name matches a pattern:
 
-```sh
-cargo test test_foo
+```shell
+$ cargo test test_foo
 ```
 
-```txt
+```shell
 $ cargo test test_foo
    Compiling blah v0.1.0 (file:///nobackup/blah)
     Finished dev [unoptimized + debuginfo] target(s) in 0.35 secs

src/crates/lib.md

@@ -18,7 +18,7 @@ pub fn indirect_access() {
 }
 ```
 
-```bash
+```shell
 $ rustc --crate-type=lib rary.rs
 $ ls lib*
 library.rlib

src/crates/link.md

@@ -19,7 +19,7 @@ fn main() {
 }
 ```
 
-```bash
+```txt
 # Where library.rlib is the path to the compiled library, assumed that it's
 # in the same directory here:
 $ rustc executable.rs --extern rary=library.rlib && ./executable

src/macros/dry.md

@@ -64,7 +64,7 @@ mod test {
 }
 ```
 
-```bash
+```shell
 $ rustc --test dry.rs && ./dry
 running 3 tests
 test test::mul_assign ... ok

src/meta/doc.md

@@ -60,7 +60,7 @@ fn main() {
 To run the tests, first build the code as a library, then tell rustdoc where
 to find the library so it can link it into each doctest program:
 
-```bash
+```shell
 $ rustc doc.rs --crate-type lib
 $ rustdoc --test --extern doc="libdoc.rlib" doc.rs
 ```

src/mod/split.md

@@ -3,7 +3,7 @@
 Modules can be mapped to a file/directory hierarchy. Let's break down the
 [visibility example][visibility] in files:
 
-```bash
+```shell
 $ tree .
 .
 |-- my
@@ -84,7 +84,7 @@ pub fn public_function() {
 
 Let's check that things still work as before:
 
-```bash
+```shell
 $ rustc split.rs && ./split
 called `my::function()`
 called `function()`

src/scope/raii.md

@@ -41,7 +41,7 @@ fn main() {
 
 Of course, we can double check for memory errors using [`valgrind`][valgrind]:
 
-```bash
+```shell
 $ rustc raii.rs && valgrind ./raii
 ==26873== Memcheck, a memory error detector
 ==26873== Copyright (C) 2002-2013, and GNU GPL'd, by Julian Seward et al.

src/std/panic.md

@@ -34,7 +34,7 @@ fn main() {
 
 Let's check that `panic!` doesn't leak memory.
 
-```bash
+```shell
 $ rustc panic.rs && valgrind ./panic
 ==4401== Memcheck, a memory error detector
 ==4401== Copyright (C) 2002-2013, and GNU GPL'd, by Julian Seward et al.

src/std_misc/arg.md

@@ -21,7 +21,7 @@ fn main() {
 }
 ```
 
-```bash
+```shell
 $ ./args 1 2 3
 My path is ./args.
 I got 3 arguments: ["1", "2", "3"].

src/std_misc/arg/matching.md

@@ -70,7 +70,7 @@ fn main() {
 }
 ```
 
-```bash
+```shell
 $ ./match_args Rust
 This is not the answer.
 $ ./match_args 42

src/std_misc/file/create.md

@@ -39,7 +39,7 @@ fn main() {
 
 Here's the expected successful output:
 
-```bash
+```shell
 $ mkdir out
 $ rustc create.rs && ./create
 successfully wrote to out/lorem_ipsum.txt

src/std_misc/file/open.md

@@ -40,7 +40,7 @@ fn main() {
 
 Here's the expected successful output:
 
-```bash
+```shell
 $ echo "Hello World!" > hello.txt
 $ rustc open.rs && ./open
 hello.txt contains:

src/std_misc/file/read_lines.md

@@ -33,7 +33,7 @@ where P: AsRef<Path>, {
 ```
 
 Running this program simply prints the lines individually.
-```bash
+```shell
 $ echo -e "127.0.0.1\n192.168.0.1\n" > hosts
 $ rustc read_lines.rs && ./read_lines
 127.0.0.1

src/std_misc/fs.md

@@ -100,7 +100,7 @@ fn main() {
 
 Here's the expected successful output:
 
-```bash
+```shell
 $ rustc fs.rs && ./fs
 `mkdir a`
 `echo hello > a/b.txt`
@@ -118,7 +118,7 @@ $ rustc fs.rs && ./fs
 
 And the final state of the `a` directory is:
 
-```text
+```shell
 $ tree a
 a
 |-- b.txt

src/testing/dev_dependencies.md

@@ -8,7 +8,7 @@ packages which depend on this package.
 One such example is using a crate that extends standard `assert!` macros.  
 File `Cargo.toml`:
 
-```ignore
+```toml
 # standard crate data is left out
 [dev-dependencies]
 pretty_assertions = "0.4.0"

src/testing/doc_testing.md

@@ -50,7 +50,7 @@ pub fn div(a: i32, b: i32) -> i32 {
 
 Tests can be run with `cargo test`:
 
-```bash
+```shell
 $ cargo test
 running 0 tests
 

src/testing/integration_testing.md

@@ -30,7 +30,7 @@ fn test_add() {
 
 Running tests with `cargo test` command:
 
-```bash
+```shell
 $ cargo test
 running 0 tests
 

src/testing/unit_testing.md

@@ -48,7 +48,7 @@ mod tests {
 
 Tests can be run with `cargo test`.
 
-```bash
+```shell
 $ cargo test
 
 running 2 tests
@@ -112,7 +112,7 @@ mod tests {
 
 Running these tests gives us:
 
-```bash
+```shell
 $ cargo test
 
 running 3 tests
@@ -133,7 +133,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
 
 To run specific tests one may specify the test name to `cargo test` command.
 
-```bash
+```shell
 $ cargo test test_any_panic
 running 1 test
 test tests::test_any_panic ... ok
@@ -150,7 +150,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
 To run multiple tests one may specify part of a test name that matches all the
 tests that should be run.
 
-```bash
+```shell
 $ cargo test panic
 running 2 tests
 test tests::test_any_panic ... ok
@@ -198,7 +198,7 @@ mod tests {
 }
 ```
 
-```bash
+```shell
 $ cargo test
 running 1 test
 test tests::ignored_test ... ignored