Skip to content

Commit

Permalink
Rollup merge of rust-lang#25249 - robyoung:minor-doc-fix, r=Manishearth
Browse files Browse the repository at this point in the history
Remove an rogue 'is' and fix some line wrapping.
  • Loading branch information
Manishearth committed May 10, 2015
2 parents 4f69a32 + 978dc9f commit 1f1348e
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/doc/trpl/guessing-game.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ prints a [string][strings] to the screen.
let mut guess = String::new();
```

Now we’re getting interesting! There’s a lot going on in this little line. The first thing to notice is that this is a [let statement][let], which is used to create ‘variable bindings’. They take this form:
Now we’re getting interesting! There’s a lot going on in this little line.
The first thing to notice is that this is a [let statement][let], which is
used to create ‘variable bindings’. They take this form:

```rust,ignore
let foo = bar;
Expand Down Expand Up @@ -171,7 +173,7 @@ bound to: `String::new()`.

[string]: ../std/string/struct.String.html

The `::new()` syntax is uses `::` because this is an ‘associated function’ of
The `::new()` syntax uses `::` because this is an ‘associated function’ of
a particular type. That is to say, it’s associated with `String` itself,
rather than a particular instance of a `String`. Some languages call this a
‘static method’.
Expand Down

0 comments on commit 1f1348e

Please sign in to comment.