Skip to content
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

Rollup of 3 pull requests #68442

Merged
merged 8 commits into from
Jan 22, 2020
Merged

Rollup of 3 pull requests #68442

merged 8 commits into from
Jan 22, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jan 22, 2020

Successful merges:

Failed merges:

r? @ghost

Centril and others added 8 commits January 21, 2020 17:37
…chton

Update cargo, books

## cargo

9 commits in ad3dbe10e1e654fb1f032a5dd9481d7cbaa00d65..f6449ba236db31995255ac5e4cad4ab88296a7c6
2020-01-13 21:37:15 +0000 to 2020-01-21 16:15:39 +0000
- Fix wrong directories in host_libdir. (rust-lang/cargo#7798)
- Update humantime requirement from 1.2.0 to 2.0.0 (rust-lang/cargo#7815)
- Fix doc_target test which no longer works on stable/beta. (rust-lang/cargo#7817)
- Fix some erroneous em-dashes in man pages. (rust-lang/cargo#7814)
- fix some clippy warnings (rust-lang/cargo#7808)
- Don't assume iowait always increases on Linux (rust-lang/cargo#7803)
- Add and update some doc comments. (rust-lang/cargo#7800)
- Consistently use em-dash in environment documentation page. (rust-lang/cargo#7799)
- Load credentials only when needed (rust-lang/cargo#7774)

## reference

3 commits in e115753..11e893f
2019-12-22 13:13:14 +0100 to 2020-01-18 21:24:08 +0100
- Small improvements to types/pointer.md (rust-lang/reference#726)
- repr(transparent): mention align=1 requirement (rust-lang/reference#737)
- Elaborate on how to use an extern static correctly (rust-lang/reference#736)

## book

4 commits in 5c5cfd2e94cd42632798d9bd3d1116133e128ac9..87dd6843678575f8dda962f239d14ef4be14b352
2019-12-16 09:27:21 -0600 to 2020-01-20 15:20:40 -0500
- Fix listing numbers (rust-lang/book#2227)
- Move `async` and `await` keywords to 'Currently in Use' (rust-lang/book#2140)
- More cleanup - remove unneeded files (rust-lang/book#2213)
- Small cleanups extracted from the bigger pr i'm working on (rust-lang/book#2212)

## rust-by-example

1 commits in 1d59403cb5269c190cc52a95584ecc280345495a..1c2bd024d13f8011307e13386cf1fea2180352b5
2019-12-27 08:27:05 -0300 to 2020-01-20 12:18:36 -0300
- CamelCase -> UpperCamelCase (rust-lang/rust-by-example#1302)

## embedded-book

1 commits in 9493b7d4dc97eda439bd8780f05ad7b234cd1cd7..4d78994915af1bde9a95c04a8c27d8dca066232a
2019-12-27 20:05:00 +0000 to 2020-01-14 08:25:25 +0000
- Update .gitattributes  (rust-embedded/book#221)
typeck: simplify the handling of `diverges`

Some drive-by cleanup while working on `hir::ExprKind::Let`.
Ostensibly, this has some perf benefits due to reduced allocation and whatnot as well.

r? @eddyb
@Centril
Copy link
Contributor Author

Centril commented Jan 22, 2020

@bors r+ p=200 treeclosed=100 rollup=never

@bors
Copy link
Contributor

bors commented Jan 22, 2020

📌 Commit 2a3627d has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 22, 2020
@bors
Copy link
Contributor

bors commented Jan 22, 2020

⌛ Testing commit 2a3627d with merge 2f688ac...

bors added a commit that referenced this pull request Jan 22, 2020
Rollup of 3 pull requests

Successful merges:

 - #68421 (Update cargo, books)
 - #68422 (typeck: simplify the handling of `diverges`)
 - #68439 (Update Clippy)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jan 22, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 2f688ac to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 22, 2020
@bors bors merged commit 2a3627d into rust-lang:master Jan 22, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #68442!

Tested on commit 2f688ac.
Direct link to PR: #68442

🎉 clippy-driver on linux: build-fail → test-pass (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 22, 2020
Tested on commit rust-lang/rust@2f688ac.
Direct link to PR: <rust-lang/rust#68442>

🎉 clippy-driver on linux: build-fail → test-pass (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
@JohnTitor
Copy link
Member

Clippy has been fixed, so
@bors treeclosed-

@JohnTitor
Copy link
Member

@bors treeclose-

@Centril Centril deleted the rollup-ir2vmid branch January 22, 2020 11:25
@Centril Centril added the rollup A PR which is a rollup label Mar 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants