Skip to content

Commit 2010bba

Browse files
committedMar 3, 2025·
Auto merge of rust-lang#137927 - matthiaskrgr:rollup-yj463ns, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang#132388 (Implement `#[cfg]` in `where` clauses) - rust-lang#134900 (Fix parsing of ranges after unary operators) - rust-lang#136938 (Remove `:` from `stack-protector-heuristics-effect.rs` Filecheck Pattern) - rust-lang#137054 (Make phantom variance markers transparent) - rust-lang#137525 (Simplify parallelization in test-float-parse) - rust-lang#137618 (Skip `tidy` in pre-push hook if the user is deleting a remote branch) - rust-lang#137741 (Stop using `hash_raw_entry` in `CodegenCx::const_str`) - rust-lang#137849 (Revert "Remove Win SDK 10.0.26100.0 from CI") - rust-lang#137862 (ensure we always print all --print options in help) r? `@ghost` `@rustbot` modify labels: rollup
2 parents e16a049 + 1998cf7 commit 2010bba

File tree

59 files changed

+3606
-410
lines changed

Some content is hidden

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

59 files changed

+3606
-410
lines changed
 

Diff for: ‎.github/workflows/ci.yml

-14
Original file line numberDiff line numberDiff line change
@@ -182,20 +182,6 @@ jobs:
182182
- name: show the current environment
183183
run: src/ci/scripts/dump-environment.sh
184184

185-
# Temporary fix to unblock CI
186-
# Remove the latest Windows SDK for 32-bit Windows MSVC builds.
187-
# See issue https://github.com/rust-lang/rust/issues/137733 for more details.
188-
- name: Remove Windows SDK 10.0.26100.0
189-
shell: powershell
190-
if: ${{ matrix.name == 'i686-msvc-1' || matrix.name == 'i686-msvc-2' || matrix.name == 'dist-i686-msvc' }}
191-
run: |
192-
$kits = (Get-ItemProperty -path 'HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots').KitsRoot10
193-
$sdk_version = "10.0.26100.0"
194-
195-
foreach ($kind in 'Bin', 'Lib', 'Include') {
196-
Remove-Item -Force -Recurse $kits\$kind\$sdk_version -ErrorAction Continue
197-
}
198-
199185
- name: run the build
200186
# Redirect stderr to stdout to avoid reordering the two streams in the GHA logs.
201187
run: src/ci/scripts/run-build-from-ci.sh 2>&1

Diff for: ‎compiler/rustc_ast/src/ast.rs

+2
Original file line numberDiff line numberDiff line change
@@ -417,9 +417,11 @@ impl WhereClause {
417417
/// A single predicate in a where-clause.
418418
#[derive(Clone, Encodable, Decodable, Debug)]
419419
pub struct WherePredicate {
420+
pub attrs: AttrVec,
420421
pub kind: WherePredicateKind,
421422
pub id: NodeId,
422423
pub span: Span,
424+
pub is_placeholder: bool,
423425
}
424426

425427
/// Predicate kind in where-clause.

0 commit comments

Comments
 (0)
Please sign in to comment.