diff options
| author | bors <bors@rust-lang.org> | 2014-07-17 17:16:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-17 17:16:23 +0000 |
| commit | c4b1077dfbc835f1d1d1a9efbc9b11d6b9c0e35d (patch) | |
| tree | 07dbbc85b02886ff05bae5539db8aa2972ccee05 /src/libsyntax | |
| parent | 92b5bf86b775b2749b2e5f4300650370052c9001 (diff) | |
| parent | a1def0856ed8c658a4985f405b1ec04eb85c4786 (diff) | |
| download | rust-c4b1077dfbc835f1d1d1a9efbc9b11d6b9c0e35d.tar.gz rust-c4b1077dfbc835f1d1d1a9efbc9b11d6b9c0e35d.zip | |
auto merge of #15706 : phi-gamma/rust/master, r=huonw
I kept changes to each file in a separate commit. Please let me know if you prefer them squashed!
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/parse/obsolete.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/obsolete.rs b/src/libsyntax/parse/obsolete.rs index cadae7ef12f..ba401d313d8 100644 --- a/src/libsyntax/parse/obsolete.rs +++ b/src/libsyntax/parse/obsolete.rs @@ -76,7 +76,7 @@ impl<'a> ParserObsoleteMethods for parser::Parser<'a> { ), ObsoleteManagedExpr => ( "`@` notation for a managed pointer allocation", - "use the `box(GC)` oeprator instead of `@`" + "use the `box(GC)` operator instead of `@`" ), }; |