about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-07-04 09:57:02 -0700
committerGitHub <noreply@github.com>2016-07-04 09:57:02 -0700
commite7cf491d22dbc2b97021e6eaa34eba8588d2ac86 (patch)
tree62e657458490dba8725c95212d7e05bf97cefb9c /src
parentacfa113c12e986a084f4a9346a479f9573f5b54f (diff)
parent2d7abe88bfa6b36be6ba020f87a1f391c7266daa (diff)
downloadrust-e7cf491d22dbc2b97021e6eaa34eba8588d2ac86.tar.gz
rust-e7cf491d22dbc2b97021e6eaa34eba8588d2ac86.zip
Auto merge of #34602 - Xmasreturns:patch-4, r=steveklabnik
Update glossary.md

Added a brief description of Combinators
Diffstat (limited to 'src')
-rw-r--r--src/doc/book/glossary.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/doc/book/glossary.md b/src/doc/book/glossary.md
index 0956580ade0..8aa7fdff948 100644
--- a/src/doc/book/glossary.md
+++ b/src/doc/book/glossary.md
@@ -46,6 +46,12 @@ must abide by that constraint.
 
 [traits]: traits.html
 
+### Combinators
+
+Combinators are higher-order functions that apply only functions and
+earlier defined combinators to provide a result from its arguments. 
+They can be used to manage control flow in a modular fashion.
+
 ### DST (Dynamically Sized Type)
 
 A type without a statically known size or alignment. ([more info][link])