Rollup of 12 pull requests #74466

Manishearth · 2020-07-18T00:31:40Z

Successful merges:

Add lazy initialization primitives to std #72414 ( Add lazy initialization primitives to std)
Compare tagged/niche-filling layout and pick the best one #74069 (Compare tagged/niche-filling layout and pick the best one)
compiletest: Rewrite extract_*_version functions #74237 (compiletest: Rewrite extract_*_version functions)
ci: Set shell: bash as a default, remove duplicates #74418 (ci: Set shell: bash as a default, remove duplicates)
bootstrap.py: patch RPATH on NixOS to handle the new zlib dependency. #74441 (bootstrap.py: patch RPATH on NixOS to handle the new zlib dependency.)
Add regression test for #69414 #74444 (Add regression test for ICE -Zsave-analysis: const-param-type-depends-on-type-param-ungated.rs #69414)
improper_ctypes_definitions: allow Box #74448 (improper_ctypes_definitions: allow Box)
Test codegen of compare_exchange operations #74449 (Test codegen of compare_exchange operations)
Fix Safety docs for from_raw_parts_mut #74450 (Fix Safety docs for from_raw_parts_mut)
Use intra-doc links in str and BTreeSet #74453 (Use intra-doc links in str and BTreeSet)
rustbuild: drop tool::should_install #74457 (rustbuild: drop tool::should_install)
Use pathdiff crate #74464 (Fix for Use pathdiff crate for path_relative_from #67108 )

Failed merges:

This commit refactors the initial implementation to fit into std and makes some other changes: - use MaybeUninit internally in SyncOnceCell - correctly impl Drop for lazy::Once - port Lazy::take from once_cell from: matklad/once_cell#100 Co-Authored-By: Paul Dicker <pitdicker@users.noreply.github.com>

A follow-up to rust-lang#74406, this commit merely removes the `shell: bash` lines where they are explicitly added in favor of setting defaults for *all* "run" steps. Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>

This will render the src/ci/exec-with-shell.py script more or less useless, but we're going to replace that by just using the system bash instead. Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>

Also, promote defaults.run.shell from inside only the primary jobs to the top level. The src/ci/exec-with-shell.py wrapper script was formerly used to change out the shell mid-job by intercepting a CI_OVERRIDE_SHELL environment variable. Now, instead, we just set `bash` as the global default across all jobs, and we also delete the exec-with-shell.py script. Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>

Closes rust-lang#69414 (no longer ICEs after rust-lang#74159)

… for enums.

This makes extract_lldb_version has the same version type like extract_gdb_version. This is technically a breaking change for rustc-dev users. But note that rustc-dev is a nightly component.

This commit stops linting against `Box` in `extern "C" fn`s for the `improper_ctypes_definitions` lint - boxes are documented to be FFI-safe. Signed-off-by: David Wood <david@davidtw.co>

Always install when the build succeeds Fixes rust-lang#74431 Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

@alexcrichton

…ns-boxes, r=davidtwco improper_ctypes_definitions: allow `Box` Addresses rust-lang#72700 (comment). This PR stops linting against `Box` in `extern "C" fn`s for the `improper_ctypes_definitions` lint - boxes are documented to be FFI-safe. cc @alexcrichton @CryZe

Test codegen of compare_exchange operations Add a codegen test for compare_exchange to verify that rustc emits expected LLVM IR.

Fix `Safety` docs for `from_raw_parts_mut` This aligns the wording more with the documentation of e.g. `drop_in_place`, `replace`, `swap` and `swap_nonoverlapping` from `core::ptr`. Also if the pointer were really only valid for writes, it would be trivial to introduce UB from safe code, after calling `core::slice::from_raw_parts_mut`.

Use intra-doc links in `str` and `BTreeSet` Fixes rust-lang#32129, fixes rust-lang#32130 A _slight_ degradation in quality is that the `#method.foo` links would previously link to the same page on `String`'s documentation, and now they will navigate to `str`. Not a big deal IMO, and we can also try to improve that.

rustbuild: drop tool::should_install Always install when the build succeeds Fixes rust-lang#74431

…r=Manishearth Fix for rust-lang#67108 I wanted to tackle a simple issue, and stumbled upon rust-lang#67108: this pr removes the function which was exported to the external crate as required in the todo/issue. I've tested it with: ``` ./x.py build --stage 1 --keep-stage 1 src/librustc_codegen_ssa ``` And it looks like it's compiling

Manishearth · 2020-07-18T00:32:18Z

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

bors · 2020-07-18T00:32:19Z

