Skip to content

Commit

Permalink
doc: Address feedback about intro
Browse files Browse the repository at this point in the history
  • Loading branch information
brson committed Apr 15, 2014
1 parent 6bacbcc commit d1eb0e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
li {list-style-type: none; }
</style>

* [A 30-minute Intro to Rust](intro.html) (read this first)
* [A 30-minute Intro to Rust](intro.html)
* [The Rust tutorial](tutorial.html) (* [PDF](tutorial.pdf))
* [The Rust reference manual](rust.html) (* [PDF](rust.pdf))

Expand Down
3 changes: 3 additions & 0 deletions src/doc/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ int add_one(void)
}
```

**Note: obviously this is very simple and non-idiomatic C++.
You wouldn't write it in practice; it is for illustrative purposes.**

This function allocates an integer on the stack,
and stores it in a variable, `i`.
It then returns a reference to the variable `i`.
Expand Down

5 comments on commit d1eb0e3

@bors
Copy link
Contributor

@bors bors commented on d1eb0e3 Apr 15, 2014

Choose a reason for hiding this comment

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

saw approval from alexcrichton
at brson@d1eb0e3

@bors
Copy link
Contributor

@bors bors commented on d1eb0e3 Apr 15, 2014

Choose a reason for hiding this comment

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

merging brson/rust/30min = d1eb0e3 into auto

@bors
Copy link
Contributor

@bors bors commented on d1eb0e3 Apr 15, 2014

Choose a reason for hiding this comment

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

brson/rust/30min = d1eb0e3 merged ok, testing candidate = 8a4ffbf

@bors
Copy link
Contributor

@bors bors commented on d1eb0e3 Apr 15, 2014

@bors
Copy link
Contributor

@bors bors commented on d1eb0e3 Apr 15, 2014

Choose a reason for hiding this comment

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

fast-forwarding master to auto = 8a4ffbf

Please sign in to comment.