Rollup of 8 pull requests by Centril · Pull Request #70099 · rust-lang/rust

Centril · 2020-03-18T10:31:57Z

Successful merges:

keyword docs for else and inkeyword docs for else and in. #67749 (keyword docs for else and inkeyword docs for else and in.)
clean up E0308 explanation #69139 (clean up E0308 explanation)
Erase regions in writeback #69189 (Erase regions in writeback)
Don't unwind when hitting the macro expansion recursion limit #69497 (Don't unwind when hitting the macro expansion recursion limit)
Use smaller discriminants for generators #69837 (Use smaller discriminants for generators)
Make methods declared by newtype_index macro const #69899 (Make methods declared by newtype_index macro const)
Build dist-android with --enable-profiler #70054 (Build dist-android with --enable-profiler)
Fix repr pretty display #70075 (Fix repr pretty display)

Failed merges:

Allow hir().find to return None #70051 (Allow hir().find to return None)

r? @ghost

It was unused.

Regions in TypeckTables will be erased, so are unusable for error reporting.

Also skip duplicated region solving entirely with `-Zborrowck=mir`.

keyword docs for else and inkeyword docs for else and in. First cut of else and in keyword docs. Comments and suggestions more than welcome.

@Dylan-DPC

…an-DPC clean up E0308 explanation r? @Dylan-DPC

@nikomatsakis

…komatsakis Erase regions in writeback Regions in `TypeckTables` (except canonicalized user annotations) are now erased. Further, we no longer do lexical region solving on item bodies with `-Zborrowck=mir`. cc rust-lang#68261 r? @nikomatsakis

@petrochenkov

…nkov Don't unwind when hitting the macro expansion recursion limit This removes one use of `FatalError.raise()`. r? @petrochenkov

…andry Use smaller discriminants for generators Closesrust-lang#69815 I'm not yet sure about the runtime performance impact of this, so I'll try running this on some benchmarks (if I can find any). (Update: No impact on the benchmarks I've measured on) * [x] Add test with a generator that has exactly 256 total states * [x] Add test with a generator that has more than 256 states so that it needs to use a u16 discriminant * [x] Add tests for the size of `Option<[generator]>` * [x] Add tests for the `discriminant_value` intrinsic in all cases

…=oli-obk Make methods declared by `newtype_index` macro `const` Crates that use the macro to define an `Idx` type need to enable `#![feature(const_if_match, const_panic)]`.

@michaelwoerister

Build dist-android with --enable-profiler This will make the runtime available to enable PGO for Rust code in Firefox on Android. r? @michaelwoerister

@varkor

…petrochenkov Fix repr pretty display Fixesrust-lang#70027. r? @varkor

Centril · 2020-03-18T10:32:16Z

@bors r+ p=8 rollup=never

bors · 2020-03-18T10:32:17Z

📌 Commit ba83e55 has been approved by Centril

bors · 2020-03-18T13:54:04Z

⌛ Testing commit ba83e55 with merge 12e620382049948a916afaf199bc213c6d307406...

rust-highfive · 2020-03-18T15:18:40Z