📌 Commit 4076f9a has been approved by Manishearth

bors · 2020-07-18T00:32:20Z

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

bors · 2020-07-18T00:32:37Z

⌛ Testing commit 4076f9a with merge 20a450b939c0ca5a0bf1d2d653fe4000703d15f7...

bors · 2020-07-18T00:37:43Z

💔 Test failed - checks-actions

Manishearth · 2020-07-18T00:40:23Z

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

bors · 2020-07-18T00:40:24Z

📌 Commit fa885e8 has been approved by Manishearth

bors · 2020-07-18T00:40:37Z

⌛ Testing commit fa885e8 with merge 141cf9d64cfc13829d1355e0ed9280bfa903a5e7...

bors · 2020-07-18T01:06:30Z

💔 Test failed - checks-actions

Manishearth · 2020-07-18T01:07:24Z

2020-07-18T01:04:45.6911067Z 
2020-07-18T01:04:45.6911563Z Breakpoint 1, pretty_std_collections::main::h1ef1d7ce5967b6a7 () at /checkout/obj/build/tmp/distcheck/src/test/debuginfo/pretty-std-collections.rs:140
2020-07-18T01:04:45.6911702Z 140	    zzz(); // #break
2020-07-18T01:04:45.6911819Z $1 = {map = {root = {<No data fields>}, length = 15}}
2020-07-18T01:04:45.6911942Z $2 = {map = {root = {<No data fields>}, length = 0}}
2020-07-18T01:04:45.6912060Z $3 = {root = {<No data fields>}, length = 15}
2020-07-18T01:04:45.6912175Z $4 = {root = {<No data fields>}, length = 0}
2020-07-18T01:04:45.6912289Z $5 = {root = {<No data fields>}, length = 2}
2020-07-18T01:04:45.6912402Z $6 = {root = {<No data fields>}, length = 15}
2020-07-18T01:04:45.6912622Z $7 = {tail = 0, head = 3, buf = {ptr = {pointer = 0x5555557a15e0, _marker = {<No data fields>}}, cap = 8, alloc = {<No data fields>}}}
2020-07-18T01:04:45.6912805Z $8 = {tail = 1, head = 0, buf = {ptr = {pointer = 0x5555557a1610, _marker = {<No data fields>}}, cap = 8, alloc = {<No data fields>}}}
2020-07-18T01:04:45.6912981Z $9 = {base = {hash_builder = {__0 = {<No data fields>}}, table = {bucket_mask = 7, ctrl = {pointer = 0x5555557a16e0 "\377"}, data = {pointer = 0x5555557a16f8}, growth_left = 3, items = 4, marker = {<No data fields>}}}}
2020-07-18T01:04:45.6913168Z $10 = {map = {base = {hash_builder = {__0 = {<No data fields>}}, table = {bucket_mask = 7, ctrl = {pointer = 0x5555557a1680 "\377"}, data = {pointer = 0x5555557a1698}, growth_left = 3, items = 4, marker = {<No data fields>}}}}}
2020-07-18T01:04:45.6913310Z A debugging session is active.
2020-07-18T01:04:45.6913380Z 
2020-07-18T01:04:45.6913483Z 	Inferior 1 [process 36447] will be killed.
2020-07-18T01:04:45.6913561Z 
2020-07-18T01:04:45.6913668Z Quit anyway? (y or n) [answered Y; input not from terminal]
2020-07-18T01:04:45.6913728Z 
2020-07-18T01:04:45.6913985Z ------------------------------------------
2020-07-18T01:04:45.6914095Z stderr:
2020-07-18T01:04:45.6914313Z ------------------------------------------
2020-07-18T01:04:45.6914389Z 
2020-07-18T01:04:45.6914604Z ------------------------------------------
2020-07-18T01:04:45.6914675Z 
2020-07-18T01:04:45.6914719Z 
2020-07-18T01:04:45.6914777Z 
2020-07-18T01:04:45.6914873Z failures:
2020-07-18T01:04:45.6915103Z     [debuginfo-gdb] debuginfo/function-call.rs
2020-07-18T01:04:45.6915338Z     [debuginfo-gdb] debuginfo/pretty-huge-vec.rs
2020-07-18T01:04:45.6915581Z     [debuginfo-gdb] debuginfo/pretty-std-collections.rs
2020-07-18T01:04:45.6915829Z     [debuginfo-gdb] debuginfo/pretty-uninitialized-vec.rs
2020-07-18T01:04:45.6915909Z 
2020-07-18T01:04:45.6916176Z test result: �[31mFAILED�(B�[m. 71 passed; 4 failed; 41 ignored; 0 measured; 0 filtered out
2020-07-18T01:04:45.6916323Z

matklad and others added 30 commits July 17, 2020 07:23

First cut of std::lazy module

cac1768

use set() in SyncOnceCell::from

d1263f5

remove inlined lazy::Waiter in favor of sync::Once

d101794

appease tidy

1f1cda6

ci: Set shell: bash as a default, remove duplicates

ab23a2a

A follow-up to rust-lang#74406, this commit merely removes the `shell: bash` lines where they are explicitly added in favor of setting defaults for *all* "run" steps. Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>

Test codegen of compare_exchange operations

b26ecd2

include changes to Cargo.lock

48844fe

bootstrap.py: guard against GC in NixOS patching support.

d866160

bootstrap.py: patch RPATH on NixOS to handle the new zlib dependency.

b5076fb

ci: Stop setting CI_OVERRIDE_SHELL environment variable

49f5078

This will render the src/ci/exec-with-shell.py script more or less useless, but we're going to replace that by just using the system bash instead. Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>

Add regression test for rust-lang#69414

f7979d3

Closes rust-lang#69414 (no longer ICEs after rust-lang#74159)

[experiment] ty/layout: compute both niche-filling and tagged layouts…

b0a7fbd

… for enums.

compare tagged/niche-filling layout and pick the best one

2e431c6

document test changes

3924672

compiletest: Rewrite extract_lldb_version function

7f4752b

This makes extract_lldb_version has the same version type like extract_gdb_version. This is technically a breaking change for rustc-dev users. But note that rustc-dev is a nightly component.

compiletest: Rewrite extract_gdb_version function

629f399

Fix panic as passing wrong format to extract_gdb_version

835fcb1

Use Option::as_deref

bf06e8e

Extract closure to function

0306ffb

Use subslice pattern

47a0f69

improper_ctypes_definitions: allow Box

95df802

This commit stops linting against `Box` in `extern "C" fn`s for the `improper_ctypes_definitions` lint - boxes are documented to be FFI-safe. Signed-off-by: David Wood <david@davidtw.co>

Fix Safety docs for from_raw_parts_mut

4127ed1

rustbuild: drop tool::should_install

4adb13c

Always install when the build succeeds Fixes rust-lang#74431 Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

Use intra-doc links in BTreeSet docs

91314e2

Use intra doc links in std::str

748634e

fixes rust-lang#67108 by using the external crate

4b6a027

Allows pathdiff package

5702ce8

link once_cell feature to rust-lang#74465

fe63905

Manishearth added 6 commits July 17, 2020 17:31

Rollup merge of rust-lang#74449 - tmiasko:cmpxchg-test, r=nikomatsakis

96f03d0

Test codegen of compare_exchange operations Add a codegen test for compare_exchange to verify that rustc emits expected LLVM IR.

Rollup merge of rust-lang#74457 - Keruspe:install, r=Mark-Simulacrum

1f74e98

rustbuild: drop tool::should_install Always install when the build succeeds Fixes rust-lang#74431

rustbot added the rollup A PR which is a rollup label Jul 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 Jul 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 Jul 18, 2020

Run fmt

fa885e8

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 Jul 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 Jul 18, 2020

Manishearth mentioned this pull request Jul 18, 2020

compiletest: Rewrite extract_*_version functions #74237

Merged

Manishearth closed this Jul 18, 2020

Manishearth deleted the rollup-mbjf9zq branch July 18, 2020 01:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 12 pull requests #74466

Rollup of 12 pull requests #74466

Manishearth commented Jul 18, 2020

Manishearth commented Jul 18, 2020

bors commented Jul 18, 2020

bors commented Jul 18, 2020

bors commented Jul 18, 2020

bors commented Jul 18, 2020

Manishearth commented Jul 18, 2020

bors commented Jul 18, 2020

bors commented Jul 18, 2020

bors commented Jul 18, 2020

Manishearth commented Jul 18, 2020

Rollup of 12 pull requests #74466

Rollup of 12 pull requests #74466

Conversation

Manishearth commented Jul 18, 2020

Manishearth commented Jul 18, 2020

bors commented Jul 18, 2020

bors commented Jul 18, 2020

bors commented Jul 18, 2020

bors commented Jul 18, 2020

Manishearth commented Jul 18, 2020

bors commented Jul 18, 2020

bors commented Jul 18, 2020

bors commented Jul 18, 2020

Manishearth commented Jul 18, 2020