Skip to content

Rollup of 4 pull requests #140350

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.

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

Closed
wants to merge 11 commits into from
Closed

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Apr 26, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Shourya742 and others added 11 commits April 25, 2025 11:09
It wants an owned path, so pass an owned path
…-inline, r=ZuseZ4

add autodiff inline

closes: rust-lang#138920

r? `@ZuseZ4`
…, r=notriddle

Correctly display stdout and stderr in case a doctest is failing

Fixes rust-lang#140289.

Since the doctest is actually running itself, we need to handle the output directly inside it.

cc `@fmease`
r? `@notriddle`
Update example to use CStr::to_string_lossy
session: Cleanup `CanonicalizedPath::new`

It wants an owned path, so pass an owned path.
@rustbot rustbot added F-autodiff `#![feature(autodiff)]` S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 26, 2025
@jhpratt
Copy link
Member Author

jhpratt commented Apr 26, 2025

@bors r+ rollup p=4

@bors
Copy link
Collaborator

bors commented Apr 26, 2025

📌 Commit 60316bf has been approved by jhpratt

It is now in the queue for this repository.

@bors 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 26, 2025
@bors
Copy link
Collaborator

bors commented Apr 26, 2025

⌛ Testing commit 60316bf with merge ad2aaa8...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2025
Rollup of 4 pull requests

Successful merges:

 - rust-lang#139308 (add autodiff inline)
 - rust-lang#140291 (Correctly display stdout and stderr in case a doctest is failing)
 - rust-lang#140297 (Update example to use CStr::to_string_lossy)
 - rust-lang#140339 (session: Cleanup `CanonicalizedPath::new`)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
   Compiling rustc_codegen_llvm v0.0.0 (/checkout/compiler/rustc_codegen_llvm)
error[E0308]: mismatched types
   --> compiler/rustc_codegen_llvm/src/back/lto.rs:677:54
    |
677 |             if attributes::has_string_attr(function, marker_ptr) {
    |                ---------------------------           ^^^^^^^^^^ expected `*const i8`, found `*const u8`
    |                |
    |                arguments to this function are incorrect
    |
    = note: expected raw pointer `*const i8`
               found raw pointer `*const u8`
note: function defined here
   --> compiler/rustc_codegen_llvm/src/attributes.rs:35:15
    |
35  | pub(crate) fn has_string_attr(llfn: &Value, name: *const i8) -> bool {
    |               ^^^^^^^^^^^^^^^               ---------------

error[E0308]: mismatched types
   --> compiler/rustc_codegen_llvm/src/back/lto.rs:685:68
    |
685 |                 attributes::remove_string_attr_from_llfn(function, marker_ptr);
    |                 ----------------------------------------           ^^^^^^^^^^ expected `*const i8`, found `*const u8`
    |                 |
    |                 arguments to this function are incorrect
    |
    = note: expected raw pointer `*const i8`
               found raw pointer `*const u8`
note: function defined here
   --> compiler/rustc_codegen_llvm/src/attributes.rs:43:15
    |
43  | pub(crate) fn remove_string_attr_from_llfn(llfn: &Value, name: *const i8) {
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^               ---------------

error[E0308]: mismatched types
   --> compiler/rustc_codegen_llvm/src/back/lto.rs:688:60
    |
688 |                     !attributes::has_string_attr(function, marker_ptr),
    |                      ---------------------------           ^^^^^^^^^^ expected `*const i8`, found `*const u8`
    |                      |
    |                      arguments to this function are incorrect
    |
    = note: expected raw pointer `*const i8`
               found raw pointer `*const u8`
note: function defined here
   --> compiler/rustc_codegen_llvm/src/attributes.rs:35:15
    |
35  | pub(crate) fn has_string_attr(llfn: &Value, name: *const i8) -> bool {
    |               ^^^^^^^^^^^^^^^               ---------------

error[E0308]: mismatched types
  --> compiler/rustc_codegen_llvm/src/llvm/mod.rs:53:43
   |
53 |     unsafe { LLVMRustHasFnAttribute(llfn, name) }
   |              ----------------------       ^^^^ expected `*const u8`, found `*const i8`
   |              |
   |              arguments to this function are incorrect
   |
   = note: expected raw pointer `*const u8`
              found raw pointer `*const i8`
note: function defined here
  --> compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs:22:19
   |
22 |     pub(crate) fn LLVMRustHasFnAttribute(F: &Value, Name: *const c_char) -> bool;
   |                   ^^^^^^^^^^^^^^^^^^^^^^            ----

error[E0308]: mismatched types
  --> compiler/rustc_codegen_llvm/src/llvm/mod.rs:57:46
   |
57 |     unsafe { LLVMRustRemoveFnAttribute(llfn, name) }
   |              -------------------------       ^^^^ expected `*const u8`, found `*const i8`
   |              |
   |              arguments to this function are incorrect
   |
   = note: expected raw pointer `*const u8`
              found raw pointer `*const i8`
note: function defined here
  --> compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs:23:19
   |
23 |     pub(crate) fn LLVMRustRemoveFnAttribute(F: &Value, Name: *const c_char);
   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^            ----

For more information about this error, try `rustc --explain E0308`.
[RUSTC-TIMING] rustc_codegen_llvm test:false 2.422
error: could not compile `rustc_codegen_llvm` (lib) due to 5 previous errors
---
   1: std::backtrace_rs::backtrace::trace_unsynchronized
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/std/src/../../backtrace/src/backtrace/mod.rs:66:14
   2: std::backtrace::Backtrace::create
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/std/src/backtrace.rs:331:13
   3: <anyhow::Error>::msg::<alloc::string::String>
             at /rust/deps/anyhow-1.0.97/src/backtrace.rs:27:14
   4: <opt_dist::exec::CmdBuilder>::run
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/exec.rs:80:17
   5: <opt_dist::exec::Bootstrap>::run
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/exec.rs:181:9
   6: opt_dist::execute_pipeline::{closure#1}::{closure#0}
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/main.rs:230:13
   7: <opt_dist::timer::TimerSection>::section::<opt_dist::execute_pipeline::{closure#1}::{closure#0}, ()>
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/timer.rs:111:22
   8: opt_dist::execute_pipeline::{closure#1}
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/main.rs:219:9
   9: <opt_dist::timer::TimerSection>::section::<opt_dist::execute_pipeline::{closure#1}, opt_dist::training::RustcPGOProfile>
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/timer.rs:111:22
  10: opt_dist::execute_pipeline
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/main.rs:216:29
  11: opt_dist::main
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/main.rs:416:18
  12: <fn() -> core::result::Result<(), anyhow::Error> as core::ops::function::FnOnce<()>>::call_once
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/core/src/ops/function.rs:250:5
  13: std::sys::backtrace::__rust_begin_short_backtrace::<fn() -> core::result::Result<(), anyhow::Error>, core::result::Result<(), anyhow::Error>>
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/std/src/sys/backtrace.rs:152:18
  14: std::rt::lang_start::<core::result::Result<(), anyhow::Error>>::{closure#0}
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/std/src/rt.rs:199:18
  15: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &F>::call_once
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/core/src/ops/function.rs:284:13
  16: std::panicking::try::do_call
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/std/src/panicking.rs:589:40
  17: std::panicking::try
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/std/src/panicking.rs:552:19

@bors
Copy link
Collaborator

bors commented Apr 26, 2025

💔 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 Apr 26, 2025
@jhpratt jhpratt closed this Apr 27, 2025
@jhpratt jhpratt deleted the rollup-fudxv6m branch April 27, 2025 01:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
F-autodiff `#![feature(autodiff)]` rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants