Skip to content

Commit

Permalink
Fix some wording about errors
Browse files Browse the repository at this point in the history
  • Loading branch information
steveklabnik committed Oct 27, 2014
1 parent e2cd459 commit 13e4dae
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/doc/guide.md
Expand Up @@ -3510,8 +3510,8 @@ everyone plays by these rules. At compile time, it verifies that none of these
rules are broken. If our program compiles successfully, Rust can guarantee it
is free of data races and other memory errors, and there is no runtime overhead
for any of this. The borrow checker works only at compile time. If the borrow
checker did find a problem, it will report a **lifetime error**, and your
program will refuse to compile.
checker did find a problem, it will report an error and your program will
refuse to compile.

That's a lot to take in. It's also one of the _most_ important concepts in
all of Rust. Let's see this syntax in action:
Expand Down

5 comments on commit 13e4dae

@bors
Copy link
Contributor

@bors bors commented on 13e4dae Oct 30, 2014

Choose a reason for hiding this comment

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

saw approval from nikomatsakis
at steveklabnik@13e4dae

@bors
Copy link
Contributor

@bors bors commented on 13e4dae Oct 30, 2014

Choose a reason for hiding this comment

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

merging steveklabnik/rust/fix_wording_about_errors = 13e4dae into auto

@bors
Copy link
Contributor

@bors bors commented on 13e4dae Oct 30, 2014

Choose a reason for hiding this comment

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

steveklabnik/rust/fix_wording_about_errors = 13e4dae merged ok, testing candidate = 52c3fe9

@bors
Copy link
Contributor

@bors bors commented on 13e4dae Oct 30, 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 13e4dae Oct 30, 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 = 52c3fe9

Please sign in to comment.