Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 7 pull requests #87714

Closed
wants to merge 14 commits into from
Closed

Rollup of 7 pull requests #87714

wants to merge 14 commits into from

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

LeSeulArtichaut and others added 14 commits July 30, 2021 19:05
@LeSeulArtichaut @FabianWolff
Properly find owner of closure in THIR unsafeck
1280423 
Co-authored-by: FabianWolff <fabian.wolff@alumni.ethz.ch>
@JohnTitor
Fix a parser ICE on invalid fn body
d2d8519
@mati865
Update stacker and psm crates
7954a76
@notriddle
Write docs for SyncOnceCell From and Default impl
e0172b3
@lnicola
⬆️ rust-analyzer
28382ff
@badboy
Add aarch64-apple-ios-sim as a possible target to the manifest
a43c464 
This should allow rustup and similar to actually make use of this new
target now.
@the8472
Add convenience for handling ipv4-mapped addresses by canonicalizing …
a5cdff3 
…them

This simplifies checking common properties in an address-family-agnostic
way since since rust-lang#86335 commits to not checking IPv4 semantics
of IPv4-mapped addresses in the `Ipv6Addr` property methods.
@JohnTitor
Rollup merge of rust-lang#87645 - LeSeulArtichaut:issue-87414, r=oli-obk
8bce8ef 
Properly find owner of closure in THIR unsafeck

Previously, when encountering a closure in a constant, the THIR unsafeck gets invoked on the owner of the constant instead of the constant itself, producing cycles.
Supersedes rust-lang#87492. `@FabianWolff` thanks for your work on that PR, I copied your test file and added you as a co-author.

Fixes rust-lang#87414.
r? `@oli-obk`
@JohnTitor
Rollup merge of rust-lang#87646 - JohnTitor:fix-parser-ice, r=oli-obk
f9070ca 
Fix a parser ICE on invalid `fn` body

Fixes rust-lang#87635
A better fix would add a check for `fn` body on `expected_one_of_not_found` but I haven't come up with a graceful way. Any idea?
r? `@oli-obk` `@estebank`
@JohnTitor
Rollup merge of rust-lang#87680 - mati865:stacker-psm-update, r=Mark-…
86e6478 
…Simulacrum

Update stacker and psm crates

Primarily to include rust-lang/stacker#54
@JohnTitor
Rollup merge of rust-lang#87685 - notriddle:lazy-from-docs, r=dtolnay
62a9659 
Write docs for SyncOnceCell From and Default impl

Part of rust-lang#51430
@JohnTitor
Rollup merge of rust-lang#87691 - lnicola:rust-analyzer-2021-08-02, r…
a8c1a70 
…=lnicola

⬆️ rust-analyzer
@JohnTitor
Rollup merge of rust-lang#87693 - badboy:enable-ios-sim-target-manife…
dfcff8a 
…st, r=Mark-Simulacrum

Add `aarch64-apple-ios-sim` as a possible target to the manifest

This should allow rustup and similar to actually make use of this new
target now.

r? `@Mark-Simulacrum`

Followup to rust-lang#85782
@JohnTitor
Rollup merge of rust-lang#87708 - the8472:canonical_v6, r=dtolnay
9cf4674 
Add convenience method for handling ipv4-mapped addresses by canonicalizing them

This simplifies checking common properties in an address-family-agnostic
way since rust-lang#86335 commits to not checking IPv4 semantics
of IPv4-mapped addresses in the `Ipv6Addr` property methods.
@rustbot rustbot added the rollup A PR which is a rollup label Aug 3, 2021
@JohnTitor
Copy link
Member Author

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Aug 3, 2021

📌 Commit 9cf4674 has been approved by JohnTitor

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 3, 2021
@bors
Copy link
Contributor

bors commented Aug 3, 2021

⌛ Testing commit 9cf4674 with merge 69319c7e16b1c124fd63027e1f5d7c189fa3247a...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-cargo failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
[RUSTC-TIMING] getrandom test:false 0.302
[RUSTC-TIMING] proc_macro2 test:false 1.149
[RUSTC-TIMING] getopts test:false 2.816
[RUSTC-TIMING] getrandom test:false 0.334
error: failed to run custom build command for `psm v0.1.14`
Caused by:
Caused by:
  process didn't exit successfully: `D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage0-rustc\release\build\psm-acef9b08e5c009b2\build-script-build` (exit code: 1)
  OPT_LEVEL = Some("3")
  TARGET = Some("x86_64-pc-windows-msvc")
  HOST = Some("x86_64-pc-windows-msvc")
  HOST = Some("x86_64-pc-windows-msvc")
  CC_x86_64-pc-windows-msvc = None
  CC_x86_64_pc_windows_msvc = None
  HOST_CC = None
  CC = Some("D:/a/rust/rust/citools/clang-rust/bin/clang-cl.exe")
  CFLAGS_x86_64-pc-windows-msvc = None
  CFLAGS_x86_64_pc_windows_msvc = None
  HOST_CFLAGS = None
  CRATE_CC_NO_DEFAULTS = None
  CRATE_CC_NO_DEFAULTS = None
  CARGO_CFG_TARGET_FEATURE = Some("crt-static,fxsr,sse,sse2")
  DEBUG = Some("false")
  cargo:rustc-cfg=asm
  running: "clang" "-O3" "-ffunction-sections" "-fdata-sections" "--target=x86_64-pc-windows-msvc" "-Wall" "-Wextra" "-xassembler-with-cpp" "-DCFG_TARGET_OS_windows" "-DCFG_TARGET_ARCH_x86_64" "-DCFG_TARGET_ENV_msvc" "-o" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0-rustc\\x86_64-pc-windows-msvc\\release\\build\\psm-a238117c39c7b175\\out\\src/arch/x86_64_windows_gnu.o" "-c" "src/arch/x86_64_windows_gnu.s"
  --- stderr



  error occurred: Failed to find tool. Is `clang` installed? (see https://github.com/alexcrichton/cc-rs#compile-time-requirements for help)

warning: build failed, waiting for other jobs to finish...
[RUSTC-TIMING] ryu test:false 0.504
[RUSTC-TIMING] typenum test:false 1.066

@bors
Copy link
Contributor

bors commented Aug 3, 2021

💔 Test failed - checks-actions

@bors 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 Aug 3, 2021
@JohnTitor JohnTitor mentioned this pull request Aug 3, 2021
Merged
@JohnTitor JohnTitor closed this Aug 3, 2021
@JohnTitor JohnTitor deleted the rollup-girklgo branch August 3, 2021 05:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@JohnTitor @bors @rust-log-analyzer @rustbot @LeSeulArtichaut @mati865 @notriddle @lnicola @badboy @the8472