The job dist-android of your PR failed (pretty log, 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.

2020-03-18T15:16:57.5832274Z [RUSTC-TIMING] compiler_builtins test:false 2.155
2020-03-18T15:16:57.5982123Z error: failed to run custom build command for `profiler_builtins v0.0.0 (/checkout/src/libprofiler_builtins)`
2020-03-18T15:16:57.5983019Z 2020-03-18T15:16:57.5983595Z Caused by:
2020-03-18T15:16:57.5984961Z process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/release/build/profiler_builtins-9bb15f3a7adeeb21/build-script-build` (exit code: 1)
2020-03-18T15:16:57.5985789Z --- stdout
2020-03-18T15:16:57.5986267Z TARGET = Some("arm-linux-androideabi")
2020-03-18T15:16:57.5986658Z OPT_LEVEL = Some("3")
2020-03-18T15:16:57.5987163Z HOST = Some("x86_64-unknown-linux-gnu")
2020-03-18T15:16:57.5988906Z CC_arm-linux-androideabi = Some("sccache /android/ndk/arm-14/bin/arm-linux-androideabi-clang")
2020-03-18T15:16:57.5990367Z CFLAGS_arm-linux-androideabi = Some("-ffunction-sections -fdata-sections -fPIC --target=arm-linux-androideabi")
2020-03-18T15:16:57.5990811Z CRATE_CC_NO_DEFAULTS = None
2020-03-18T15:16:57.5991080Z DEBUG = Some("true")
2020-03-18T15:16:57.5993884Z running: "sccache" "/android/ndk/arm-14/bin/arm-linux-androideabi-clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-g" "-fno-omit-frame-pointer" "--target=arm-linux-androideabi" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=arm-linux-androideabi" "-I" "/checkout/src/llvm-project/compiler-rt/include" "-fno-builtin" "-fvisibility=hidden" "-fomit-frame-pointer" "-ffreestanding" "-DVISIBILITY_HIDDEN" "-DCOMPILER_RT_HAS_UNAME=1" "-DCOMPILER_RT_HAS_FCNTL_LCK=1" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/build/profiler_builtins-48aac5a25541f1f3/out/GCDAProfiling.o" "-c" "/checkout/src/llvm-project/compiler-rt/lib/profile/GCDAProfiling.c"
2020-03-18T15:16:57.5995852Z exit code: 0
2020-03-18T15:16:57.5998484Z running: "sccache" "/android/ndk/arm-14/bin/arm-linux-androideabi-clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-g" "-fno-omit-frame-pointer" "--target=arm-linux-androideabi" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=arm-linux-androideabi" "-I" "/checkout/src/llvm-project/compiler-rt/include" "-fno-builtin" "-fvisibility=hidden" "-fomit-frame-pointer" "-ffreestanding" "-DVISIBILITY_HIDDEN" "-DCOMPILER_RT_HAS_UNAME=1" "-DCOMPILER_RT_HAS_FCNTL_LCK=1" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/build/profiler_builtins-48aac5a25541f1f3/out/InstrProfiling.o" "-c" "/checkout/src/llvm-project/compiler-rt/lib/profile/InstrProfiling.c"
2020-03-18T15:16:57.6000179Z exit code: 0
2020-03-18T15:16:57.6002960Z running: "sccache" "/android/ndk/arm-14/bin/arm-linux-androideabi-clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-g" "-fno-omit-frame-pointer" "--target=arm-linux-androideabi" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=arm-linux-androideabi" "-I" "/checkout/src/llvm-project/compiler-rt/include" "-fno-builtin" "-fvisibility=hidden" "-fomit-frame-pointer" "-ffreestanding" "-DVISIBILITY_HIDDEN" "-DCOMPILER_RT_HAS_UNAME=1" "-DCOMPILER_RT_HAS_FCNTL_LCK=1" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/build/profiler_builtins-48aac5a25541f1f3/out/InstrProfilingBuffer.o" "-c" "/checkout/src/llvm-project/compiler-rt/lib/profile/InstrProfilingBuffer.c"
2020-03-18T15:16:57.6004683Z exit code: 0
2020-03-18T15:16:57.6007346Z running: "sccache" "/android/ndk/arm-14/bin/arm-linux-androideabi-clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-g" "-fno-omit-frame-pointer" "--target=arm-linux-androideabi" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=arm-linux-androideabi" "-I" "/checkout/src/llvm-project/compiler-rt/include" "-fno-builtin" "-fvisibility=hidden" "-fomit-frame-pointer" "-ffreestanding" "-DVISIBILITY_HIDDEN" "-DCOMPILER_RT_HAS_UNAME=1" "-DCOMPILER_RT_HAS_FCNTL_LCK=1" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/build/profiler_builtins-48aac5a25541f1f3/out/InstrProfilingFile.o" "-c" "/checkout/src/llvm-project/compiler-rt/lib/profile/InstrProfilingFile.c"
2020-03-18T15:16:57.6009548Z cargo:warning=In file included from /checkout/src/llvm-project/compiler-rt/lib/profile/InstrProfilingFile.c:27:
2020-03-18T15:16:57.6010461Z cargo:warning=In file included from /android/ndk/arm-14/bin/../sysroot/usr/include/unistd.h:35:
2020-03-18T15:16:57.6011322Z cargo:warning=In file included from /android/ndk/arm-14/bin/../sysroot/usr/include/sys/select.h:36:
2020-03-18T15:16:57.6012195Z cargo:warning=In file included from /android/ndk/arm-14/bin/../sysroot/usr/include/signal.h:193:
2020-03-18T15:16:57.6013242Z cargo:warning=/android/ndk/arm-14/bin/../sysroot/usr/include/android/legacy_signal_inlines.h:71:33: error: use of undeclared identifier 'LONG_BIT'
2020-03-18T15:16:57.6013906Z cargo:warning= return (int)((local_set[bit / LONG_BIT] >> (bit % LONG_BIT)) & 1);
2020-03-18T15:16:57.6014359Z cargo:warning= ^
2020-03-18T15:16:57.6015269Z cargo:warning=/android/ndk/arm-14/bin/../sysroot/usr/include/android/legacy_signal_inlines.h:71:53: error: use of undeclared identifier 'LONG_BIT'
2020-03-18T15:16:57.6015943Z cargo:warning= return (int)((local_set[bit / LONG_BIT] >> (bit % LONG_BIT)) & 1);
2020-03-18T15:16:57.6016558Z cargo:warning= ^
2020-03-18T15:16:57.6017544Z cargo:warning=/android/ndk/arm-14/bin/../sysroot/usr/include/android/legacy_signal_inlines.h:82:19: error: use of undeclared identifier 'LONG_BIT'
2020-03-18T15:16:57.6018198Z cargo:warning= local_set[bit / LONG_BIT] |= 1UL << (bit % LONG_BIT);
2020-03-18T15:16:57.6018567Z cargo:warning= ^
2020-03-18T15:16:57.6019460Z cargo:warning=/android/ndk/arm-14/bin/../sysroot/usr/include/android/legacy_signal_inlines.h:82:46: error: use of undeclared identifier 'LONG_BIT'
2020-03-18T15:16:57.6020104Z cargo:warning= local_set[bit / LONG_BIT] |= 1UL << (bit % LONG_BIT);
2020-03-18T15:16:57.6020534Z cargo:warning= ^
2020-03-18T15:16:57.6021479Z cargo:warning=/android/ndk/arm-14/bin/../sysroot/usr/include/android/legacy_signal_inlines.h:94:19: error: use of undeclared identifier 'LONG_BIT'
2020-03-18T15:16:57.6022116Z cargo:warning= local_set[bit / LONG_BIT] &= ~(1UL << (bit % LONG_BIT));
2020-03-18T15:16:57.6022516Z cargo:warning= ^
2020-03-18T15:16:57.6023477Z cargo:warning=/android/ndk/arm-14/bin/../sysroot/usr/include/android/legacy_signal_inlines.h:94:48: error: use of undeclared identifier 'LONG_BIT'
2020-03-18T15:16:57.6024231Z cargo:warning= local_set[bit / LONG_BIT] &= ~(1UL << (bit % LONG_BIT));
2020-03-18T15:16:57.6024705Z cargo:warning= ^
2020-03-18T15:16:57.6025060Z cargo:warning=6 errors generated.
2020-03-18T15:16:57.6025490Z 2020-03-18T15:16:57.6025912Z --- stderr
2020-03-18T15:16:57.6026061Z 2020-03-18T15:16:57.6026181Z 2020-03-18T15:16:57.6026181Z 2020-03-18T15:16:57.6030334Z error occurred: Command "sccache" "/android/ndk/arm-14/bin/arm-linux-androideabi-clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-g" "-fno-omit-frame-pointer" "--target=arm-linux-androideabi" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=arm-linux-androideabi" "-I" "/checkout/src/llvm-project/compiler-rt/include" "-fno-builtin" "-fvisibility=hidden" "-fomit-frame-pointer" "-ffreestanding" "-DVISIBILITY_HIDDEN" "-DCOMPILER_RT_HAS_UNAME=1" "-DCOMPILER_RT_HAS_FCNTL_LCK=1" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/build/profiler_builtins-48aac5a25541f1f3/out/InstrProfilingFile.o" "-c" "/checkout/src/llvm-project/compiler-rt/lib/profile/InstrProfilingFile.c" with args "arm-linux-androideabi-clang" did not execute successfully (status code exit code: 1).
2020-03-18T15:16:57.6032410Z 2020-03-18T15:16:57.6032546Z 2020-03-18T15:16:57.6033315Z warning: build failed, waiting for other jobs to finish...
2020-03-18T15:16:57.6081724Z error: build failed
---
2020-03-18T15:16:57.6190857Z local time: Wed Mar 18 15:16:57 UTC 2020
2020-03-18T15:16:58.1770875Z network time: Wed, 18 Mar 2020 15:16:58 GMT
2020-03-18T15:16:58.1773903Z == end clock drift check ==
2020-03-18T15:17:03.7424348Z 2020-03-18T15:17:03.7544631Z ##[error]Bash exited with code '1'.
2020-03-18T15:17:03.7633083Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-03-18T15:17:03.7639527Z ==============================================================================
2020-03-18T15:17:03.7640072Z Task : Get sources
2020-03-18T15:17:03.7640622Z Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 @rust-lang/infra. (Feature Requests)

bors · 2020-03-18T15:18:51Z

💔 Test failed - checks-azure

gilescopeand others added 28 commits February 13, 2020 19:42

keyword docs for else and inkeyword docs for else and in.
a113609

clean up E0308 explanation
57f1bb1

Update tests
64460a1

Use smaller discriminants for generators
b2779d8

Add a test for generator discriminants
4266807

Fix rebase fallout
49aabd8

Build dist-android with --enable-profiler
f8870bf

Remove free_region_map from TypeckTables
5a9ccc9
It was unused.

Don't use TypeckTables in NiceRegionError
cefd030
Regions in TypeckTables will be erased, so are unusable for error reporting.

Erase regions in writeback
0a7f16e
Also skip duplicated region solving entirely with `-Zborrowck=mir`.

Update tests for erasing regions in typeck
1ee5829

Don't unwind when hitting the macro expansion recursion limit
3314a34

Update test
bdaf9e4

Don't prepend with space before paren
aa20d96

Make newtype_index methods const
429b16e

Rename from_u32_const -> from_u32
7f5a284

Add requisite feature gates for const assert
cc4a577

Hold index of generator self arg in const
9ac93ee

Update pretty tests
81172d8

Update rustdoc test and remove TODO comment
9a017da

Rollup merge ofrust-lang#67749- gilescope:keyword-in, r=Dylan-DPC
c64e386
keyword docs for else and inkeyword docs for else and in. First cut of else and in keyword docs. Comments and suggestions more than welcome.

Rollup merge ofrust-lang#69139- GuillaumeGomez:cleanup-e0308, r=Dyl…
ff06c34
…an-DPC clean up E0308 explanation r? @Dylan-DPC

Rollup merge ofrust-lang#69497- Zoxc:ast-fragment-error, r=petroche…
eb1e4d1
…nkov Don't unwind when hitting the macro expansion recursion limit This removes one use of `FatalError.raise()`. r? @petrochenkov

Rollup merge ofrust-lang#69899- ecstatic-morse:const-idx-methods, r…
c8d743c
…=oli-obk Make methods declared by `newtype_index` macro `const` Crates that use the macro to define an `Idx` type need to enable `#![feature(const_if_match, const_panic)]`.

Rollup merge ofrust-lang#70054- rojamd:android-pgo, r=michaelwoerister
09dddf1
Build dist-android with --enable-profiler This will make the runtime available to enable PGO for Rust code in Firefox on Android. r? @michaelwoerister

Rollup merge ofrust-lang#70075- GuillaumeGomez:fix-repr-display, r=…
ba83e55
…petrochenkov Fix repr pretty display Fixesrust-lang#70027. r? @varkor

Centril added the rollup A PR which is a rollup label Mar 18, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 18, 2020

bors 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 Mar 18, 2020

Centril closed this Mar 18, 2020

Centril deleted the rollup-6r74vwb branch March 18, 2020 15:19

Centril mentioned this pull request Mar 18, 2020
Build dist-android with --enable-profiler #70054
Merged

Navigation Menu

Uh oh!

Uh oh!

Rollup of 8 pull requests - #70099

Rollup of 8 pull requests#70099
Centril wants to merge 28 commits into
rust-lang:masterfrom
Centril:rollup-6r74vwb

Centril commented Mar 18, 2020

Uh oh!

Centril commented Mar 18, 2020

Uh oh!

bors commented Mar 18, 2020

Uh oh!

bors commented Mar 18, 2020

Uh oh!

rust-highfive commented Mar 18, 2020

Uh oh!

bors commented Mar 18, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Uh oh!

Conversation

Centril commented Mar 18, 2020

Uh oh!

Centril commented Mar 18, 2020

Uh oh!

bors commented Mar 18, 2020

Uh oh!

bors commented Mar 18, 2020

Uh oh!

rust-highfive commented Mar 18, 2020

Uh oh!

bors commented Mar 18, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants