Skip to content

Rollup of 6 pull requests #24169

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.

Sign up for GitHub

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

Merged
merged 31 commits into from
Apr 7, 2015
Merged

Rollup of 6 pull requests #24169

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
cb1e6a2
book: use `mod test` consistently
callahad Apr 4, 2015
48a023c
Convert lifetime shadowing into a hard error, as promised.
nikomatsakis Apr 4, 2015
92d0026
Replace alpha state by pre-1.0
GuillaumeGomez Apr 6, 2015
49f2a56
Fix tests
nikomatsakis Apr 6, 2015
d166772
Try to improve PhantomData docs with more examples
nikomatsakis Apr 4, 2015
3b9847e
Fix code formatting in `core::ops::Add` example
tbu- Apr 6, 2015
59d8898
traits.md: Fix example of using traits to match description
joshtriplett Apr 6, 2015
8fcc5bd
Fix broken link and markup in `trait Any` docs.
mbrubeck Apr 6, 2015
6e86c63
Remove outdated notice from BufRead::lines docs.
mbrubeck Apr 6, 2015
bef00ab
use normative source for Grapheme class data
kwantam Apr 6, 2015
600101b
Update intro.md
xfq Apr 7, 2015
7eb723d
Add test for #22560
lgrz Apr 7, 2015
6eea426
Update hello-world.md
xfq Apr 7, 2015
fc2494b
Fix charset of debuginfo test on FreeBSD
wg Apr 7, 2015
6f9ec06
Add `ignore-tidy-linelength` and fix formatting
lgrz Apr 7, 2015
4dd6edd
Rollup merge of #23277 - aochagavia:intro, r=steveklabnik
Manishearth Apr 7, 2015
4faf0be
Rollup merge of #24042 - callahad:bug_24030, r=steveklabnik
Manishearth Apr 7, 2015
daf2e36
Rollup merge of #24057 - nikomatsakis:lifetime-shadowing-hard-error, …
Manishearth Apr 7, 2015
6f852f5
Rollup merge of #24059 - nikomatsakis:issue-22914-phantomdata-docs, r…
Manishearth Apr 7, 2015
50cb31f
Rollup merge of #24088 - GuillaumeGomez:patch-1, r=alexcrichton
Manishearth Apr 7, 2015
6efb835
Rollup merge of #24110 - tbu-:pr_doc_fix_add, r=alexcrichton
Manishearth Apr 7, 2015
322e4a1
Rollup merge of #24112 - joshtriplett:patch-1, r=steveklabnik
Manishearth Apr 7, 2015
b3bcbb1
Rollup merge of #24113 - mbrubeck:doc-edit, r=steveklabnik
Manishearth Apr 7, 2015
ae64d8e
doc ignore (fixup #24059)
Manishearth Apr 7, 2015
1fd89b6
Auto merge of #24156 - Manishearth:rollup, r=Manishearth
bors Apr 7, 2015
7b2e118
Rollup merge of #24132 - kwantam:master, r=alexcrichton
Manishearth Apr 7, 2015
6295406
Rollup merge of #24139 - xfq:patch-1, r=steveklabnik
Manishearth Apr 7, 2015
2b34643
Rollup merge of #24147 - lstat:needstest-22560, r=alexcrichton
Manishearth Apr 7, 2015
fe2cff7
Rollup merge of #24148 - xfq:patch-2, r=steveklabnik
Manishearth Apr 7, 2015
c4bd1c2
Rollup merge of #24150 - wg:master, r=alexcrichton
Manishearth Apr 7, 2015
4e067f5
Rollup merge of #24166 - lgvz:email, r=steveklabnik
Manishearth Apr 7, 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
Prev Previous commit
Next Next commit
Replace alpha state by pre-1.0
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Apr 6, 2015
commit 92d00262c36e12ed848ca8b248cb81f16e7f2deb
2 changes: 1 addition & 1 deletion src/doc/trpl/hello-cargo.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
% Hello, Cargo!

[Cargo](http://crates.io) is a tool that Rustaceans use to help manage their
Rust projects. Cargo is currently in an alpha state, just like Rust, and so it
Rust projects. Cargo is currently in a pre-1.0 state, just like Rust, and so it
is still a work in progress. However, it is already good enough to use for many
Rust projects, and so it is assumed that Rust projects will use Cargo from the
beginning.
Expand Down