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 13 pull requests #61150

Merged
merged 42 commits into from May 25, 2019

Conversation

Projects
None yet
@Centril
Copy link
Member

commented May 25, 2019

Successful merges:

  • #61026 (Tweak macro parse errors when reaching EOF during macro call parse)
  • #61095 (Update cargo)
  • #61096 (tidy: don't short-circuit on license error)
  • #61107 (Fix a couple docs typos)
  • #61110 (Revert edition-guide toolstate override)
  • #61111 (Fixed type-alias-bounds lint doc)
  • #61113 (Deprecate FnBox. Box<dyn FnOnce()> can be called directly, since 1.35)
  • #61116 (Remove the incorrect warning from README.md)
  • #61118 (Dont ICE on an attempt to use GAT without feature gate)
  • #61121 (improve debug-printing of scalars)
  • #61125 (Updated my mailmap entry)
  • #61134 (Annotate each reverse_bits with #[must_use])
  • #61138 (Move async/await tests to their own folder)

Failed merges:

r? @ghost

ehuss and others added some commits May 23, 2019

tidy: don't short-circuit on license error
If there is more than one license error, tidy would only print the first
error. This changes it so that all license errors are printed.
Fixed type-alias-bounds lint doc
The example code under type-alias-bounds lint produced two warnings - one from the lint itself and another from the dead_code lint, and only the second one was in the doc. This looked like an error, so I've added `#[allow(dead_code)]` and replaced the example output with the expected one.
[Playground](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&code=%23%5Ballow(dead_code)%5D%0Atype%20SendVec%3CT%3A%20Send%3E%20%3D%20Vec%3CT%3E%3B)
Remove the incorrect warning from README.md
My problem was user error; thanks to @Zoxc for fixing me!

r? @alexcrichton
improve debug-printing of scalars
Before: Immediate(ScalarMaybeUndef(Scalar(Ptr(Pointer { alloc_id: AllocId(3401), offset: Size { raw: 4 }, tag: Tagged(7723) }))))
After: Immediate(Scalar(AllocId(3401).0x4[<7723>]))

Before: Immediate(ScalarMaybeUndef(Scalar(Bits { size: 8, bits: 10 })))
After: Immediate(Scalar(0x000000000000000A))

Before: Immediate(ScalarMaybeUndef(Scalar(Bits { size: 1, bits: 1 })))
After: Immediate(Scalar(0x01))
Tweak macro parse errors when reaching EOF during macro call parse
- Add detail on origin of current parser when reaching EOF and stop
  saying "found <eof>" and point at the end of macro calls
- Handle empty `cfg_attr` attribute
- Reword empty `derive` attribute error
Annotate each `reverse_bits` with `#[must_use]`
Because the name sounds like an in-place mutation like
`[T]::reverse(&mut self)`, it may be confused for one.
Rollup merge of #61026 - estebank:macro-eof-spans, r=petrochenkov
Tweak macro parse errors when reaching EOF during macro call parse

Add detail on origin of current parser when reaching EOF, stop saying "found `<eof>`" and point at the end of macro calls.

Fix #27569.

Centril added some commits May 25, 2019

Rollup merge of #61095 - ehuss:update-cargo, r=alexcrichton
Update cargo

Update cargo

14 commits in c4fcfb725b4be00c72eb9cf30c7d8b095577c280..545f354259be4e9745ea00a524c0e4c51df01aa6
2019-05-15 19:48:47 +0000 to 2019-05-23 17:45:30 +0000
- Bump to 0.38.0 (rust-lang/cargo#6979)
- cargo package: detect new empty directories (rust-lang/cargo#6973)
- Add message caching. (rust-lang/cargo#6933)
- Fix typo (rust-lang/cargo#6974)
- Set `Finished` line correctly for debug=0. (rust-lang/cargo#6971)
- Clippy fixes (rust-lang/cargo#6970)
- Remove rustdoc `can_add_color_process`. (rust-lang/cargo#6968)
- Document new `doctest` field. (rust-lang/cargo#6965)
- Update some man pages that missed --offline. (rust-lang/cargo#6964)
- add public & private prop tests. (rust-lang/cargo#6962)
- zsh completion: Pull list of commands from cargo --list (rust-lang/cargo#6956)
- Change docs "inequality" for semver requirement. (rust-lang/cargo#6963)
- Update im-rc requirement from 12.1.0 to 13.0.0 (rust-lang/cargo#6959)
- Add `doctest` field into metadata (rust-lang/cargo#6953)
Rollup merge of #61096 - ehuss:tidy-license-short-circuit, r=Centril
tidy: don't short-circuit on license error

If there is more than one license error, tidy would only print the first
error. This changes it so that all license errors are printed.
Rollup merge of #61107 - blkerby:docs_typos, r=Centril
Fix a couple docs typos

Also add a link to env::split_paths.
Rollup merge of #61110 - ehuss:revert-edition-override, r=Mark-Simula…
…crum

Revert edition-guide toolstate override

Closes #60929
Rollup merge of #61111 - Cerberuser:patch-1, r=steveklabnik
Fixed type-alias-bounds lint doc

The example code under type-alias-bounds lint produced two warnings - one from the lint itself and another from the dead_code lint, and only the second one was in the doc. This looked like an error, so I've added `#[allow(dead_code)]` and replaced the example output with the expected one.

[Playground](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&code=%23%5Ballow(dead_code)%5D%0Atype%20SendVec%3CT%3A%20Send%3E%20%3D%20Vec%3CT%3E%3B)

According to guidelines,
r? @steveklabnik
Rollup merge of #61113 - SimonSapin:fnbox, r=alexcrichton
Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35

FCP completion: #28796 (comment)
Rollup merge of #61116 - scottmcm:vcpp-download-link, r=alexcrichton
Remove the incorrect warning from README.md

My problem was user error; thanks to @Zoxc for fixing me!

r? @alexcrichton
Rollup merge of #61118 - pnkfelix:issue-60654-dont-ice-on-gat, r=varkor
Dont ICE on an attempt to use GAT without feature gate

Fix #60654
Rollup merge of #61121 - RalfJung:miri-value-printing, r=oli-obk
improve debug-printing of scalars

* Prettier printing for `Pointer` and `Bits`.
* Don't print the `ScalarMaybeUndef(...)` around `Scalar`.

Before: `Immediate(ScalarMaybeUndef(Scalar(Ptr(Pointer { alloc_id: AllocId(3401), offset: Size { raw: 4 }, tag: Tagged(7723) }))))`
After: `Immediate(Scalar(AllocId(3401).0x4[<7723>]))`

Before: `Immediate(ScalarMaybeUndef(Scalar(Bits { size: 8, bits: 10 })))`
After: `Immediate(Scalar(0x000000000000000A))`

Before: `Immediate(ScalarMaybeUndef(Scalar(Bits { size: 1, bits: 1 })))`
After: `Immediate(Scalar(0x01))`

r? @oli-obk
Rollup merge of #61134 - nvzqz:reverse_bits-must_use, r=varkor
Annotate each `reverse_bits` with `#[must_use]`

Because the name sounds like an in-place mutation like `[T]::reverse(&mut self)`, it may be confused for one.

This change was requested at #48763 (comment).
Rollup merge of #61138 - varkor:async-await-tests, r=cramertj
Move async/await tests to their own folder

This moves run-pass and ui async/await tests to their own folder `src/test/ui/async-await` and organises some into subfolders. (It does not move rustdoc tests for async/await.)

I also did some drive-by cleaning up of issues/error code tests into their own folders (which already existed). These are in separate commits, so easy to separate out if that's more desirable.

r? @cramertj
@Centril

This comment has been minimized.

Copy link
Member Author

commented May 25, 2019

@bors r+ p=13 rollup=never

@bors

This comment has been minimized.

Copy link
Contributor

commented May 25, 2019

📌 Commit 19b5a10 has been approved by Centril

Centril added a commit to Centril/rust that referenced this pull request May 25, 2019

Rollup merge of rust-lang#61150 - Centril:rollup-wmm7qga, r=Centril
Rollup of 13 pull requests

Successful merges:

 - rust-lang#61026 (Tweak macro parse errors when reaching EOF during macro call parse)
 - rust-lang#61095 (Update cargo)
 - rust-lang#61096 (tidy: don't short-circuit on license error)
 - rust-lang#61107 (Fix a couple docs typos)
 - rust-lang#61110 (Revert edition-guide toolstate override)
 - rust-lang#61111 (Fixed type-alias-bounds lint doc)
 - rust-lang#61113 (Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35)
 - rust-lang#61116 (Remove the incorrect warning from README.md)
 - rust-lang#61118 (Dont ICE on an attempt to use GAT without feature gate)
 - rust-lang#61121 (improve debug-printing of scalars)
 - rust-lang#61125 (Updated my mailmap entry)
 - rust-lang#61134 (Annotate each `reverse_bits` with `#[must_use]`)
 - rust-lang#61138 (Move async/await tests to their own folder)

Failed merges:

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

commented May 25, 2019

⌛️ Testing commit 19b5a10 with merge 315ab95...

bors added a commit that referenced this pull request May 25, 2019

Auto merge of #61150 - Centril:rollup-wmm7qga, r=Centril
Rollup of 13 pull requests

Successful merges:

 - #61026 (Tweak macro parse errors when reaching EOF during macro call parse)
 - #61095 (Update cargo)
 - #61096 (tidy: don't short-circuit on license error)
 - #61107 (Fix a couple docs typos)
 - #61110 (Revert edition-guide toolstate override)
 - #61111 (Fixed type-alias-bounds lint doc)
 - #61113 (Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35)
 - #61116 (Remove the incorrect warning from README.md)
 - #61118 (Dont ICE on an attempt to use GAT without feature gate)
 - #61121 (improve debug-printing of scalars)
 - #61125 (Updated my mailmap entry)
 - #61134 (Annotate each `reverse_bits` with `#[must_use]`)
 - #61138 (Move async/await tests to their own folder)

Failed merges:

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

commented May 25, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 315ab95 to master...

@bors bors added the merged-by-bors label May 25, 2019

@bors bors merged commit 19b5a10 into rust-lang:master May 25, 2019

2 checks passed

Travis CI - Pull Request Build Passed
Details
homu Test successful
Details

@Centril Centril deleted the Centril:rollup-wmm7qga branch May 25, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.