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 7 pull requests #63779

Merged
merged 15 commits into from
Aug 21, 2019
Merged

Rollup of 7 pull requests #63779

merged 15 commits into from
Aug 21, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Aug 21, 2019

Successful merges:

Failed merges:

r? @ghost

Mark-Simulacrum and others added 15 commits August 20, 2019 09:55
This scans the tree for `error_codes.rs` and loads all of them.
This is no longer used by the index generator and was always an unstable
compiler detail, so strip it out.

This also leaves in RUSTC_ERROR_METADATA_DST since the stage0 compiler
still needs it to be set.
Just removing an old/duplicated dependency from the workspace.
…x, r=matthewjasper

Do not emit JSON dumps of diagnostic codes

This decouples the error index generator from libsyntax for the most part (though it still depends on librustdoc for the markdown parsing and generation).

Fixes rust-lang#34588
Bump toml dependency.

Just removing an old/duplicated dependency from the workspace.
…trochenkov

Use dedicated type for spans in pre-expansion gating.

- Simplify the overall pre-expansion gating "experience".
…etrochenkov

Allow 'default async fn' to parse.

- Parse default async fn. Fixes rust-lang#63716.

(`cherry-pick`ed from 3rd commit in rust-lang#63749.)

r? @petrochenkov
Update books

## nomicon

25 commits in 8a7d05615e5bc0a7fb961b4919c44f5221ee54da..38b9a76bc8b59ac862663807fc51c9b757337fd6
2019-08-07 07:46:59 -0500 to 2019-08-19 10:04:32 -0400
- Fix transmute_copy link
- some edits
- drop parenthetical
- clarify dangling
- fix def.n of dangling
- fold uninit integer rule with reading uninit memory
- refactor null a bit
- resolve some nits
- raw ptrs must be initialized like integers
- Apply suggestions from code review
- explain when metadata is invalid
- mention !
- add more cases of UB
- avoid redundant UB
- stick to broader UB for raw ptr offsets/derefs for now
- be more precise about dangling
- subsume the NonNull things as library types
- handle recursion in the heading
- Define 'producing'
- NonNull, NonZero*
- list more ptr offset computations
- UB
- Fix typo in subtyping
- Add colon to `MySuperSliceable` too
- Fix typo `str::mem` to `std::mem`

## reference

2 commits in b4b3536..d191a0c
2019-08-07 02:29:50 +0200 to 2019-08-15 08:42:23 +0200
- Fix warning in stable-check (rust-lang/reference#653)
- our closure syntax comes from Ruby (rust-lang/reference#650)

## rust-by-example

5 commits in f2c15ba5ee89ae9469a2cf60494977749901d764..580839d90aacd537f0293697096fa8355bc4e673
2019-08-07 10:14:25 -0300 to 2019-08-17 23:17:50 -0300
- macros.md: Changing Sometime to more appropriate adverb form Sometimes (rust-lang/rust-by-example#1243)
- Add colon after "See Also" (rust-lang/rust-by-example#1242)
- Update enter_question_mark.md (rust-lang/rust-by-example#1208)
- Add destructuring bind examples (rust-lang/rust-by-example#1238)
- Change initial parameters in `fibonacci()` call. (rust-lang/rust-by-example#1241)

## embedded-book

1 commits in c5da1e11915d3f28266168baaf55822f7e3fe999..432ca26686c11d396eed6a59499f93ce1bf2433c
2019-08-05 23:02:10 +0000 to 2019-08-09 23:20:22 +0000
- semihosting: add comment adding feature flag to panic-semihosting  (rust-embedded/book#203)
…mulacrum

`async_await` was stabilized in 1.39.0, not 1.38.0.

r? @Mark-Simulacrum
Remove some duplication when resolving constants
@Centril
Copy link
Contributor Author

Centril commented Aug 21, 2019

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Aug 21, 2019

📌 Commit b25ec04 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 Aug 21, 2019
@bors
Copy link
Contributor

bors commented Aug 21, 2019

⌛ Testing commit b25ec04 with merge 7b0085a...

bors added a commit that referenced this pull request Aug 21, 2019
Rollup of 7 pull requests

Successful merges:

 - #63721 (Do not emit JSON dumps of diagnostic codes)
 - #63753 (Bump toml dependency.)
 - #63755 (Use dedicated type for spans in pre-expansion gating.)
 - #63759 (Allow 'default async fn' to parse.)
 - #63760 (Update books)
 - #63762 (`async_await` was stabilized in 1.39.0, not 1.38.0.)
 - #63766 (Remove some duplication when resolving constants)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Aug 21, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 7b0085a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 21, 2019
@bors bors merged commit b25ec04 into rust-lang:master Aug 21, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #63779!

Tested on commit 7b0085a.
Direct link to PR: #63779

🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Aug 21, 2019
Tested on commit rust-lang/rust@7b0085a.
Direct link to PR: <rust-lang/rust#63779>

🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).
@Centril Centril deleted the rollup-sx96dli branch August 21, 2019 15:30
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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.

None yet

6 participants