about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-09-07 07:16:27 +0000
committerbors <bors@rust-lang.org>2014-09-07 07:16:27 +0000
commit57781c3c30babf85ee7a95f586ef5dcfb30104f8 (patch)
treefefe46d52ebde6f12eba5d458efc966ee8b7b884
parentc964cb229bd342bdeb0b4506c3a6d32b03e575f6 (diff)
parentd929d83eec0f5448133209698d96730e2c122ba8 (diff)
downloadrust-57781c3c30babf85ee7a95f586ef5dcfb30104f8.tar.gz
rust-57781c3c30babf85ee7a95f586ef5dcfb30104f8.zip
auto merge of #17019 : steveklabnik/rust/remove_compromise, r=thestinger
@dherman doesn't like it :smile:
-rw-r--r--src/doc/guide.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/guide.md b/src/doc/guide.md
index 73f05d77555..e4bb3ae6ba6 100644
--- a/src/doc/guide.md
+++ b/src/doc/guide.md
@@ -765,7 +765,7 @@ This is a deliberate design decision. While full-program inference is possible,
 languages which have it, like Haskell, often suggest that documenting your
 types explicitly is a best-practice. We agree that forcing functions to declare
 types while allowing for inference inside of function bodies is a wonderful
-compromise between full inference and no inference.
+sweet spot between full inference and no inference.
 
 What about returning a value? Here's a function that adds one to an integer: