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 #78594

Merged
merged 18 commits into from
Oct 31, 2020
Merged

Rollup of 7 pull requests #78594

merged 18 commits into from
Oct 31, 2020

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented Oct 31, 2020

Successful merges:

Failed merges:

r? @ghost

tspiteri and others added 18 commits September 23, 2020 12:01
With this commit, the examples for exp_m1 would fail if x.exp() - 1.0
is used instead of x.exp_m1().
With this commit, the examples for ln_1p would fail if (x + 1.0).ln()
is used instead of x.ln_1p().
- BTreeMap::len
- BTreeMap::is_empty
- BTreeSet::len
- BTreeSet::is_empty
by using a named struct instead of a closure.
… r=KodrAus

Add std::panic::panic_any.

The discussion of rust-lang#67984 lead to the conclusion that there should be a macro or function separate from `std::panic!()` for throwing arbitrary payloads, to make it possible to deprecate or disallow (in edition 2021) `std::panic!(arbitrary_payload)`.

Alternative names:

- `panic_with!(..)`
- ~~`start_unwind(..)`~~ (panicking doesn't always unwind)
- `throw!(..)`
- `panic_throwing!(..)`
- `panic_with_value(..)`
- `panic_value(..)`
- `panic_with(..)`
- `panic_box(..)`
- `panic(..)`

The equivalent (private, unstable) function in `libstd` is called `std::panicking::begin_panic`.

I suggest `panic_any`, because it allows for any (`Any + Send`) type.

_Tracking issue: #78500_
make exp_m1 and ln_1p examples more representative of use

With this PR, the examples for `exp_m1` would fail if `x.exp() - 1.0` is used instead of `x.exp_m1()`, and the examples for `ln_1p` would fail if `(x + 1.0).ln()` is used instead of `x.ln_1p()`.
Strip tokens from trait and impl items before printing AST JSON

Fixes rust-lang#78510
x.py setup: Create config.toml in the current directory, not the top-level directory

See rust-lang#78509 for discussion.

r? @pnkfelix
cc @cuviper @Mark-Simulacrum
…schievink

validator: Extend aliasing check to a call terminator
Constantify more BTreeMap and BTreeSet functions

Just because we can:

- `BTreeMap::len`
- `BTreeMap::is_empty`
- `BTreeSet::len`
- `BTreeSet::is_empty`

Note that I put the `const` under `const_btree_new`, because I don't think their is a need to create another feature flag for that.

cc rust-lang#71835
parser: Cleanup `LazyTokenStream` and avoid some clones

by using a named struct instead of a closure.

r? @Aaron1011
@m-ou-se
Copy link
Member Author

m-ou-se commented Oct 31, 2020

@bors r+ p=7 rollup=never

@rustbot modify labels: +rollup

@bors
Copy link
Contributor

bors commented Oct 31, 2020

📌 Commit 1873ca5 has been approved by m-ou-se

@rustbot rustbot added the rollup A PR which is a rollup label Oct 31, 2020
@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 Oct 31, 2020
@m-ou-se
Copy link
Member Author

m-ou-se commented Oct 31, 2020

The queue is standing still again?

@bors retry

@bors
Copy link
Contributor

bors commented Oct 31, 2020

⌛ Testing commit 1873ca5 with merge 2ff2dccecd1ee2502eece7db0fe7c11c6cf4d2f4...

@m-ou-se
Copy link
Member Author

m-ou-se commented Oct 31, 2020

One of the Apple runners went in 'slow mode' again. :(

Let's not wait until it times out.

@bors retry

@bors
Copy link
Contributor

bors commented Oct 31, 2020

⌛ Testing commit 1873ca5 with merge 81cd59fc5ea6a1a9cacd46a9ae0b9412b7a8afea...

@m-ou-se
Copy link
Member Author

m-ou-se commented Oct 31, 2020

And again..

@bors retry

@bors
Copy link
Contributor

bors commented Oct 31, 2020

⌛ Testing commit 1873ca5 with merge 4f7612a...

@bors
Copy link
Contributor

bors commented Oct 31, 2020

☀️ Test successful - checks-actions
Approved by: m-ou-se
Pushing 4f7612a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 31, 2020
@bors bors merged commit 4f7612a into rust-lang:master Oct 31, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 31, 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.

9 participants