Rollup of 13 pull requests by arielb1 · Pull Request #40440 · rust-lang/rust

arielb1 · 2017-03-11T15:13:54Z

Successful merges: Better docs of rusty parts of typeck #40146, Add missing example for Display::fmt #40299, Allow lints to check Bodys directly #40315, Disallow subtyping between T and U in T: Unsize<U>. #40319, save-analysis: cope with lack of method data after a type error #40344, Fix missing backtick typo #40345, Improve the LLVM IR we generate for trivial functions, especially #[naked] ones. #40367, Do not bother creating StorageLive for TyNever #40372, Fix UB in repr(packed) tests #40373, emit !align attributes on stores of operand pairs #40385, Update gdbr tests #40400, fix #40294 obligation cause.body_id is not always a NodeExpr #40404, rustc: Whitelist the FMA target feature #40431
Failed merges:

Fixes rendering of the end of the `Configure and Make` section.

Keeps MIR cleaner, `StorageLive(_: !)` makes no sense anyway.

gdb will now reliably detect the lanugage as rust even before any code is run.

This commit adds the entry `"fma\0"` to the whitelist for the x86 target. LLVM already supports fma but rustc did not directly. Previously rustc permitted `+fma` in the target-feature argument and enabled the use of FMA instructions, but it did not list it in the configuration and attributes. fixesrust-lang#40406

Better docs of rusty parts of typeck

@frewsxcv

… r=frewsxcv Add missing example for Display::fmt r? @frewsxcv

@eddyb

Allow lints to check Bodys directly r? @eddyb babysteps towards fixing https://github.com/Manishearth/rust-clippy/issues/1580 (disable certain lints in const environments, since they make no sense there (yet))

…r=nikomatsakis Disallow subtyping between T and U in T: Unsize<U>. Because `&mut T` can be coerced to `&mut U`, `T` and `U` must be unified invariantly. Fixesrust-lang#40288. E.g. coercing `&mut [&'a X; N]` to `&mut [&'b X]` must require `'a` be equal to `'b`, otherwise you can convert between `&'a X` and `&'b X` (in either direction), potentially unsoundly lengthening lifetimes. Subtyping here was introduced with `Unsize` in rust-lang#24619 (landed in 1.1, original PR is rust-lang#23785).

@eddyb

save-analysis: cope with lack of method data after a type error Fixesrust-lang#39957 r? @eddyb

Fix missing backtick typo Fixes rendering of the end of the `Configure and Make` section.

Improve the LLVM IR we generate for trivial functions, especially #[naked] ones. These two small changes fixedef1c/libfringe#68: * Don't emit ZST allocas, such as when returning `()` * Don't emit a branch from LLVM's entry block to MIR's `START_BLOCK` unless needed * That is, if a loop branches back to it, although I'm not sure that's even valid MIR

@eddyb

Do not bother creating StorageLive for TyNever Keeps MIR cleaner, `StorageLive(_: !)` makes no sense anyway. r? @eddyb

@arielb1

Fix UB in repr(packed) tests r? @arielb1 cc rust-lang#37609 and rust-lang#27060

@eddyb

emit !align attributes on stores of operand pairs This avoids another case of missing-align UB. cc rust-lang#40373 r? @eddyb

Update gdbr tests gdb will now reliably detect the lanugage as rust even before any code is run.

@nikomatsakis

fixrust-lang#40294 obligation cause.body_id is not always a NodeExpr Hello! This fixesrust-lang#40294 and moves tests related to rust-lang#38812 to a much more sensible directory. Thanks to @nikomatsakis and @eddyb

rustc: Whitelist the FMA target feature This commit adds the entry `"fma\0"` to the whitelist for the x86 target. LLVM already supports fma but rustc did not directly. Previously rustc permitted `+fma` in the target-feature argument and enabled the use of FMA instructions, but it did not list it in the configuration and attributes. fixesrust-lang#40406

rust-highfive · 2017-03-11T15:13:59Z

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

arielb1 · 2017-03-11T15:15:02Z

@bors r+ p=1

bors · 2017-03-11T15:15:03Z

📌 Commit effb66c has been approved by arielb1

bors · 2017-03-11T15:32:16Z

⌛ Testing commit effb66c with merge 9db4d87...

bors · 2017-03-11T15:50:30Z

💔 Test failed - status-appveyor

alexcrichton · 2017-03-11T16:25:16Z

@bors: retry * sccache failure #40240

…

On Sat, Mar 11, 2017 at 9:50 AM, bors ***@***.***> wrote: 💔 Test failed - status-appveyor <https://ci.appveyor.com/project/rust-lang/rust/build/1.0.2344> — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#40440 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95K4v4AH195tgwaQ1u5HB79WFl18bks5rksLIgaJpZM4MaOro> .

alexcrichton · 2017-03-11T17:32:37Z

@bors: p=3

bors · 2017-03-11T18:10:11Z

⌛ Testing commit effb66c with merge 9ca8831...

Rollup of 13 pull requests - Successful merges: #40146, #40299, #40315, #40319, #40344, #40345, #40367, #40372, #40373, #40385, #40400, #40404, #40431 - Failed merges:

bors · 2017-03-11T19:10:06Z

💔 Test failed - status-travis

arielb1 · 2017-03-11T19:11:00Z

---- [debuginfo-gdb] debuginfo-gdb/macro-stepping.rs stdout ----
NOTE: compiletest thinks it is using GDB without native rust support
NOTE: compiletest thinks it is using GDB version 7011001
error: line not found in debugger output: [...]#inc-loc1[...]

