Rollup of 5 pull requests #65604

Centril · 2019-10-19T17:49:24Z

Successful merges:

Inline ptr::null(_mut) even in debug builds #64996 (Inline ptr::null(_mut) even in debug builds)
Avoid realloc in CString::new #65551 (Avoid realloc in CString::new)
add test for calling non-const fn #65593 (add test for calling non-const fn)
move parse_cfgspecs to rustc_interface #65595 (move parse_cfgspecs to rustc_interface)
Remove unneeded ref from docs #65600 (Remove unneeded ref from docs)

Failed merges:

Will reduce confusion like in https://users.rust-lang.org/t/help-understanding-the-ref-t-syntax/33779 since match ergonomics means you (almost) never have to say `ref` anymore!

Inline `ptr::null(_mut)` even in debug builds I think we should treat `ptr::null(_mut)` as a constant. As It may help reduce code size in debug build. See godbolt link: https://godbolt.org/z/b9YMtD

Avoid realloc in `CString::new` If `&[u8]` or `&str` is given, `CString::new` allocates a new `Vec` with the exact capacity, and then `CString::from_vec_unchecked` calls `.reserve_exact(1)` for nul byte. This PR avoids the reallocation by allocationg `len + 1` bytes beforehand. In microbenchmark this PR speeds up `CString::new(&[u8])` by 30%.

@oli-obk

