Rollup of 5 pull requests by Noratrieb · Pull Request #110054 · rust-lang/rust

Noratrieb · 2023-04-07T14:44:42Z

Successful merges:

More descriptive error when qself path doesnt have a trait on the RHS of as #109788 (More descriptive error when qself path doesnt have a trait on the RHS of as)
llvm: replace some deprecated functions, add fixmes #109862 (llvm: replace some deprecated functions, add fixmes)
Yeet owning_ref #109971 (Yeet owning_ref)
chore(tcp): change a hardcoded port number in a doctest to port var #109995 (chore(tcp): change a hardcoded port number in a doctest to port var)
rustdoc: add test and bug fix for theme defaults #110037 (rustdoc: add test and bug fix for theme defaults)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…ugLocation2

… LLVMValueRef, some that accept LLVMMetadataRef, and replacing one with another not always possible without explicit convertion

… LLVMRustMetadataTypeInContext with LLVMMetadataTypeInContext

LLVMRustBuildCleanupPad -> LLVMBuildCleanupPad LLVMRustBuildCleanupRet -> LLVMBuildCleanupRet LLVMRustBuildCatchPad -> LLVMBuildCatchPad LLVMRustBuildCatchRet -> LLVMBuildCatchRet LLVMRustBuildCatchSwitch -> LLVMBuildCatchSwitch

LLVMRustBuildIntCast -> LLVMBuildIntCast2 LLVMRustAddHandler -> LLVMAddHandler

Turns out - `owning_ref` is unsound due to `Box` aliasing stuff - `rustc` doesn't need 99% of the `owning_ref` API - `rustc` can use a far simpler abstraction that is `OwnedSlice`

The `listen_on` function in the example has a `port` option but doesn't use it

…n-trait, r=petrochenkov More descriptive error when qself path doesnt have a trait on the RHS of `as` `<Ty as Enum>::Assoc` should report that `Enum` is a trait. Main question is whether to eagerly report the error, or raise it with `return Err(..)` -- i'll note that in an inline comment though. cc ``@GuillaumeGomez`` who said this came up at a Paris Rust meetup. r? ``@petrochenkov``

llvm: replace some deprecated functions, add fixmes Replace some deprecated llvm functions, add FIXME's (for simpler future work), replace some rust custom functions with llvm ones.

…strieb Yeet `owning_ref` Based on the discussions from rust-lang#109948 This replaces `owning_ref` with a far simpler & safer abstraction. Fixes rust-lang#109974

…ed-port-num-in-listen-on-fn, r=jyn514 chore(tcp): change a hardcoded port number in a doctest to `port` var The `listen_on` function in the example has a `port` option but doesn't use it

… r=GuillaumeGomez rustdoc: add test and bug fix for theme defaults Part of rust-lang#66181

Noratrieb · 2023-04-07T14:45:07Z

@bors r+ rollup=never p=5

bors · 2023-04-07T14:45:10Z

📌 Commit b8c372f has been approved by Nilstrieb

It is now in the queue for this repository.

bors · 2023-04-07T16:39:44Z

⌛ Testing commit b8c372f with merge c30a0067977cb2f48ba4f650df25811f581fdd34...

bors · 2023-04-07T17:06:19Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-04-07T17:33:11Z

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

Click to see the possible cause of the failure (guessed by this bot)

   Compiling log v0.4.14
error: failed to run custom build command for `ahash v0.7.4`

Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-rustc\release\build\ahash-cb08642371aea0a9\build-script-build` (exit code: 0xc0000409, STATUS_STACK_BUFFER_OVERRUN)
  --- stdout
  cargo:rerun-if-changed=build.rs
  cargo:rustc-cfg=feature="runtime-rng"
  cargo:rustc-cfg=feature="folded_multiply"
error: failed to run custom build command for `proc-macro-hack v0.5.19`

Caused by:
Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-rustc\release\build\proc-macro-hack-a2f4a8c7be510b92\build-script-build` (exit code: 0xc0000409, STATUS_STACK_BUFFER_OVERRUN)
[RUSTC-TIMING] build_script_build test:false 0.536
error: failed to run custom build command for `syn v1.0.102`

