about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-05-04 13:16:20 +0000
committerbors <bors@rust-lang.org>2015-05-04 13:16:20 +0000
commita979efc2f961c2cf8d7afa57b905e73349b8f476 (patch)
treed51e30b7c35364eb8fd84b0fa855e8dc61011d6d
parent165a8dec9ce200ede5ad29c8ab7f8e7064c478f3 (diff)
parent7826711dcbdb14b87873ffa6655cbef6d6829966 (diff)
downloadrust-a979efc2f961c2cf8d7afa57b905e73349b8f476.tar.gz
rust-a979efc2f961c2cf8d7afa57b905e73349b8f476.zip
Auto merge of #25082 - shepmaster:inline-docs, r=steveklabnik
-rw-r--r--src/doc/reference.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/doc/reference.md b/src/doc/reference.md
index 3918a558cb3..8103ce8f7f6 100644
--- a/src/doc/reference.md
+++ b/src/doc/reference.md
@@ -2044,12 +2044,12 @@ A complete list of the built-in language items will be added in the future.
 
 ### Inline attributes
 
-The inline attribute is used to suggest to the compiler to perform an inline
-expansion and place a copy of the function or static in the caller rather than
-generating code to call the function or access the static where it is defined.
+The inline attribute suggests that the compiler should place a copy of
+the function or static in the caller, rather than generating code to
+call the function or access the static where it is defined.
 
 The compiler automatically inlines functions based on internal heuristics.
-Incorrectly inlining functions can actually making the program slower, so it
+Incorrectly inlining functions can actually make the program slower, so it
 should be used with care.
 
 Immutable statics are always considered inlineable unless marked with
@@ -2057,8 +2057,8 @@ Immutable statics are always considered inlineable unless marked with
 have the same memory address. In other words, the compiler is free to collapse
 duplicate inlineable statics together.
 
-`#[inline]` and `#[inline(always)]` always causes the function to be serialized
-into crate metadata to allow cross-crate inlining.
+`#[inline]` and `#[inline(always)]` always cause the function to be serialized
+into the crate metadata to allow cross-crate inlining.
 
 There are three different types of inline attributes: