Skip to content

Commit c7d3c4f

Browse files
committed
Auto merge of rust-lang#126319 - workingjubilee:rollup-lendnud, r=workingjubilee
Rollup of 16 pull requests Successful merges: - rust-lang#123374 (DOC: Add FFI example for slice::from_raw_parts()) - rust-lang#124514 (Recommend to never display zero disambiguators when demangling v0 symbols) - rust-lang#125978 (Cleanup: HIR ty lowering: Consolidate the places that do assoc item probing & access checking) - rust-lang#125980 (Nvptx remove direct passmode) - rust-lang#126187 (For E0277 suggest adding `Result` return type for function when using QuestionMark `?` in the body.) - rust-lang#126210 (docs(core): make more const_ptr doctests assert instead of printing) - rust-lang#126249 (Simplify `[T; N]::try_map` signature) - rust-lang#126256 (Add {{target}} substitution to compiletest) - rust-lang#126263 (Make issue-122805.rs big endian compatible) - rust-lang#126281 (set_env: State the conclusion upfront) - rust-lang#126286 (Make `storage-live.rs` robust against rustc internal changes.) - rust-lang#126287 (Update a cranelift patch file for formatting changes.) - rust-lang#126301 (Use `tidy` to sort crate attributes for all compiler crates.) - rust-lang#126305 (Make PathBuf less Ok with adding UTF-16 then `into_string`) - rust-lang#126310 (Migrate run make prefer rlib) - rust-lang#126314 (fix RELEASES: we do not support upcasting to auto traits) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4e0af7c + 03a2764 commit c7d3c4f

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

patches/0029-stdlib-rawdylib-processprng.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ diff --git a/library/std/src/sys/pal/windows/c.rs b/library/std/src/sys/pal/wind
1212
index ad8e01bfa9b..9ca8e4c16ce 100644
1313
--- a/library/std/src/sys/pal/windows/c.rs
1414
+++ b/library/std/src/sys/pal/windows/c.rs
15-
@@ -323,7 +323,7 @@ pub unsafe fn NtWriteFile(
15+
@@ -312,7 +312,7 @@ pub unsafe fn NtWriteFile(
1616

1717
// Use raw-dylib to import ProcessPrng as we can't rely on there being an import library.
1818
cfg_if::cfg_if! {
@@ -26,8 +26,8 @@ index e427546222a..f2fe42a4d51 100644
2626
--- a/library/std/src/sys/pal/windows/rand.rs
2727
+++ b/library/std/src/sys/pal/windows/rand.rs
2828
@@ -2,7 +2,7 @@
29-
use core::mem;
30-
use core::ptr;
29+
30+
use crate::sys::c;
3131

3232
-#[cfg(not(target_vendor = "win7"))]
3333
+#[cfg(any())]

src/lib.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1+
// tidy-alphabetical-start
2+
#![allow(rustc::diagnostic_outside_of_impl)]
3+
#![allow(rustc::untranslatable_diagnostic)]
14
#![cfg_attr(doc, allow(internal_features))]
2-
#![cfg_attr(doc, feature(rustdoc_internals))]
35
#![cfg_attr(doc, doc(rust_logo))]
6+
#![cfg_attr(doc, feature(rustdoc_internals))]
7+
// Note: please avoid adding other feature gates where possible
48
#![feature(rustc_private)]
59
// Note: please avoid adding other feature gates where possible
6-
#![allow(rustc::diagnostic_outside_of_impl)]
7-
#![allow(rustc::untranslatable_diagnostic)]
810
#![warn(rust_2018_idioms)]
9-
#![warn(unused_lifetimes)]
1011
#![warn(unreachable_pub)]
12+
#![warn(unused_lifetimes)]
13+
// tidy-alphabetical-end
1114

1215
extern crate jobserver;
1316
#[macro_use]

0 commit comments

Comments
 (0)