Caused by:
Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-rustc\release\build\syn-5b24b8bfa5cdb993\build-script-build` (exit code: 0xc0000409, STATUS_STACK_BUFFER_OVERRUN)

Caused by:
Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-rustc\release\build\quote-b07cc84d813763f2\build-script-build` (exit code: 0xc0000409, STATUS_STACK_BUFFER_OVERRUN)
  --- stdout
  cargo:rerun-if-changed=build.rs
error: failed to run custom build command for `winapi v0.3.9`
Caused by:
Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-rustc\release\build\winapi-c7da96fbeff9efcc\build-script-build` (exit code: 0xc0000409, STATUS_STACK_BUFFER_OVERRUN)
  --- stdout
  cargo:rerun-if-changed=build.rs
  cargo:rerun-if-env-changed=WINAPI_NO_BUNDLED_LIBRARIES
  cargo:rerun-if-env-changed=WINAPI_STATIC_NOBUNDLE
  cargo:rustc-cfg=feature="vcruntime"
  cargo:rustc-cfg=feature="wtypesbase"
  cargo:rustc-cfg=feature="ntdef"
  cargo:rustc-cfg=feature="reason"
  cargo:rustc-cfg=feature="rpcndr"
  cargo:rustc-cfg=feature="cfg"
  cargo:rustc-cfg=feature="cfgmgr32"
  cargo:rustc-cfg=feature="basetsd"
  cargo:rustc-cfg=feature="devpropdef"
  cargo:rustc-cfg=feature="vadefs"
  cargo:rustc-cfg=feature="windef"
  cargo:rustc-cfg=feature="guiddef"
  cargo:rustc-cfg=feature="winreg"
  cargo:rustc-cfg=feature="wingdi"
  cargo:rustc-cfg=feature="excpt"
  cargo:rustc-cfg=feature="ktmtypes"
  cargo:rustc-cfg=feature="wincontypes"
  cargo:rustc-link-lib=dylib=advapi32
  cargo:rustc-link-lib=dylib=cfgmgr32
  cargo:rustc-link-lib=dylib=gdi32
  cargo:rustc-link-lib=dylib=kernel32
  cargo:rustc-link-lib=dylib=msimg32
  cargo:rustc-link-lib=dylib=opengl32
  cargo:rustc-link-lib=dylib=user32
  cargo:rustc-link-lib=dylib=winspool

Caused by:
Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-rustc\release\build\proc-macro2-77eca587f5d44bdd\build-script-build` (exit code: 0xc0000409, STATUS_STACK_BUFFER_OVERRUN)
  --- stdout
  cargo:rerun-if-changed=build.rs

Noratrieb · 2023-04-07T18:11:26Z

builds scripts having stack buffer overruns.. I can't explain this with anything here
@bors retry

bors · 2023-04-07T19:21:44Z

⌛ Testing commit b8c372f with merge a59feec4aa0a29f5711c3e0d93f686d145c7b867...

bors · 2023-04-07T19:45:31Z

💔 Test failed - checks-actions

Noratrieb · 2023-04-07T19:50:08Z

so it's not spurious, great.

rust-log-analyzer · 2023-04-07T20:36:54Z

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

Click to see the possible cause of the failure (guessed by this bot)

[RUSTC-TIMING] smallvec test:false 0.798
error: failed to run custom build command for `proc-macro-hack v0.5.19`

Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-rustc\release\build\proc-macro-hack-a2f4a8c7be510b92\build-script-build` (exit code: 0xc0000409, STATUS_STACK_BUFFER_OVERRUN)
[RUSTC-TIMING] build_script_build test:false 0.934
error: failed to run custom build command for `proc-macro2 v1.0.53`

Caused by:
Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-rustc\release\build\proc-macro2-77eca587f5d44bdd\build-script-build` (exit code: 0xc0000409, STATUS_STACK_BUFFER_OVERRUN)
  --- stdout
  cargo:rerun-if-changed=build.rs

Caused by:
Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-rustc\release\build\quote-b07cc84d813763f2\build-script-build` (exit code: 0xc0000409, STATUS_STACK_BUFFER_OVERRUN)
  --- stdout
  cargo:rerun-if-changed=build.rs
error: failed to run custom build command for `winapi v0.3.9`
Caused by:
Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-rustc\release\build\winapi-c7da96fbeff9efcc\build-script-build` (exit code: 0xc0000409, STATUS_STACK_BUFFER_OVERRUN)
  --- stdout
  cargo:rerun-if-changed=build.rs
  cargo:rerun-if-env-changed=WINAPI_NO_BUNDLED_LIBRARIES
  cargo:rerun-if-env-changed=WINAPI_STATIC_NOBUNDLE
  cargo:rustc-cfg=feature="cfg"
  cargo:rustc-cfg=feature="windef"
  cargo:rustc-cfg=feature="reason"
  cargo:rustc-cfg=feature="excpt"
  cargo:rustc-cfg=feature="cfgmgr32"
  cargo:rustc-cfg=feature="devpropdef"
  cargo:rustc-cfg=feature="ktmtypes"
  cargo:rustc-cfg=feature="wincontypes"
  cargo:rustc-cfg=feature="wingdi"
  cargo:rustc-cfg=feature="basetsd"
  cargo:rustc-cfg=feature="guiddef"
  cargo:rustc-cfg=feature="wtypesbase"
  cargo:rustc-cfg=feature="winreg"
  cargo:rustc-cfg=feature="ntdef"
  cargo:rustc-cfg=feature="vcruntime"
  cargo:rustc-cfg=feature="vadefs"
  cargo:rustc-cfg=feature="rpcndr"
  cargo:rustc-link-lib=dylib=advapi32
  cargo:rustc-link-lib=dylib=cfgmgr32
  cargo:rustc-link-lib=dylib=gdi32
  cargo:rustc-link-lib=dylib=kernel32
  cargo:rustc-link-lib=dylib=msimg32
  cargo:rustc-link-lib=dylib=opengl32
  cargo:rustc-link-lib=dylib=user32
  cargo:rustc-link-lib=dylib=winspool
