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 12 pull requests #61736

Closed
wants to merge 38 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jun 11, 2019

Successful merges:

Failed merges:

r? @ghost

lcnr and others added 30 commits June 4, 2019 22:08
There's no need to have it given it merely forwarded to RustbookSrc.
Removing the tool argument in the previous commit means it's no longer
restricted to just bootstrap tools despite being written as such.
Inlining it prevents accidental use.
There's no reason for it to be std-based
also consistently mark all these is_* methods for inlining
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
This commit fixes an ICE that occured when a const generic was used in
a repeat expression. This was due to the code expecting the length of
the repeat expression to be const evaluatable to a constant, but a const
generic parameter is not (however, it can be made into a constant).
This is duplicated in a few locations throughout the sysroot to work
around issues with not exporting a macro in libstd but still wanting it
available to sysroot crates to define blocks. Nowadays though we can
simply depend on the `cfg-if` crate on crates.io, allowing us to use it
from there!
It's a less powerful duplicate of `SyntaxExtension::NormalTT`
We already use this for `unzip`, but `partition` is not much different.
move some tests into subfolders

This reduces the size of the test folders without making the moved tests harder to find.

Is this kind of change desired/worth the effort?
Remove some legacy proc macro flavors

Namely
- `IdentTT` (`foo! ident { ... }`). Can be replaced with `foo! { ident ... }` or something similar.
- `MultiDecorator`. Can be replaced by `MultiModifier` (aka `LegacyAttr` after renaming).
- `DeclMacro`. It was a less powerful duplicate of `NormalTT` (aka `LegacyBang` after renaming) and can be replaced by it.

Stuff like this slows down any attempts to refactor the expansion infra, so it's desirable to retire it already.
I'm not sure whether a lang team decision is necessary, but would be nice to land this sooner because I have some further work in this area scheduled.

The documentation commit (rust-lang@a9397fd) describes how the remaining variants are different from each other and shows that there's actually some system behind them.

The last commit renames variants of `SyntaxExtension` in more systematic way.
- `ProcMacro` -> `Bang`
- `NormalTT` -> `LegacyBang`
- `AttrProcMacro` -> `Attr`
- `MultiModifier` -> `LegacyAttr`
- `ProcMacroDerive` -> `Derive`
- `BuiltinDerive` -> `LegacyDerive`

All the `Legacy*` variants are AST-based, as opposed to "modern" token-based variants.
…r=alexcrichton

Bootstrap cleanup

Each commit is (mostly) standalone and probably best reviewed as such. Nothing too major just some drive-by nits as I was looking through the code.

r? @alexcrichton
Centril added 8 commits June 11, 2019 13:04
…ebank

librustc_errors: Add some more documentation

r? @estebank
is_fp and is_floating_point do the same thing, remove the former

also consistently mark all these `is_*` methods for inlining
… r=varkor

typeck: Fix const generic in repeat param ICE.

Fixes rust-lang#61336. Turns out this wasn't related to rust-lang#49147 after all.

r? @varkor
…rkor

make sure make_ascii_lowercase actually leaves upper-case non-ASCII characters alone

Cc rust-lang#61677 @napen123
…fackler

std: Remove internal definitions of `cfg_if!` macro

This is duplicated in a few locations throughout the sysroot to work
around issues with not exporting a macro in libstd but still wanting it
available to sysroot crates to define blocks. Nowadays though we can
simply depend on the `cfg-if` crate on crates.io, allowing us to use it
from there!
core: use memcmp optimization for 128 bit integer slices

All other sized integer slices do this. From rust-lang#61665.
Use `for_each` in `Iterator::partition`

We already use this for `unzip`, but `partition` is not much different.
@Centril
Copy link
Contributor Author

Centril commented Jun 11, 2019

@bors r+ p=12 rollup=never

@bors
Copy link
Contributor

bors commented Jun 11, 2019

📌 Commit 78f4e9c 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 Jun 11, 2019
@bors
Copy link
Contributor

bors commented Jun 11, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rollup-pcbpexb (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rollup-pcbpexb --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing src/test/run-pass-fulldeps/issue-40663.rs
Removing src/test/run-pass-fulldeps/derive-totalsum.rs
Removing src/test/run-pass-fulldeps/derive-totalsum-attr.rs
Removing src/test/run-pass-fulldeps/custom-derive-partial-eq.rs
Removing src/test/run-pass-fulldeps/auxiliary/custom-derive-plugin.rs
Removing src/test/run-pass-fulldeps/auxiliary/custom-derive-plugin-attr.rs
Removing src/test/run-pass-fulldeps/auxiliary/custom-derive-partial-eq.rs
Auto-merging src/test/codegen/intrinsics/exact_div.rs
Removing src/libunwind/macros.rs
Auto-merging src/librustc/ty/sty.rs
CONFLICT (content): Merge conflict in src/librustc/ty/sty.rs
Removing src/libpanic_unwind/macros.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 11, 2019
@Centril Centril closed this Jun 11, 2019
@Centril Centril deleted the rollup-pcbpexb branch June 11, 2019 11:08
@bors
Copy link
Contributor

bors commented Jun 11, 2019

☔ The latest upstream changes (presumably #61673) made this pull request unmergeable. Please resolve the merge conflicts.

@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.