Skip to content

More editing work on TRPL - #24244

Merged
bors merged 1 commit into
rust-lang:masterfrom
steveklabnik:more_editing
Apr 11, 2015
Merged

More editing work on TRPL#24244
bors merged 1 commit into
rust-lang:masterfrom
steveklabnik:more_editing

Conversation

@steveklabnik

@steveklabniksteveklabnik commented Apr 9, 2015

Copy link
Copy Markdown
Contributor

Fill out blank section headers. Copy edit the entire first section.

@rust-highfive

rust-highfive commented Apr 9, 2015

Copy link
Copy Markdown
Contributor

r? @huonw

(rust_highfive has picked a reviewer for you, use r? to override)

nagisa
nagisa reviewed Apr 9, 2015
View reviewed changes
Comment threadsrc/doc/trpl/hello-world.md Outdated

@nagisanagisaApr 9, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎊🎉👏

@steveklabniksteveklabnikApr 9, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, maybe i should do that :)

@huonwhuonw assigned steveklabnik and huonw and unassigned huonw and steveklabnikApr 9, 2015
huonw
huonw reviewed Apr 9, 2015
View reviewed changes
Comment threadsrc/doc/trpl/hello-cargo.md Outdated

@huonwhuonwApr 9, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rustc will load files as necessary for mods automatically (i.e. not like c/c++ compiler that makes per-file object files etc), so this statement is possibly not what you're trying to convey.

@steveklabniksteveklabnikApr 9, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking multi-crate stuff with dependencies. Thoughts on how to allude to that without saying it directly?

@steveklabniksteveklabnikApr 9, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll just go with 'more complex'

@steveklabniksteveklabnik mentioned this pull request Apr 9, 2015
Closed
@steveklabnik

steveklabnik commented Apr 9, 2015

Copy link
Copy Markdown
ContributorAuthor

Updated!

@steveklabnik

steveklabnik commented Apr 10, 2015

Copy link
Copy Markdown
ContributorAuthor

Same here, to fix issues like #24252, I'm going to self-r+ these, if there's other nits, send an issue or PR ❤️

@steveklabnik

steveklabnik commented Apr 10, 2015

Copy link
Copy Markdown
ContributorAuthor

@bors: r+ rollup

@bors

bors commented Apr 10, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit 06dc26d has been approved by steveklabnik

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 10, 2015
@steveklabnik
Rollup merge ofrust-lang#24244- steveklabnik:more_editing, r=stevek…
5ff87f7
…labnik
Fill out blank section headers. Copy edit the entire first section.
@steveklabniksteveklabnik mentioned this pull request Apr 10, 2015
Closed
bors added a commit that referenced this pull request Apr 10, 2015
@bors
Auto merge of#24255- steveklabnik:rollup, r=steveklabnik
abab8a6
- Successful merges: #24121, #24234, #24236, #24239, #24240, #24243, #24244, #24245, #24247, #24253
- Failed merges:
Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 10, 2015
@Manishearth
Rollup merge ofrust-lang#24244- steveklabnik:more_editing, r=stevek…
ff4e814
…labnik
Fill out blank section headers. Copy edit the entire first section.
@ManishearthManishearth mentioned this pull request Apr 10, 2015
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 10, 2015
@Manishearth
Rollup merge ofrust-lang#24244- steveklabnik:more_editing, r=stevek…
ca79ef2
…labnik
Fill out blank section headers. Copy edit the entire first section.
@steveklabniksteveklabnik mentioned this pull request Apr 10, 2015
Closed
steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 10, 2015
@steveklabnik
Rollup merge ofrust-lang#24244- steveklabnik:more_editing, r=stevek…
09e9b4c
…labnik
Fill out blank section headers. Copy edit the entire first section.
bors added a commit that referenced this pull request Apr 10, 2015
@bors
Auto merge of#24265- steveklabnik:rollup, r=steveklabnik
1089011
- Successful merges: #24121, #24234, #24236, #24239, #24240, #24242, #24243, #24244, #24245, #24247, #24253, #24259
- Failed merges:
steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 10, 2015
@steveklabnik
Rollup merge ofrust-lang#24244- steveklabnik:more_editing, r=stevek…
25130d7
…labnik
Fill out blank section headers. Copy edit the entire first section.
@steveklabniksteveklabnik mentioned this pull request Apr 10, 2015
Closed
steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 10, 2015
@steveklabnik
Rollup merge ofrust-lang#24244- steveklabnik:more_editing, r=stevek…
ede2761
…labnik
Fill out blank section headers. Copy edit the entire first section.
@steveklabniksteveklabnik mentioned this pull request Apr 10, 2015
Closed
@bors

bors commented Apr 10, 2015

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #24177) made this pull request unmergeable. Please resolve the merge conflicts.

@steveklabniksteveklabnik mentioned this pull request Apr 10, 2015
Closed
@steveklabnik
More editing work on TRPL
f01dbf2
Fill out blank section headers. Copy edit the entire first section.
@steveklabnik

steveklabnik commented Apr 10, 2015

Copy link
Copy Markdown
ContributorAuthor

@bors: r+ rollup

@bors

bors commented Apr 10, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit f01dbf2 has been approved by steveklabnik

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 10, 2015
@steveklabnik
Rollup merge ofrust-lang#24244- steveklabnik:more_editing, r=stevek…
3223009
…labnik
Fill out blank section headers. Copy edit the entire first section.
@steveklabniksteveklabnik mentioned this pull request Apr 10, 2015
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 11, 2015
@Manishearth
Rollup merge ofrust-lang#24244- steveklabnik:more_editing, r=stevek…
8c20c20
…labnik
Fill out blank section headers. Copy edit the entire first section.
@bors
bors merged commit f01dbf2 into rust-lang:masterApr 11, 2015
@steveklabnik
steveklabnik deleted the more_editing branch April 21, 2015 17:07
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@huonwhuonw

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@steveklabnik@rust-highfive@bors@tshepang@nagisa@huonw@mdinger