Skip to content

Commit

Permalink
Fix some minor issues in the guide.
Browse files Browse the repository at this point in the history
  • Loading branch information
parir committed Aug 11, 2014
1 parent c4a63fa commit 9151599
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/doc/guide.md
Expand Up @@ -27,7 +27,7 @@ Sound good? Let's go!
# Installing Rust

The first step to using Rust is to install it! There are a number of ways to
install Rust, but the easiest is to use the the `rustup` script. If you're on
install Rust, but the easiest is to use the `rustup` script. If you're on
Linux or a Mac, all you need to do is this (note that you don't need to type
in the `$`s, they just indicate the start of each command):

Expand Down Expand Up @@ -120,7 +120,7 @@ to make a projects directory in my home directory, and keep all my projects
there. Rust does not care where your code lives.

This actually leads to one other concern we should address: this tutorial will
assume that you have basic familiarity with the command-line. Rust does not
assume that you have basic familiarity with the command line. Rust does not
require that you know a whole ton about the command line, but until the
language is in a more finished state, IDE support is spotty. Rust makes no
specific demands on your editing tooling, or where your code lives.
Expand Down Expand Up @@ -452,7 +452,7 @@ what you need, so it's not verboten.

Let's get back to bindings. Rust variable bindings have one more aspect that
differs from other languages: bindings are required to be initialized with a
value before you're allowed to use it. If we try...
value before you're allowed to use them. If we try...

```{ignore}
let x;
Expand Down Expand Up @@ -2090,7 +2090,7 @@ In this case, I happen to prefer the latter, and in the `random()` case, I prefe
the former. I think the nested `<>`s make the first option especially ugly and
a bit harder to read.

Anyway, with us now convering our input to a number, our code looks like this:
Anyway, with us now converting our input to a number, our code looks like this:

```{rust,ignore}
use std::io;
Expand Down Expand Up @@ -2281,7 +2281,7 @@ change that by adding loops!

## Looping

As we already discussed, the `loop` key word gives us an infinite loop. So
As we already discussed, the `loop` keyword gives us an infinite loop. So
let's add that in:

```{rust,no_run}
Expand Down Expand Up @@ -4099,7 +4099,7 @@ fn inverse(x: f64) -> Result<f64, String> {
```

We don't want to take the inverse of zero, so we check to make sure that we
weren't passed one. If we weren't, then we return an `Err`, with a message. If
weren't passed zero. If we were, then we return an `Err`, with a message. If
it's okay, we return an `Ok`, with the answer.

Why does this matter? Well, remember how `match` does exhaustive matches?
Expand Down

5 comments on commit 9151599

@bors
Copy link
Contributor

@bors bors commented on 9151599 Aug 11, 2014

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on 9151599 Aug 11, 2014

Choose a reason for hiding this comment

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

merging parir/rust/guide-typos = 9151599 into auto

@bors
Copy link
Contributor

@bors bors commented on 9151599 Aug 11, 2014

Choose a reason for hiding this comment

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

parir/rust/guide-typos = 9151599 merged ok, testing candidate = 9c772cd

@bors
Copy link
Contributor

@bors bors commented on 9151599 Aug 11, 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 = 9c772cd

Please sign in to comment.