Skip to content

Rollup of 10 pull requests #25887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
16334e5
Add a missing space to the Glossary page of TRPL
maxjacobson May 26, 2015
d0e6396
Document #[repr] on non-C-like enums
May 20, 2015
15ab481
removed lonely closing parenthesis
azerupi May 28, 2015
15aeea5
Corrected typo
azerupi May 28, 2015
f607440
Update E0015 explanation, fix E0053.
May 27, 2015
eb15030
Add error explanations for E0040, E0087, E0378, E0379, E0394.
May 27, 2015
19cb2a7
add newline before list in functions-and-methods
dcampbell24 Feb 14, 2015
0670651
Make adjancent code examples more similar
frewsxcv Feb 21, 2015
4d90b4d
Update let.md -- follow whitespace style guideline
dcampbell24 Mar 30, 2015
31a007a
remove extra space from "over" code as well
dcampbell24 Mar 30, 2015
d0744ba
Fix mistake: "to to" -> "to"
nliberg May 23, 2015
adac861
Fix link to newtypes page
nliberg May 23, 2015
7e78e70
Convert mutable statics error to have error code and add explanation.
May 28, 2015
3640354
Revise E0015 according to feedback.
May 29, 2015
fdf3ce7
Change E0015 and E0378 explanations to link to text of RFC 911, not r…
May 29, 2015
deb4948
remove the last mention of IoResult
tshepang May 29, 2015
5e94187
Add syntax for multiple lifetimes
steveklabnik May 29, 2015
81a413b
trpl: eight sections, not seven
nhowell May 29, 2015
8746b1a
Improve mem::forget documentation
tringenbach May 28, 2015
e344792
Rollup merge of #25651 - bluss:doc-enum-repr, r=alexcrichton
steveklabnik May 29, 2015
233ab2d
Rollup merge of #25788 - maxjacobson:add-missing-space-to-glossary, r…
steveklabnik May 29, 2015
e7fc4ad
Rollup merge of #25861 - tringenbach:master, r=steveklabnik
steveklabnik May 29, 2015
070ac2c
Rollup merge of #25864 - azerupi:patch-1, r=alexcrichton
steveklabnik May 29, 2015
f2ab010
Rollup merge of #25865 - azerupi:patch-2, r=alexcrichton
steveklabnik May 29, 2015
2f6dc44
Rollup merge of #25866 - jooert:update_guidelines, r=steveklabnik
steveklabnik May 29, 2015
ab09557
Rollup merge of #25873 - nham:update_E0015, r=Aatch
steveklabnik May 29, 2015
0f4b980
Rollup merge of #25876 - tshepang:patch-3, r=steveklabnik
steveklabnik May 29, 2015
e84b816
Rollup merge of #25883 - steveklabnik:gh25417, r=alexcrichton
steveklabnik May 29, 2015
72a8c4c
Rollup merge of #25886 - nhowell:patch-1, r=steveklabnik
steveklabnik May 29, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/doc/style/features/functions-and-methods/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ for any operation that is clearly associated with a particular
type.

Methods have numerous advantages over functions:

* They do not need to be imported or qualified to be used: all you
need is a value of the appropriate type.
* Their invocation performs autoborrowing (including mutable borrows).
Expand Down
2 changes: 1 addition & 1 deletion src/doc/style/features/functions-and-methods/input.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ fn foo(a: u8) { ... }
Note that
[`ascii::Ascii`](http://static.rust-lang.org/doc/master/std/ascii/struct.Ascii.html)
is a _wrapper_ around `u8` that guarantees the highest bit is zero; see
[newtype patterns]() for more details on creating typesafe wrappers.
[newtype patterns](../types/newtype.md) for more details on creating typesafe wrappers.

Static enforcement usually comes at little run-time cost: it pushes the
costs to the boundaries (e.g. when a `u8` is first converted into an
Expand Down
8 changes: 4 additions & 4 deletions src/doc/style/features/let.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Prefer

```rust
let foo = match bar {
Baz => 0,
Baz => 0,
Quux => 1
};
```
Expand All @@ -44,7 +44,7 @@ over
```rust
let foo;
match bar {
Baz => {
Baz => {
foo = 0;
}
Quux => {
Expand All @@ -61,8 +61,8 @@ conditional expression.
Prefer

```rust
s.iter().map(|x| x * 2)
.collect::<Vec<_>>()
let v = s.iter().map(|x| x * 2)
.collect::<Vec<_>>();
```

over
Expand Down
2 changes: 1 addition & 1 deletion src/doc/style/ownership/builders.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ If `T` is such a data structure, consider introducing a `T` _builder_:
value. When possible, choose a better name: e.g. `Command` is the builder for
`Process`.
2. The builder constructor should take as parameters only the data _required_ to
to make a `T`.
make a `T`.
3. The builder should offer a suite of convenient methods for configuration,
including setting up compound inputs (like slices) incrementally.
These methods should return `self` to allow chaining.
Expand Down