8000 Rollup of 9 pull requests by matthiaskrgr · Pull Request #136203 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

Rollup of 9 pull requests #136203

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

Merged
merged 19 commits into from
Jan 28, 2025
Merged

Rollup of 9 pull requests #136203

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6e1690a
Pass spans to perform_locally_in_new_solver
compiler-errors Jan 25, 2025
2117afd
[Clippy] Add vec_reserve & vecdeque_reserve diagnostic items
wowinter13 Jan 25, 2025
d898aa3
Arbitrary self types v2: explain test.
adetaylor Jan 27, 2025
314238f
Flip the `rustc-rayon`/`indexmap` dependency order
cuviper Jan 27, 2025
4aaf467
Implement MIR const trait stability checks
fee1-dead Jan 25, 2025
d250657
add test case for implicitly stable const fn
fee1-dead Jan 28, 2025
ea70688
Update comments and sort target_arch in c_char_definition
taiki-e Jan 28, 2025
1d8f59f
Update username in build helper example
Noratrieb Jan 28, 2025
aa1f941
Fix platform-specific doc string for AtomicUsize::from_mut to be plat…
hkBst Jan 22, 2025
356b2aa
"normalize" signature before checking mentions self
BoxyUwU Jan 22, 2025
6b4757b
Rollup merge of #135869 - hkBst:patch-12, r=Noratrieb
matthiaskrgr Jan 28, 2025
7915514
Rollup merge of #135892 - BoxyUwU:next_solver_deduce_sig_normalized, …
matthiaskrgr Jan 28, 2025
4cb1342
Rollup merge of #136055 - fee1-dead-contrib:push-ovmyztlkptmk, r=Ralf…
matthiaskrgr Jan 28, 2025
9f22f35
Rollup merge of #136066 - compiler-errors:local-spans, r=lcnr
matthiaskrgr Jan 28, 2025
d43e78d
Rollup merge of #136071 - wowinter13:clippy-add-diagnostic-items, r=f… matthiaskrgr Jan 28, 2025
da49fcd
Rollup merge of #136124 - adetaylor:test-comment, r=compiler-errors
matthiaskrgr Jan 28, 2025
995eb5c
Rollup merge of #136149 - cuviper:rustc-rayon-indexmap, r=compiler-er…
matthiaskrgr Jan 28, 2025
36b5c58
Rollup merge of #136173 - taiki-e:c-char, r=tgross35
matthiaskrgr Jan 28, 2025
9715fea
Rollup merge of #136178 - Noratrieb:alivename, r=pietroalbini
matthiaskrgr Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Flip the rustc-rayon/indexmap dependency order 
[`rustc-rayon v0.5.1`](rust-lang/rustc-rayon#14)
added `indexmap` implementations that will allow `indexmap` to drop its
own "internal-only" implementations.

(This is separate from `indexmap`'s implementation for normal `rayon`.)
  • Loading branch information
@cuviper
cuviper committed Jan 27, 2025
commit 314238f92ec062df1fae10cc66da7c2df2912282
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1859,7 +1859,6 @@ checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
dependencies = [
"equivalent",
"hashbrown 0.15.2",
"rustc-rayon",
"serde",
]

Expand Down Expand Up @@ -3240,11 +3239,12 @@ dependencies = [

[[package]]
name = "rustc-rayon"
version = "0.5.0"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb81aadc8837ca6ecebe0fe1353f15df83b3b3cc2cf7a8afd571bc22aa121710"
checksum = "2cd9fb077db982d7ceb42a90471e5a69a990b58f71e06f0d8340bb2cf35eb751"
dependencies = [
"either",
"indexmap",
"rustc-rayon-core",
]

Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_data_structures/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ bitflags = "2.4.1"
either = "1.0"
elsa = "=1.7.1"
ena = "0.14.3"
indexmap = { version = "2.4.0", features = ["rustc-rayon"] }
indexmap = "2.4.0"
jobserver_crate = { version = "0.1.28", package = "jobserver" }
measureme = "11"
rustc-hash = "2.0.0"
rustc-rayon = "0.5.0"
rustc-rayon = { version = "0.5.1", features = ["indexmap"] }
rustc-stable-hash = { version = "0.1.0", features = ["nightly"] }
rustc_arena = { path = "../rustc_arena" }
rustc_graphviz = { path = "../rustc_graphviz" }
Expand Down
Loading
0