Rollup of 7 pull requests #66924

Centril · 2019-12-01T09:07:16Z

Successful merges:

Replace .unwrap() with ? in std::os::unix::net #66346 (Replace .unwrap() with ? in std::os::unix::net)
rustc: move mir::SourceScopeLocalData to a field of SourceScopeData. #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.)
libunwind_panic: adjust miri panic hack #66822 (libunwind_panic: adjust miri panic hack)
handle diverging functions forwarding their return place #66827 (handle diverging functions forwarding their return place)
Less minification #66828 (Less minification)
rustc: hide HirId's fmt::Debug output from -Z span_free_formats. #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.)
rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl. #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.)

Failed merges:

Miri engine: proper support for Assert MIR terminators #66874 (Miri engine: proper support for Assert MIR terminators)

…d elements.

…-DPC Replace .unwrap() with ? in std::os::unix::net As people like to copy examples, this gives them good habits.

…r=oli-obk rustc: move mir::SourceScopeLocalData to a field of SourceScopeData. By having one `ClearCrossCrate<SourceScopeLocalData>` for each scope, as opposed to a single `ClearCrossCrate` for all the `SourceScopeLocalData`s, we can represent the fact that some scopes have `SourceScopeLocalData` associated with them, and some don't. This is useful when doing MIR inlining across crates, because the `ClearCrossCrate` will be `Clear` for the cross-crate MIR scopes and `Set` for the local ones. Also see rust-lang#66203 (comment) for some context around this approach. Fixes rust-lang#51314.

@oli-obk

libunwind_panic: adjust miri panic hack We adjust the Miri hack in libpanic_unwind such that even with `cfg(miri)`, we build a version of libpanic_unwind that actually works. This is needed to resolve rust-lang/rust-playground#548. r? @oli-obk @alexcrichton

@oli-obk

…oli-obk handle diverging functions forwarding their return place Fixes rust-lang/miri#1075: the shim around diverging closures turned into function pointers actually "obtains" a return place inside a diverging function, but just uses it as the return place for a diverging callee. Handle this by using NULL places. This is kind of a hack as it breaks our invariant that all places are dereferencable, but we'd eventually let raw pointers break that anyway I assume so that seems fine. r? @oli-obk

@nox

…=kinnison Less minification The goal of this PR is to remove the minification process on the `search-index.js` file. It provides great result in term of space reduction but the computation time is far too long. I'll work on this issue and will put it back once it's fast enough. cc @nox @lqd r? @kinnison

@oli-obk

rustc: hide HirId's fmt::Debug output from -Z span_free_formats. This replaces the only occurrences of `HirId {...}` from tests with paths, i.e.: ```rust [closure@HirId { owner: DefIndex(4), local_id: 15 } q:&i32, t:&T] ``` becomes, after this PR: ```rust [closure@foo<T>::{{closure}}#0 q:&i32, t:&T] ``` r? @oli-obk cc @michaelwoerister

@nikomatsakis

rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl. Context: these `fmt::Debug` impls only get used with `-Z verbose` (which some tests use). I was going to print the path like in rust-lang#66850 (or rather, use `DefId`'s `fmt::Debug`, which is close but not as nice), but then I realized that most of the `DefId`s were `crate0:DefIndex(0)`, i.e. the crate root. As the crate root is not a lifetime, they're clearly dummies of some sort, and we don't have to print anything other than the name for them. This means that out of all the tests, there's only 5 instances of `BrNamed` that now print the full path to the lifetime parameter, and everything else is shorter instead, which doesn't feel too bad. cc @nikomatsakis

Centril · 2019-12-01T09:07:34Z

@bors r+ p=2000 rollup=never

bors · 2019-12-01T09:07:35Z

📌 Commit 1569dab has been approved by Centril

bors · 2019-12-01T09:07:36Z

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

bors · 2019-12-01T09:07:47Z

⌛ Testing commit 1569dab with merge 0e442f7ec8b17c274bb505033f69012ec2e28d53...

RalfJung · 2019-12-01T19:37:54Z

@bors retry

bors · 2019-12-01T19:38:06Z

⌛ Testing commit 1569dab with merge 704ca20f9789d5cd15a589155e46bee8350c0fdb...

rust-highfive · 2019-12-01T20:52:36Z

The job dist-arm-linux 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.

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)

bors · 2019-12-01T20:52:41Z

💔 Test failed - checks-azure

RalfJung · 2019-12-01T20:55:01Z

Well that's bad luck, this time some crates.io download failed...

@bors retry

bors · 2019-12-01T20:55:10Z

⌛ Testing commit 1569dab with merge 3680f4f2a3b463df5d869e960af10bde0b870926...

rust-highfive · 2019-12-01T20:58:27Z

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.

2019-12-01T20:56:33.8394399Z 
2019-12-01T20:56:33.8394436Z 
2019-12-01T20:56:33.8394493Z 
2019-12-01T20:56:33.8394527Z 
2019-12-01T20:56:33.8394662Z  - #66346 (Replace .unwrap() with ? in std::os::unix::net)
2019-12-01T20:56:33.8394773Z  - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.)
2019-12-01T20:56:33.8394899Z  - #66822 (libunwind_panic: adjust miri panic hack)
2019-12-01T20:56:33.8395000Z  - #66827 (handle diverging functions forwarding their return place)
2019-12-01T20:56:33.8395106Z  - #66828 (Less minification)
2019-12-01T20:56:33.8395203Z  - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.)
2019-12-01T20:56:33.8395343Z  - #66874 (Miri engine: proper support for `Assert` MIR terminators)
2019-12-01T20:56:33.8395467Z  - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.)
2019-12-01T20:56:33.8395664Z AGENT_DISABLELOGPLUGIN_TESTFILEPUBLISHERPLUGIN=true
2019-12-01T20:56:33.8395766Z AGENT_DISABLELOGPLUGIN_TESTRESULTLOGPLUGIN=true
2019-12-01T20:56:33.8395862Z AGENT_HOMEDIRECTORY=C:\agents\2.160.1
2019-12-01T20:56:33.8395938Z AGENT_ID=513
---
2019-12-01T20:56:42.2684004Z   0     0    0     0    0     0      0      0 --:--:--  0:00:05 --:--:--     0
2019-12-01T20:56:42.2707830Z   0     0    0     0    0     0      0      0 --:--:--  0:00:05 --:--:--     0
2019-12-01T20:56:42.2707995Z curl: (22) The requested URL returned error: 502 
2019-12-01T20:56:42.2789893Z 
2019-12-01T20:56:42.2876519Z ##[error]Bash exited with code '22'.
2019-12-01T20:56:42.3113963Z ##[section]Starting: Checkout
2019-12-01T20:56:42.3225159Z ==============================================================================
2019-12-01T20:56:42.3225261Z Task         : Get sources
2019-12-01T20:56:42.3225601Z 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 @TimNN. (Feature Requests)

bors · 2019-12-01T20:58:33Z

💔 Test failed - checks-azure

Centril · 2019-12-01T21:12:11Z

@bors retry

bors · 2019-12-01T21:12:22Z

⌛ Testing commit 1569dab with merge 570e6dd...

@ghost

Rollup of 7 pull requests Successful merges: - #66346 (Replace .unwrap() with ? in std::os::unix::net) - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.) - #66822 (libunwind_panic: adjust miri panic hack) - #66827 (handle diverging functions forwarding their return place) - #66828 (Less minification) - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.) - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.) Failed merges: - #66874 (Miri engine: proper support for `Assert` MIR terminators) r? @ghost

rust-highfive · 2019-12-01T22:58:56Z

The job i686-apple 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.

2019-12-01T22:56:31.7582930Z test result: ok. 1 passed; 0 failed; 2 ignored; 0 measured; 0 filtered out
2019-12-01T22:56:31.7583460Z 
2019-12-01T22:56:31.7591100Z  finished in 4.045
2019-12-01T22:56:31.7592320Z [TIMING] DocTest { compiler: Compiler { stage: 2, host: "i686-apple-darwin" }, path: "src/doc/rustc", name: "rustc", is_ext_doc: false } -- 4.045
2019-12-01T22:56:32.5534600Z tmp.js:2
2019-12-01T22:56:32.5538260Z searchIndex["alloc"] = {"doc":"The Rust core allocation and collections library","i":[[0,"alloc","alloc","Memory allocation APIs",null,null],[3,"Excess","alloc::alloc","Represents the combination of a starting address and a…",null,null],[12,"0","","",0,null],[12,"1","","",0,null],[3,"Layout","","Layout of a block of memory.",null,null],[3,"LayoutErr","","The parameters given to `Layout::from_size_align` or some…",null,null],[3,"AllocErr","","The `AllocErr` error indicates an allocation failure that…",null,null],[3,"CannotReallocInPlace","","The `CannotReallocInPlace` error is used when…",null,null],[8,"GlobalAlloc","","A memory allocator that can be registered as the standard…",null,null],[10,"alloc","","Allocate memory as described by the given `layout`.",1,[[["self"],["layout"]]]],[10,"dealloc","","Deallocate the block of memory at the given `ptr` pointer…",1,[[["self"],["layout"]]]],[11,"alloc_zeroed","","Behaves like `alloc`, but also ensures that the contents…",1,[[["self"],["lay
2019-12-01T22:56:32.5538820Z 
2019-12-01T22:56:32.5539000Z ReferenceError: addSearchOptions is not defined
2019-12-01T22:56:32.5539090Z     at Object.<anonymous> (tmp.js:2:161112)
2019-12-01T22:56:32.5539200Z     at Module._compile (module.js:577:32)
2019-12-01T22:56:32.5540050Z     at loadContent (/Users/runner/runners/2.160.1/work/1/s/src/tools/rustdoc-js-std/tester.js:166:7)
2019-12-01T22:56:32.5540930Z     at main (/Users/runner/runners/2.160.1/work/1/s/src/tools/rustdoc-js-std/tester.js:264:19)
2019-12-01T22:56:32.5541730Z     at Object.<anonymous> (/Users/runner/runners/2.160.1/work/1/s/src/tools/rustdoc-js-std/tester.js:344:14)
2019-12-01T22:56:32.5541860Z     at Module._compile (module.js:577:32)
2019-12-01T22:56:32.5542000Z     at Object.Module._extensions..js (module.js:586:10)
2019-12-01T22:56:32.5542190Z     at Module.load (module.js:494:32)
2019-12-01T22:56:32.5542290Z     at tryModuleLoad (module.js:453:12)
2019-12-01T22:56:32.5542390Z     at Function.Module._load (module.js:445:3)
2019-12-01T22:56:32.5583130Z 
2019-12-01T22:56:32.5583130Z 
2019-12-01T22:56:32.5584280Z command did not execute successfully: "/usr/local/bin/node" "src/tools/rustdoc-js-std/tester.js" "i686-apple-darwin"
2019-12-01T22:56:32.5584570Z 
2019-12-01T22:56:32.5584610Z 
2019-12-01T22:56:32.5596610Z failed to run: /Users/runner/runners/2.160.1/work/1/s/build/bootstrap/debug/bootstrap test
2019-12-01T22:56:32.5596800Z Build completed unsuccessfully in 1:39:04
2019-12-01T22:56:32.5596800Z Build completed unsuccessfully in 1:39:04
2019-12-01T22:56:32.5668760Z == clock drift check ==
2019-12-01T22:56:32.5736430Z   local time: Sun Dec  1 22:56:32 UTC 2019
2019-12-01T22:56:32.6965820Z   network time: Sun, 01 Dec 2019 22:56:32 GMT
2019-12-01T22:56:32.6968830Z == end clock drift check ==
2019-12-01T22:56:32.7021510Z 
2019-12-01T22:56:32.7149370Z ##[error]Bash exited with code '1'.
2019-12-01T22:56:32.7198800Z ##[section]Starting: Checkout
2019-12-01T22:56:32.7202180Z ==============================================================================
2019-12-01T22:56:32.7202300Z Task         : Get sources
2019-12-01T22:56:32.7202410Z 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 @TimNN. (Feature Requests)

bors · 2019-12-01T22:59:03Z

💔 Test failed - checks-azure

linkmauve and others added 23 commits November 24, 2019 13:55

Replace .unwrap() with ? in std::os::unix::net

8f158bc

Return Ok(()) in docstrings in std::os::unix::net

3a2da71

Also fix the signature of main in std::sys::unix::ext

aff7942

Add missing semicolons and question marks

cdfb5cb

Add missing main() and return value

be18a22

handle diverging functions forwarding their return place

3e7a5a4

comment

2869aba

Add missing check

f2bee66

Remove minification on search-index.js file

27f4d6b

minify theme.js as well

baeea4e

rustc: hide HirId's fmt::Debug output from -Z span_free_formats.

7171060

rustc: move MIR source_scope_local_data's ClearCrossCrate to be aroun…

30a9978

…d elements.

rustc_mir: fix inliner to also copy over source_scope_local_data.

78d85fc

rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.

a9976d8

libunwind_panic: adjust miri panic hack

02b66a1

rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.

9034efe

Rollup merge of rust-lang#66346 - linkmauve:try-in-docstring, r=Dylan…

507a020

…-DPC Replace .unwrap() with ? in std::os::unix::net As people like to copy examples, this gives them good habits.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 1, 2019

Centril added rollup A PR which is a rollup and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 1, 2019

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 Dec 1, 2019

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 Dec 1, 2019

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 Dec 1, 2019

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 Dec 1, 2019

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 Dec 1, 2019

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 Dec 1, 2019

dtolnay mentioned this pull request Dec 2, 2019

Less minification #66828

Merged

Centril closed this Dec 2, 2019

Centril deleted the rollup-r7pljxh branch December 2, 2019 03:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #66924

Rollup of 7 pull requests #66924

Centril commented Dec 1, 2019

Centril commented Dec 1, 2019

bors commented Dec 1, 2019

bors commented Dec 1, 2019

bors commented Dec 1, 2019

RalfJung commented Dec 1, 2019

bors commented Dec 1, 2019

rust-highfive commented Dec 1, 2019

bors commented Dec 1, 2019

RalfJung commented Dec 1, 2019

bors commented Dec 1, 2019

rust-highfive commented Dec 1, 2019

bors commented Dec 1, 2019

Centril commented Dec 1, 2019

bors commented Dec 1, 2019

rust-highfive commented Dec 1, 2019

bors commented Dec 1, 2019

Rollup of 7 pull requests #66924

Rollup of 7 pull requests #66924

Conversation

Centril commented Dec 1, 2019

Centril commented Dec 1, 2019

bors commented Dec 1, 2019

bors commented Dec 1, 2019

bors commented Dec 1, 2019

RalfJung commented Dec 1, 2019

bors commented Dec 1, 2019

rust-highfive commented Dec 1, 2019

bors commented Dec 1, 2019

RalfJung commented Dec 1, 2019

bors commented Dec 1, 2019

rust-highfive commented Dec 1, 2019

bors commented Dec 1, 2019

Centril commented Dec 1, 2019

bors commented Dec 1, 2019

rust-highfive commented Dec 1, 2019

bors commented Dec 1, 2019