Skip to content

Rollup of 9 pull requests - #29232

Closed
steveklabnik wants to merge 20 commits into
rust-lang:masterfrom
steveklabnik:rollup
Closed

Rollup of 9 pull requests#29232
steveklabnik wants to merge 20 commits into
rust-lang:masterfrom
steveklabnik:rollup

Conversation

solsonand others added 20 commits October 13, 2015 01:23
The paragraph here seemed confusing, so I reworded it. Also added
another possible reason why `curl | sh` might be objectionable to users.
When reading this paragraph, the beginning Rust programmer is starting
to write a Hello World program. We have just told her to name the file
`main.rs`, and immediately afterward, a `hello_world.rs` is mentioned.
I changed this to an unrelated filename (incidentally one that appears
in this repository) to make it clear that this is just an example.
Also, wording it as a declarative sentence rather than an imperative one
further separates it from the Hello World instructions in this section.
…ichton
I suspect this won't work on Windows, but let's be optimistic and try it before disabling.
…bnik
The paragraph here seemed confusing, so I reworded it. Also added
another possible reason why `curl | sh` might be objectionable to users.
r? @steveklabnik
…=steveklabnik
Adds the pacman git command to the high level Windows installation instructions. As the MSYS2 installation may not include Windows git on the path by default (based on the path settings of Windows users), I figured this could be a helpful inclusion.
…ichton
When reading this paragraph, the beginning Rust programmer is starting
to write a Hello World program. We have just told her to name the file
`main.rs`, and immediately afterward, a `hello_world.rs` is mentioned.
I changed this to an unrelated filename (incidentally one that appears
in this repository) to make it clear that this is just an example.
Also, wording it as a declarative sentence rather than an imperative one
further separates it from the Hello World instructions in this section.
r? @steveklabnik (Let me know if I'm sending too many PRs -- I can batch up TRPL edits, say, per chapter, if that works better. Or I can just refrain from editing TRPL as I read through it, if these are not sufficiently useful.)
@steveklabnik

Copy link
Copy Markdown
ContributorAuthor

@bors: r+ p=1

@bors

bors commented Oct 22, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit d941e40 has been approved by steveklabnik

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

@bors

bors commented Oct 22, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d941e40 with merge 22fcc1e...

@bors

bors commented Oct 22, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-win-gnu-32-nopt-t

@steveklabnik

Copy link
Copy Markdown
ContributorAuthor

@bors: retry

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r-

I think the failure was legitimately caused by #29151

@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

13 participants

@steveklabnik@bors@rust-highfive@alexcrichton@nikomatsakis@Centril@solson@kini@SingingTree@ykomatsu@apasel422@wthrowe@wesleywiser