add test for calling non-const fn The good news is that there is an error. But I expected to see [this error](https://github.com/rust-lang/rust/blob/9578272d681c8691ca2ff3f5c4230b491bc1c694/src/librustc_mir/const_eval.rs#L346) surface. @oli-obk any idea why that message is not shown anywhere? r? @oli-obk

@Mark-Simulacrum

move `parse_cfgspecs` to `rustc_interface` Part of rust-lang#65324. r? @Mark-Simulacrum

Remove unneeded `ref` from docs Will reduce confusion like in https://users.rust-lang.org/t/help-understanding-the-ref-t-syntax/33779 since match ergonomics means you (almost) never have to say `ref` anymore! There might be more like this, but I don't have a checkout on my computer right this second and I'm on slow wifi and GitHub search isn't powerful enough and that's my story.

Centril · 2019-10-19T17:49:38Z

@bors r+ p=5 rollup=never

bors · 2019-10-19T17:49:39Z

📌 Commit 192f6dc has been approved by Centril

bors · 2019-10-19T21:55:55Z

⌛ Testing commit 192f6dc with merge fc18016dba01d62e7c5f611a5839f85cf2162196...

rust-highfive · 2019-10-19T22:01:13Z

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-10-19T21:57:12.8404834Z do so (now or later) by using -b with the checkout command again. Example:
2019-10-19T21:57:12.8405310Z 
2019-10-19T21:57:12.8405549Z   git checkout -b <new-branch-name>
2019-10-19T21:57:12.8405807Z 
2019-10-19T21:57:12.8406133Z HEAD is now at fc18016db Auto merge of #65604 - Centril:rollup-bw7ur3d, r=Centril
2019-10-19T21:57:12.8830576Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-10-19T21:57:12.8944763Z ==============================================================================
2019-10-19T21:57:12.8944863Z Task         : Bash
2019-10-19T21:57:12.8944961Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-19T21:57:45.3261911Z Chocolatey v0.10.15
2019-10-19T21:58:12.0000867Z Installing the following packages:
2019-10-19T21:58:12.0008657Z msys2
2019-10-19T21:58:12.0014571Z By installing you accept licenses for the packages.
2019-10-19T21:58:54.4755375Z Error retrieving packages from source 'https://chocolatey.org/api/v2/':
2019-10-19T21:58:54.4756272Z  Unable to connect to the remote server
2019-10-19T21:58:54.4766211Z msys2 not installed. The package was not found with the source(s) listed.
2019-10-19T21:58:54.4766696Z  Source(s): 'https://chocolatey.org/api/v2/'
2019-10-19T21:58:54.4767583Z  NOTE: When you specify explicit sources, it overrides default sources.
2019-10-19T21:58:54.4767987Z If the package version is a prerelease and you didn't specify `--pre`,
2019-10-19T21:58:54.4768749Z Please see https://chocolatey.org/docs/troubleshooting for more 
2019-10-19T21:58:54.4769091Z  assistance.
2019-10-19T21:58:54.4885893Z 
2019-10-19T21:58:54.4886508Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-10-19T21:58:54.4886508Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-10-19T21:58:54.4886910Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-10-19T21:58:54.4891429Z 
2019-10-19T21:58:54.4897441Z Failures
2019-10-19T21:58:54.4905867Z  - msys2 - msys2 not installed. The package was not found with the source(s) listed.
2019-10-19T21:58:54.4906363Z  Source(s): 'https://chocolatey.org/api/v2/'
2019-10-19T21:58:54.4906758Z  NOTE: When you specify explicit sources, it overrides default sources.
2019-10-19T21:58:54.4907116Z If the package version is a prerelease and you didn't specify `--pre`,
2019-10-19T21:58:54.4907974Z Please see https://chocolatey.org/docs/troubleshooting for more 
2019-10-19T21:58:54.4908302Z  assistance.
2019-10-19T21:58:54.8408312Z 
2019-10-19T21:58:54.8408312Z 
2019-10-19T21:58:54.8498656Z ##[error]Bash exited with code '1'.
2019-10-19T21:58:54.8712617Z ##[section]Starting: Upload CPU usage statistics
2019-10-19T21:58:54.8834948Z ==============================================================================
2019-10-19T21:58:54.8835204Z Task         : Bash
2019-10-19T21:58:54.8835294Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-19T21:58:55.2086169Z ========================== Starting Command Output ===========================
2019-10-19T21:58:55.2092693Z [command]"C:\Program Files\Git\bin\bash.exe" --noprofile --norc /d/a/_temp/00823e2b-916e-4347-848b-cfde4f0eb1bc.sh
2019-10-19T21:58:55.2585905Z /d/a/_temp/00823e2b-916e-4347-848b-cfde4f0eb1bc.sh: line 1: aws: command not found
2019-10-19T21:58:55.2620385Z 
2019-10-19T21:58:55.2639460Z ##[error]Bash exited with code '127'.
2019-10-19T21:58:55.2718194Z ##[section]Starting: Checkout
2019-10-19T21:58:55.2833603Z ==============================================================================
2019-10-19T21:58:55.2833876Z Task         : Get sources
2019-10-19T21:58:55.2833978Z 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-10-19T22:01:25Z

💔 Test failed - checks-azure

tesuji and others added 11 commits October 2, 2019 12:22

Inline ptr::null(_mut) even in debug builds

d0862ec

Avoid realloc in CString::new

23cb1d5

move parse_cfgspecs to rustc_interface

d945f98

add test for calling non-const fn

7f1ce45

show the proper diagnostics

38fd74f

Remove unneeded ref from docs

4ea1a19

Will reduce confusion like in https://users.rust-lang.org/t/help-understanding-the-ref-t-syntax/33779 since match ergonomics means you (almost) never have to say `ref` anymore!

Rollup merge of rust-lang#64996 - lzutao:inline-ptr-null, r=oli-obk

4d96185

Inline `ptr::null(_mut)` even in debug builds I think we should treat `ptr::null(_mut)` as a constant. As It may help reduce code size in debug build. See godbolt link: https://godbolt.org/z/b9YMtD

Rollup merge of rust-lang#65595 - Centril:cfgspecs, r=Mark-Simulacrum

eba24f0

move `parse_cfgspecs` to `rustc_interface` Part of rust-lang#65324. r? @Mark-Simulacrum

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 19, 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 Oct 19, 2019

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

Centril closed this Oct 20, 2019

Centril deleted the rollup-bw7ur3d branch October 20, 2019 10:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #65604

Rollup of 5 pull requests #65604

Centril commented Oct 19, 2019

Centril commented Oct 19, 2019

bors commented Oct 19, 2019

bors commented Oct 19, 2019

rust-highfive commented Oct 19, 2019

bors commented Oct 19, 2019

Rollup of 5 pull requests #65604

Rollup of 5 pull requests #65604

Conversation

Centril commented Oct 19, 2019

Centril commented Oct 19, 2019

bors commented Oct 19, 2019

bors commented Oct 19, 2019

rust-highfive commented Oct 19, 2019

bors commented Oct 19, 2019