diff options
| author | Florian Gilcher <florian.gilcher@asquera.de> | 2014-06-02 12:37:54 +0200 |
|---|---|---|
| committer | Florian Gilcher <florian.gilcher@asquera.de> | 2014-06-02 12:37:54 +0200 |
| commit | 20fb7c62d433addf853b8ab824462fca536aba07 (patch) | |
| tree | 694477c1ce5364a2a9bc1815ed7db85aece1ff94 /src/doc/tutorial.md | |
| parent | b981add9ee56a2d6dc11aa48f01aac5d0dda9327 (diff) | |
| download | rust-20fb7c62d433addf853b8ab824462fca536aba07.tar.gz rust-20fb7c62d433addf853b8ab824462fca536aba07.zip | |
docs: Stop using `notrust`
Now that rustdoc understands proper language tags as the code not being Rust, we can tag everything properly. This change tags examples in other languages by their language. Plain notations are marked as `text`. Console examples are marked as `console`. Also fix markdown.rs to not highlight non-rust code.
Diffstat (limited to 'src/doc/tutorial.md')
| -rw-r--r-- | src/doc/tutorial.md | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md index d75071b76ed..4ee76952f0c 100644 --- a/src/doc/tutorial.md +++ b/src/doc/tutorial.md @@ -106,7 +106,7 @@ packages: If you've fulfilled those prerequisites, something along these lines should work. -~~~~ {.notrust} +~~~~console $ curl -O http://static.rust-lang.org/dist/rust-nightly.tar.gz $ tar -xzf rust-nightly.tar.gz $ cd rust-nightly @@ -151,7 +151,7 @@ error. If you introduce an error into the program (for example, by changing `println!` to some nonexistent macro), and then compile it, you'll see an error message like this: -~~~~ {.notrust} +~~~~text hello.rs:2:5: 2:24 error: macro undefined: 'print_with_unicorns' hello.rs:2 print_with_unicorns!("hello?"); ^~~~~~~~~~~~~~~~~~~ @@ -1066,7 +1066,7 @@ being destroyed along with the owner. Since the `list` variable above is immutable, the whole list is immutable. The memory allocation itself is the box, while the owner holds onto a pointer to it: -~~~ {.notrust} +~~~text List box List box List box List box +--------------+ +--------------+ +--------------+ +----------+ list -> | Cons | 1 | | -> | Cons | 2 | | -> | Cons | 3 | | -> | Nil | @@ -2841,7 +2841,7 @@ mod animals { The compiler will look for these files, in this order: -~~~ {.notrust} +~~~text src/plants.rs src/plants/mod.rs @@ -2872,7 +2872,7 @@ mod mammals { ...then the source files of `mod animals`'s submodules can either be in the same directory as the animals source file or in a subdirectory of its directory. If the animals file is `src/animals.rs`, `rustc` will look for: -~~~ {.notrust} +~~~text src/animals.rs src/fish.rs src/fish/mod.rs @@ -2883,7 +2883,7 @@ src/animals.rs If the animals file is `src/animals/mod.rs`, `rustc` will look for: -~~~ {.notrust} +~~~text src/animals/mod.rs src/animals/fish.rs src/animals/fish/mod.rs @@ -3244,10 +3244,10 @@ fn main() { println!("hello {}", world::explore()); } Now compile and run like this (adjust to your platform if necessary): -~~~~ {.notrust} -> rustc --crate-type=lib world.rs # compiles libworld-<HASH>-0.42.so -> rustc main.rs -L . # compiles main -> ./main +~~~~console +$ rustc --crate-type=lib world.rs # compiles libworld-<HASH>-0.42.so +$ rustc main.rs -L . # compiles main +$ ./main "hello world" ~~~~ |