error: failed to run custom build command for `syn v1.0.102`
Caused by:
Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-rustc\release\build\syn-5b24b8bfa5cdb993\build-script-build` (exit code: 0xc0000409, STATUS_STACK_BUFFER_OVERRUN)

klensy and others added 24 commits April 4, 2023 15:12

replace deprecated LLVMSetCurrentDebugLocation with LLVMSetCurrentDeb…

0b5f9ac

…ugLocation2

add bunch of fixmes: currently there exist some functions that accept…

7d6181e

… LLVMValueRef, some that accept LLVMMetadataRef, and replacing one with another not always possible without explicit convertion

replace LLVMRustMetadataAsValue with LLVMMetadataAsValue

c53a9fa

replace LLVMRustAppendModuleInlineAsm with LLVMAppendModuleInlineAsm,…

076116b

… LLVMRustMetadataTypeInContext with LLVMMetadataTypeInContext

Use existing llvm methods, instead of rust wrappers for:

cc77ae0

LLVMRustBuildCleanupPad -> LLVMBuildCleanupPad LLVMRustBuildCleanupRet -> LLVMBuildCleanupRet LLVMRustBuildCatchPad -> LLVMBuildCatchPad LLVMRustBuildCatchRet -> LLVMBuildCatchRet LLVMRustBuildCatchSwitch -> LLVMBuildCatchSwitch

replace

f41e711

LLVMRustBuildIntCast -> LLVMBuildIntCast2 LLVMRustAddHandler -> LLVMAddHandler

review

c0bc001

Implement OwnedSlice

689beda

Use OwnedSlice instead of owning_ref

c0ceefd

Yeet owning_ref

d705654

Turns out - `owning_ref` is unsound due to `Box` aliasing stuff - `rustc` doesn't need 99% of the `owning_ref` API - `rustc` can use a far simpler abstraction that is `OwnedSlice`

Fix typo

9405f58

Add context to phantom comment

504c4c4

chore(tcp): change the hardcoded port number to port var

502cb6f

The `listen_on` function in the example has a `port` option but doesn't use it

Use FnOnce for slice_owned instead of Fn

b6970d0

Add basic tests for OwnedSlice

e0e39ca

Support multithreaded mode in OwnedSlice tests

2733c29

rustdoc: add test and bug fix for theme defaults

5cad51c

Use smart-resolve when checking for trait in RHS of UFCS

d5b1ef1

Mark OwnedSlice::{deref, borrow} as #[inline]

fbe0591

Rollup merge of rust-lang#109862 - klensy:llvm-dd, r=nikic

8b8994c

llvm: replace some deprecated functions, add fixmes Replace some deprecated llvm functions, add FIXME's (for simpler future work), replace some rust custom functions with llvm ones.

Rollup merge of rust-lang#109971 - WaffleLapkin:yeet_ownership, r=Nil…

fe98885

…strieb Yeet `owning_ref` Based on the discussions from rust-lang#109948 This replaces `owning_ref` with a far simpler & safer abstraction. Fixes rust-lang#109974

Rollup merge of rust-lang#109995 - enkron:u/enkron/substitute-hardcod…

33c6e08

…ed-port-num-in-listen-on-fn, r=jyn514 chore(tcp): change a hardcoded port number in a doctest to `port` var The `listen_on` function in the example has a `port` option but doesn't use it

Rollup merge of rust-lang#110037 - notriddle:notriddle/theme-default,…

b8c372f

… r=GuillaumeGomez rustdoc: add test and bug fix for theme defaults Part of rust-lang#66181

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 Apr 7, 2023

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 Apr 7, 2023

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 Apr 7, 2023

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 Apr 7, 2023

Noratrieb closed this Apr 7, 2023

Noratrieb deleted the rollup-ho94v3u branch April 7, 2023 19:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests#110054

Rollup of 5 pull requests#110054
Noratrieb wants to merge 24 commits intorust-lang:masterfrom
Noratrieb:rollup-ho94v3u

Noratrieb commented Apr 7, 2023

Uh oh!

Noratrieb commented Apr 7, 2023

Uh oh!

bors commented Apr 7, 2023

Uh oh!

bors commented Apr 7, 2023

Uh oh!

bors commented Apr 7, 2023

Uh oh!

rust-log-analyzer commented Apr 7, 2023

Uh oh!

Noratrieb commented Apr 7, 2023

Uh oh!

bors commented Apr 7, 2023

Uh oh!

bors commented Apr 7, 2023

Uh oh!

Noratrieb commented Apr 7, 2023

Uh oh!

rust-log-analyzer commented Apr 7, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Conversation

Noratrieb commented Apr 7, 2023

Uh oh!

Noratrieb commented Apr 7, 2023

Uh oh!

bors commented Apr 7, 2023

Uh oh!

bors commented Apr 7, 2023

Uh oh!

bors commented Apr 7, 2023

Uh oh!

rust-log-analyzer commented Apr 7, 2023

Uh oh!

Noratrieb commented Apr 7, 2023

Uh oh!

bors commented Apr 7, 2023

Uh oh!

bors commented Apr 7, 2023

Uh oh!

Noratrieb commented Apr 7, 2023

Uh oh!

rust-log-analyzer commented Apr 7, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants