Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 74d92df

Browse files
committedMar 12, 2025
Auto merge of rust-lang#138383 - jieyouxu:rollup-ntnvzmn, r=jieyouxu
Rollup of 25 pull requests Successful merges: - rust-lang#134076 (Stabilize `std::io::ErrorKind::InvalidFilename`) - rust-lang#136842 (Add libstd support for Trusty targets) - rust-lang#137314 (change definitely unproductive cycles to error) - rust-lang#137504 (Move methods from Map to TyCtxt, part 4.) - rust-lang#137621 (Add std support to cygwin target) - rust-lang#137701 (Convert `ShardedHashMap` to use `hashbrown::HashTable`) - rust-lang#138109 (make precise capturing args in rustdoc Json typed) - rust-lang#138161 (Add PeekMut::refresh) - rust-lang#138162 (Update the standard library to Rust 2024) - rust-lang#138174 (Elaborate trait assumption in `receiver_is_dispatchable`) - rust-lang#138175 (Support rmeta inputs for --crate-type=bin --emit=obj) - rust-lang#138269 (uefi: fs: Implement FileType, FilePermissions and FileAttr) - rust-lang#138313 (Update books) - rust-lang#138318 (Rustdoc: remove a bunch of `@ts-expect-error` from main.js) - rust-lang#138331 (Use `RUSTC_LINT_FLAGS` more) - rust-lang#138333 (Rebuild llvm spuriously less frequently) - rust-lang#138343 (Enable `f16` tests for `powf`) - rust-lang#138345 (Some autodiff cleanups) - rust-lang#138346 (naked functions: on windows emit `.endef` without the symbol name) - rust-lang#138347 (Reduce `kw::Empty` usage, part 2) - rust-lang#138360 (Fix false-positive in `expr_or_init` and in the `invalid_from_utf8` lint) - rust-lang#138371 (Update compiletest's `has_asm_support` to match rustc) - rust-lang#138372 (Refactor `pick2_mut` & `pick3_mut` to use `get_disjoint_mut`) - rust-lang#138376 (Item-related cleanups) - rust-lang#138377 (Remove unnecessary lifetime from `PatInfo`.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents a21d978 + df1dbe7 commit 74d92df

File tree

335 files changed

+1930
-1275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

335 files changed

+1930
-1275
lines changed
 

‎compiler/rustc_data_structures/src/marker.rs

+2
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ impl_dyn_send!(
7676
[crate::sync::RwLock<T> where T: DynSend]
7777
[crate::tagged_ptr::TaggedRef<'a, P, T> where 'a, P: Sync, T: Send + crate::tagged_ptr::Tag]
7878
[rustc_arena::TypedArena<T> where T: DynSend]
79+
[hashbrown::HashTable<T> where T: DynSend]
7980
[indexmap::IndexSet<V, S> where V: DynSend, S: DynSend]
8081
[indexmap::IndexMap<K, V, S> where K: DynSend, V: DynSend, S: DynSend]
8182
[thin_vec::ThinVec<T> where T: DynSend]
@@ -153,6 +154,7 @@ impl_dyn_sync!(
153154
[crate::tagged_ptr::TaggedRef<'a, P, T> where 'a, P: Sync, T: Sync + crate::tagged_ptr::Tag]
154155
[parking_lot::lock_api::Mutex<R, T> where R: DynSync, T: ?Sized + DynSend]
155156
[parking_lot::lock_api::RwLock<R, T> where R: DynSync, T: ?Sized + DynSend + DynSync]
157+
[hashbrown::HashTable<T> where T: DynSync]
156158
[indexmap::IndexSet<V, S> where V: DynSync, S: DynSync]
157159
[indexmap::IndexMap<K, V, S> where K: DynSync, V: DynSync, S: DynSync]
158160
[smallvec::SmallVec<A> where A: smallvec::Array + DynSync]

‎compiler/rustc_data_structures/src/obligation_forest/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ pub struct Error<O, E> {
313313

314314
mod helper {
315315
use super::*;
316-
pub type ObligationTreeIdGenerator = impl Iterator<Item = ObligationTreeId>;
316+
pub(super) type ObligationTreeIdGenerator = impl Iterator<Item = ObligationTreeId>;
317317
impl<O: ForestObligation> ObligationForest<O> {
318318
#[cfg_attr(not(bootstrap), define_opaque(ObligationTreeIdGenerator))]
319319
pub fn new() -> ObligationForest<O> {
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.