Skip to content

Rollup of 11 pull requests - #61737

Closed
Centril wants to merge 36 commits into
rust-lang:masterfrom
Centril:rollup-wsgxnyq
Closed

Rollup of 11 pull requests#61737
Centril wants to merge 36 commits into
rust-lang:masterfrom
Centril:rollup-wsgxnyq

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

lcnrand 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
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
…ebank
librustc_errors: Add some more documentation
r? @estebank
… r=varkor
typeck: Fix const generic in repeat param ICE.
Fixesrust-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
Copy Markdown
ContributorAuthor

@bors r+ p=11 rollup=never

@bors

bors commented Jun 11, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 5837b9f has been approved by Centril

@borsbors 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

bors commented Jun 11, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5837b9f with merge e3975fde7df7e2387ed441df8ee001d44562e2a6...

@bors

bors commented Jun 11, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-travis

@rust-highfive

Copy link
Copy Markdown
Contributor

The job armhf-gnu of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:05bb9bc6:start=1560265779357998679,finish=1560265779364267888,duration=6269209
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:26fca744
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:10e98c40
travis_time:start:10e98c40
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1ee57f13
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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
@CentrilCentril closed this Jun 11, 2019
@Centril
Centril deleted the rollup-wsgxnyq branch June 11, 2019 15:12
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

14 participants

@Centril@bors@rust-highfive@lcnr@sfengyuan@Mark-Simulacrum@wesleywiser@phansch@RalfJung@davidtwco@aschampion@alexcrichton@petrochenkov@cuviper