Rollup of 14 pull requests #49875

kennytm · 2018-04-11T11:56:55Z

Successful merges:

Use sort_by_cached_key where appropriate #49525 (Use sort_by_cached_key where appropriate)
Stabilize Option::filter. #49575 (Stabilize Option::filter.)
in which the non-shorthand patterns lint keeps its own counsel in macros #49614 (in which the non-shorthand patterns lint keeps its own counsel in macros)
Small nits to make couple of tests pass on mips targets. #49665 (Small nits to make couple of tests pass on mips targets.)
add regression test for #16223 (NLL): use of collaterally moved value #49781 (add regression test for Incorrect partially moved value error check when pattern matching boxed structures. #16223 (NLL): use of collaterally moved value)
Properly look for uninhabitedness of variants in niche-filling check #49795 (Properly look for uninhabitedness of variants in niche-filling check)
Stop emitting color codes on TERM=dumb #49809 (Stop emitting color codes on TERM=dumb)
Do not uppercase-lint #[no_mangle] statics #49856 (Do not uppercase-lint #[no_mangle] statics)
fixed typo #49863 (fixed typo)
Fix "fp" target feature for AArch64 #49857 (Fix "fp" target feature for AArch64)
Add --enable-debug flag to musl CI build script #49849 (Add --enable-debug flag to musl CI build script)
proc_macro: Generalize FromIterator impl #49734 (proc_macro: Generalize FromIterator impl)
Fix ICE with impl Trait #49730 (Fix ICE with impl Trait)
Replace structurally_resolved_type in casts check. #48270 (Replace structurally_resolved_type in casts check.)

Failed merges:

The behaviour of `resolve_type_vars_if_possible` is simpler and infallible.

`resolve_type_vars_with_obligations` is the same but doesn't error on unresolved type variables. In theory this could make more code compile because we don't error or could ommit an otherwise useful error. In practice I couldn't observe any effect.

Fixes rust-lang#45860

While never intended to be stable we forgot that trait impls are insta-stable! This construction of `FromIterator` wasn't our first choice of how to stabilize the impl but our hands are tied at this point, so revert back to the original definition of `FromIterator` before rust-lang#49597 Closes rust-lang#49725

In issue rust-lang#49588, Michael Lamparski pointed out a scenario in which the non-shorthand-field-patterns lint could be triggered by a macro-expanded pattern, in a way which was direly unwieldy for the macro author to guard against and unreasonable to expect the macro user to take into account. We can avoid this by not linting patterns that come from macro-expansions. Although this entails accepting "false negatives" where the lint could genuinely improve macro-templated code, avoiding the reported "true-but-super-annoying positive" may be worth the trade? (Some precedent for these relative priorities exists as no. 47775 (5985b0b).) Resolves rust-lang#49588.

These terminals generally don't support color. Fixes rust-lang#49191

…te references.

Building for x86_64-unknown-linux-musl currently results in an executable lacking debug information for musl libc itself. If you request a backtrace in GDB while control flow is within musl – including sycalls made by musl – the result looks like: #0 0x0000000000434b46 in __cp_end () #1 0x0000000000432dbd in __syscall_cp_c () rust-lang#2 0x0000000000000000 in ?? () i.e. not very helpful. Adding --enable-debug resolves this, and --enable-optimize re-enables optimisations which default to off given the previous flag.

…n, r=scottmcm Use sort_by_cached_key where appropriate A follow-up to rust-lang#48639, converting various slice sorting calls to `sort_by_cached_key` when the key functions are more expensive.

…=withoutboats Stabilize `Option::filter`. Fixes rust-lang#45860

…trochenkov in which the non-shorthand patterns lint keeps its own counsel in macros In issue rust-lang#49588, Michael Lamparski pointed out a scenario in which the non-shorthand-field-patterns lint could be triggered by a macro-expanded pattern, in a way which was direly unwieldy for the macro author to guard against and unreasonable to expect the macro user to take into account. We can avoid this by not linting patterns that come from macro-expansions. Although this entails accepting "false negatives" where the lint could genuinely improve macro-templated code, avoiding the reported "true-but-super-annoying positive" may be worth the trade? (Some precedent for these relative priorities exists as no. 47775 (5985b0b).) Resolves rust-lang#49588.

…omatsakis Small nits to make couple of tests pass on mips targets.

TimNN · 2018-04-11T18:58:15Z

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.

[01:27:17] thread '<unnamed>' panicked at 'isize::MAX + 1 should trigger an OOM!', libstd/collections/hash/map.rs:3640:22
---
[01:27:30] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-musl" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "std" "--"
---
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
ls: cannot access /home/travis/Library/Logs/DiagnosticReports/: No such file or directory
travis_time:end:02ede5a2:start=1523473051582066794,finish=1523473051595728633,duration=13661839
travis_fold:end:after_failure.2
travis_fold:start:after_failure.3
travis_time:start:04ee99b9
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
find: `/home/travis/Library/Logs/DiagnosticReports': No such file or directory
travis_time:end:04ee99b9:start=1523473051602017630,finish=1523473051608247498,duration=6229868
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1029a65e
$ dmesg | grep -i kill
[   10.878622] init: failsafe main process (1093) killed by TERM signal

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)

TimNN · 2018-04-11T18:58:35Z

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.

[01:27:17] thread '<unnamed>' panicked at 'isize::MAX + 1 should trigger an OOM!', libstd/collections/hash/map.rs:3640:22
---
[01:27:30] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-musl" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "std" "--"
---
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
ls: cannot access /home/travis/Library/Logs/DiagnosticReports/: No such file or directory
travis_time:end:02ede5a2:start=1523473051582066794,finish=1523473051595728633,duration=13661839
travis_fold:end:after_failure.2
travis_fold:start:after_failure.3
travis_time:start:04ee99b9
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
find: `/home/travis/Library/Logs/DiagnosticReports': No such file or directory
travis_time:end:04ee99b9:start=1523473051602017630,finish=1523473051608247498,duration=6229868
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1029a65e
$ dmesg | grep -i kill
[   10.878622] init: failsafe main process (1093) killed by TERM signal

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)

…r=michaelwoerister Do not uppercase-lint #[no_mangle] statics The reasoning being that `#[no_mangle]` expresses enough intention that there's likely a good reason for the name. Fixes rust-lang#36258.

fixed typo

Fix "fp" target feature for AArch64 This fixes the following warning on AArch64: ``` '+fp' is not a recognized feature for this target (ignoring feature) ``` Fixes rust-lang#49782

kennytm · 2018-04-11T19:26:57Z

@bors r+

Removed #49850 (This is the only PR which touches allocation stuff).
Added #49849.

bors · 2018-04-11T19:26:59Z

📌 Commit aebb2a3 has been approved by kennytm

Add --enable-debug flag to musl CI build script Building for x86_64-unknown-linux-musl currently results in an executable lacking debug information for musl libc itself. If you request a backtrace in GDB while control flow is within musl – including sycalls made by musl – the result looks like: ``` #0 0x0000000000434b46 in __cp_end () #1 0x0000000000432dbd in __syscall_cp_c () rust-lang#2 0x0000000000000000 in ?? () ``` i.e. not very helpful. Adding --enable-debug resolves this, and --enable-optimize re-enables optimisations which default to off given the previous flag.

…m, r=nikomatsakis proc_macro: Generalize `FromIterator` impl While never intended to be stable we forgot that trait impls are insta-stable! This construction of `FromIterator` wasn't our first choice of how to stabilize the impl but our hands are tied at this point, so revert back to the original definition of `FromIterator` before rust-lang#49597 Closes rust-lang#49725

Fix ICE with impl Trait Fixes rust-lang#49556 (comment). May or may not fix 49556 itself. Closures like `|x: &'a _| x` has `ClosureSubsts` of `fn(&'a _) -> &'(ReScope) _`, so `tcx.note_and_explain_free_region` (called [here](https://github.com/rust-lang/rust/blob/a143462783cec88b7b733e8aa09990bfeb59f754/src/librustc/infer/anon_types/mod.rs#L572)) panics.

…atsakis Replace `structurally_resolved_type` in casts check. The behaviour of `resolve_type_vars_if_possible` is simpler and infallible. Other minor refactorings. I'm not sure if this is backwards compatible, in theory resolving obligations between two cast checks could solve a dependency between them, but I don't know if that's actually possible and it doesn't sound like something we'd want to support.

kennytm · 2018-04-11T19:45:24Z

@bors r+

Removed #49698 (expecting Cargo.lock conflict).
Added #49734, #49730, #48270

bors · 2018-04-11T19:45:26Z

📌 Commit 9f6e5ae has been approved by kennytm

bors · 2018-04-11T21:42:40Z

⌛ Testing commit 9f6e5ae with merge e28ef22...

Rollup of 14 pull requests Successful merges: - #49525 (Use sort_by_cached_key where appropriate) - #49575 (Stabilize `Option::filter`.) - #49614 (in which the non-shorthand patterns lint keeps its own counsel in macros) - #49665 (Small nits to make couple of tests pass on mips targets.) - #49781 (add regression test for #16223 (NLL): use of collaterally moved value) - #49795 (Properly look for uninhabitedness of variants in niche-filling check) - #49809 (Stop emitting color codes on TERM=dumb) - #49856 (Do not uppercase-lint #[no_mangle] statics) - #49863 (fixed typo) - #49857 (Fix "fp" target feature for AArch64) - #49849 (Add --enable-debug flag to musl CI build script) - #49734 (proc_macro: Generalize `FromIterator` impl) - #49730 (Fix ICE with impl Trait) - #48270 (Replace `structurally_resolved_type` in casts check.) Failed merges:

bors · 2018-04-12T00:35:27Z

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing e28ef22 to master...

leoyvens and others added 30 commits March 22, 2018 17:42

Replace structurally_resolved_type in casts check.

7719f53

The behaviour of `resolve_type_vars_if_possible` is simpler and infallible.

revert making casts atomic, test order dependency

0a5a5c3

Stabilize Option::filter.

5152a6f

Fixes rust-lang#45860

Remove uses of option_filter feature

c7ac32a

Fix ICE with impl Trait

20c499d

Print region in case of ICE

b9e04e5

Properly look for uninhabitedness of variants in niche-filling check

5edfb53

Convert sort_by_key to sort_by_cached_key

eacfb33

Convert sort_unstable_by_key to sort_by_cached_key

d3fe534

Convert sort_unstable_by to sort_by_cached_key

5cd0504

Convert sort_by to sort_by_cached_key

57eedba

Add trivial early return for sort_by_cached_key

1aa6152

Use cmp::Reverse instead of subtraction

2cc52f0

Use sort_by_cached_key for partitioning

e7aa139

Stop emitting color codes on TERM=dumb

d326beb

These terminals generally don't support color. Fixes rust-lang#49191

add regression test for issue rust-lang#16223: fixed by NLL

f62c210

Small nits to make couple of tests pass on mips targets.

dab317f

Update ui test references.

1e5145d

Add ignores for powerpc and s390x to target-feature-wrong.rs and upda…

0a94344

…te references.

Do not uppercase-lint no_mangle statics

6e0089e

Fix "fp" feature for AArch64

5e53746

fixed typo

a648267

Rollup merge of rust-lang#49525 - varkor:sort_by_cached_key-conversio…

77777b4

…n, r=scottmcm Use sort_by_cached_key where appropriate A follow-up to rust-lang#48639, converting various slice sorting calls to `sort_by_cached_key` when the key functions are more expensive.

Rollup merge of rust-lang#49575 - tmccombs:option-filter-stabilize, r…

5ee5de1

…=withoutboats Stabilize `Option::filter`. Fixes rust-lang#45860

Rollup merge of rust-lang#49665 - draganmladjenovic:mips_tests, r=nik…

1bdb9a5

…omatsakis Small nits to make couple of tests pass on mips targets.

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 11, 2018

kennytm mentioned this pull request Apr 11, 2018

rustc_driver: Catch ICEs on the main thread too #49826

Merged

kennytm added 3 commits April 12, 2018 03:23

Rollup merge of rust-lang#49856 - varkor:no_mangle-statics-unlinted, …

0629309

…r=michaelwoerister Do not uppercase-lint #[no_mangle] statics The reasoning being that `#[no_mangle]` expresses enough intention that there's likely a good reason for the name. Fixes rust-lang#36258.

Rollup merge of rust-lang#49863 - memoryleak47:andorid, r=oli-obk

7a70928

fixed typo

Rollup merge of rust-lang#49857 - Amanieu:aarch64_fp, r=alexcrichton

dfdcf63

Fix "fp" target feature for AArch64 This fixes the following warning on AArch64: ``` '+fp' is not a recognized feature for this target (ignoring feature) ``` Fixes rust-lang#49782

kennytm force-pushed the rollup branch from cf8d94e to aebb2a3 Compare April 11, 2018 19:26

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 11, 2018

kennytm mentioned this pull request Apr 11, 2018

core: Inline From<AllocErr> for CollectionAllocErr #49850

Merged

kennytm added 4 commits April 12, 2018 03:34

kennytm force-pushed the rollup branch from aebb2a3 to 9f6e5ae Compare April 11, 2018 19:44

kennytm changed the title ~~Rollup of 12 pull requests~~ Rollup of 14 pull requests Apr 11, 2018

This was referenced Apr 12, 2018

Stabilize x86/x86_64 SIMD #49664

Merged

Small nits to make couple of tests pass on mips targets. #49665

Merged

bors merged commit 9f6e5ae into rust-lang:master Apr 12, 2018

This was referenced Apr 12, 2018

Hygiene 2.0: Avoid comparing fields by name #49718

Merged

Treat repr(Rust) univariant fieldless enums as ZSTs #49513

Merged

Centril added the rollup A PR which is a rollup label Oct 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 14 pull requests #49875

Rollup of 14 pull requests #49875

kennytm commented Apr 11, 2018 •

edited

Loading

TimNN commented Apr 11, 2018

TimNN commented Apr 11, 2018

kennytm commented Apr 11, 2018

bors commented Apr 11, 2018

kennytm commented Apr 11, 2018

bors commented Apr 11, 2018

bors commented Apr 11, 2018

bors commented Apr 12, 2018

Rollup of 14 pull requests #49875

Rollup of 14 pull requests #49875

Conversation

kennytm commented Apr 11, 2018 • edited Loading

TimNN commented Apr 11, 2018

TimNN commented Apr 11, 2018

kennytm commented Apr 11, 2018

bors commented Apr 11, 2018

kennytm commented Apr 11, 2018

bors commented Apr 11, 2018

bors commented Apr 11, 2018

bors commented Apr 12, 2018

kennytm commented Apr 11, 2018 •

edited

Loading