alexcrichton · 2017-03-11T19:13:39Z

@arielb1 my guess is #40367 but that's mostly a complete guess

arielb1 · 2017-03-11T19:13:56Z

Sure
Looks like https://bugs.llvm.org/show_bug.cgi?id=32123

arielb1 · 2017-03-11T19:14:57Z

I'll test that locally.

bjorn3and others added 30 commits February 28, 2017 10:57

Dont bug! on user error
53d3c89

Fix indentation in region infer docs
54a1c8b

Syntax highlighting in region infer docs
2a40918

Improve a bit more
be49671

Syntax highlight and note about current rust in infer docs
90e94d9

Fix missing backtick typo
234753a
Fixes rendering of the end of the `Configure and Make` section.

Disallow subtyping between T and U in T: Unsize<U>.
3198904

fix UB in repr(packed) tests
79a7ee8

Overhaul coercion to use the lazy InferOk obligations passing.
74bc7fd

Do not bother creating StorageLive for TyNever
84d1f6a
Keeps MIR cleaner, `StorageLive(_: !)` makes no sense anyway.

Use subtyping on the target of unsizing coercions.
cfb41ae

update gdbr tests
b95b5db
gdb will now reliably detect the lanugage as rust even before any code is run.

fixrust-lang#40294obligation cause.body_id is not always a NodeExpr
7f19f1f

move related tests to type-check ui test directory
889337d

Add missing example for Display::fmt
a5a3981

save-analysis: cope with lack of method data after a type error
e5d1b9c
Fixesrust-lang#39957

rustc_trans: don't emit ZST allocas that are only assigned to.
c9b6318

rustc_trans: avoid a separate entry BB if START_BLOCK has no backedges.
d8ca084

Allow lints to check Bodys directly
b959d13

emit !align attributes on stores of operand pairs
038ec50
cc rust-lang#40373

Rollup merge ofrust-lang#40146- bjorn3:few-infer-changes, r=pnkfelix
6de0edc
Better docs of rusty parts of typeck

Rollup merge ofrust-lang#40299- GuillaumeGomez:fmt-display-example,…
021e11d
… r=frewsxcv Add missing example for Display::fmt r? @frewsxcv

Rollup merge ofrust-lang#40315- oli-obk:lint_body, r=eddyb
fabc4d1
Allow lints to check Bodys directly r? @eddyb babysteps towards fixing https://github.com/Manishearth/rust-clippy/issues/1580 (disable certain lints in const environments, since they make no sense there (yet))

Rollup merge ofrust-lang#40344- nrc:save-container, r=eddyb
1527d8e
save-analysis: cope with lack of method data after a type error Fixesrust-lang#39957 r? @eddyb

Rollup merge ofrust-lang#40345- Nashenas88:patch-1, r=estebank
d060e43
Fix missing backtick typo Fixes rendering of the end of the `Configure and Make` section.

Rollup merge ofrust-lang#40372- nagisa:never-drop, r=eddyb
828625c
Do not bother creating StorageLive for TyNever Keeps MIR cleaner, `StorageLive(_: !)` makes no sense anyway. r? @eddyb

Rollup merge ofrust-lang#40373- TimNN:test-ub-packed, r=arielb1
7dd28e2
Fix UB in repr(packed) tests r? @arielb1 cc rust-lang#37609 and rust-lang#27060

Ariel Ben-Yehuda added 4 commits March 11, 2017 17:13

Rollup merge ofrust-lang#40385- arielb1:packed-again, r=eddyb
d0531e9
emit !align attributes on stores of operand pairs This avoids another case of missing-align UB. cc rust-lang#40373 r? @eddyb

Rollup merge ofrust-lang#40400- TimNN:gdbr-updates, r=alexcrichton
7205a43
Update gdbr tests gdb will now reliably detect the lanugage as rust even before any code is run.

Rollup merge ofrust-lang#40404- cengizIO:master, r=nikomatsakis
1822a45
fixrust-lang#40294 obligation cause.body_id is not always a NodeExpr Hello! This fixesrust-lang#40294 and moves tests related to rust-lang#38812 to a much more sensible directory. Thanks to @nikomatsakis and @eddyb

rust-highfive assigned eddyb Mar 11, 2017

bors added a commit that referenced this pull request Mar 11, 2017
Auto merge of#40440- arielb1:rollup, r=arielb1
9ca8831
Rollup of 13 pull requests - Successful merges: #40146, #40299, #40315, #40319, #40344, #40345, #40367, #40372, #40373, #40385, #40400, #40404, #40431 - Failed merges:

arielb1 closed this Mar 11, 2017

arielb1 reopened this Mar 11, 2017

arielb1 closed this Mar 11, 2017

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

Uh oh!

Uh oh!

Conversation

arielb1 commented Mar 11, 2017

Uh oh!

rust-highfive commented Mar 11, 2017

Uh oh!

arielb1 commented Mar 11, 2017

Uh oh!

bors commented Mar 11, 2017

Uh oh!

bors commented Mar 11, 2017

Uh oh!

bors commented Mar 11, 2017

Uh oh!

alexcrichton commented Mar 11, 2017 via email

Uh oh!

alexcrichton commented Mar 11, 2017

Uh oh!

bors commented Mar 11, 2017

Uh oh!

bors commented Mar 11, 2017

Uh oh!

arielb1 commented Mar 11, 2017

Uh oh!

alexcrichton commented Mar 11, 2017

Uh oh!

arielb1 commented Mar 11, 2017

Uh oh!

arielb1 commented Mar 11, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants