Skip to content

Commit

Permalink
Minor modifications to Axel's tutorial improvements (see also #12472).
Browse files Browse the repository at this point in the history
  • Loading branch information
pnkfelix committed Feb 27, 2014
1 parent 0c46a68 commit 6557b51
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/doc/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,10 @@ fn main() {
println!("hello?");
}
~~~~
> ***Note:*** *Macros* are explained in the [Syntax extensions
> (3.4)](#syntax-extensions) section.
> ***Note:*** An identifier followed by an exclamation point, like
> `println!`, is a macro invocation. Macros are explained
> [later](#syntax-extensions); for now just remember to include the
> exclamation point.
If the Rust compiler was installed successfully, running `rustc
hello.rs` will produce an executable called `hello` (or `hello.exe` on
Expand Down Expand Up @@ -1347,8 +1349,8 @@ assert!(xs.eq(&ys));
assert!(!xs.ne(&ys));
// The Eq trait also allows us to use the shorthand infix operators.
assert!(xs == ys);
assert!(!(xs != ys));
assert!(xs == ys); // `xs == ys` is short for `xs.eq(&ys)`
assert!(!(xs != ys)); // `xs != ys` is short for `xs.ne(&ys)`
~~~

# More on boxes
Expand Down

4 comments on commit 6557b51

@bors
Copy link
Contributor

@bors bors commented on 6557b51 Feb 27, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pnkfelix
at pnkfelix@6557b51

@bors
Copy link
Contributor

@bors bors commented on 6557b51 Feb 27, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging pnkfelix/rust/fsk-issue12472-tutorial-improvement = 6557b51 into auto

@bors
Copy link
Contributor

@bors bors commented on 6557b51 Feb 27, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pnkfelix/rust/fsk-issue12472-tutorial-improvement = 6557b51 merged ok, testing candidate = a10e8505

@bors
Copy link
Contributor

@bors bors commented on 6557b51 Feb 27, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.