Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 5 pull requests #146193

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

Closed
wants to merge 13 commits into from
Closed

Rollup of 5 pull requests #146193

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0a5383c
Promote aarch64-pc-windows-msvc to Tier 1
dpaoliello Aug 20, 2025
ee87a8b
Encapsulate output-capture mode in a dedicated enum
Zalathar Sep 2, 2025
d89a1a0
Preliminary plumbing of stdout/stderr as `&dyn ConsoleOut`
Zalathar Sep 2, 2025
5d71a8a
Replace print statements in runtest with `write!` or `writeln!`
Zalathar Sep 2, 2025
62b4347
Add `funnel_sh{l,r}` functions and intrinsics
sayantn Aug 20, 2025
31d1d82
Reduce bootstrap's dependencies
dpaoliello Aug 29, 2025
5d13845
Don't require next-solver `ProbeRef` to be `Copy`
ChayimFriedman2 Sep 3, 2025
c2ae2e0
Implement compiletest `--new-output-capture`, in stable Rust
Zalathar Aug 27, 2025
786289a
Rollup merge of #145682 - dpaoliello:arm64tier1, r=jieyouxu
Zalathar Sep 4, 2025
e3da4c8
Rollup merge of #145690 - sayantn:integer-funnel-shift, r=tgross35
Zalathar Sep 4, 2025
2003914
Rollup merge of #146119 - Zalathar:capture, r=jieyouxu
Zalathar Sep 4, 2025
63d60ac
Rollup merge of #146168 - dpaoliello:bootstrapdeps, r=jieyouxu
Zalathar Sep 4, 2025
6c04868
Rollup merge of #146182 - ChayimFriedman2:ns-probe, r=jackh726
Zalathar Sep 4, 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
4 changes: 2 additions & 2 deletions compiler/rustc_middle/src/ty/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,8 +738,8 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
)
}

type ProbeRef = &'tcx inspect::Probe<TyCtxt<'tcx>>;
fn mk_probe_ref(self, probe: inspect::Probe<Self>) -> &'tcx inspect::Probe<TyCtxt<'tcx>> {
type Probe = &'tcx inspect::Probe<TyCtxt<'tcx>>;
fn mk_probe(self, probe: inspect::Probe<Self>) -> &'tcx inspect::Probe<TyCtxt<'tcx>> {
self.arena.alloc(probe)
}
fn evaluate_root_goal_for_proof_tree_raw(
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,7 @@ pub fn evaluate_root_goal_for_proof_tree_raw_provider<
>(
cx: I,
canonical_goal: CanonicalInput<I>,
) -> (QueryResult<I>, I::ProbeRef) {
) -> (QueryResult<I>, I::Probe) {
let mut inspect = inspect::ProofTreeBuilder::new();
let canonical_result = SearchGraph::<D>::evaluate_root_goal_for_proof_tree(
cx,
Expand All @@ -1284,7 +1284,7 @@ pub fn evaluate_root_goal_for_proof_tree_raw_provider<
&mut inspect,
);
let final_revision = inspect.unwrap();
(canonical_result, cx.mk_probe_ref(final_revision))
(canonical_result, cx.mk_probe(final_revision))
}

/// Evaluate a goal to build a proof tree.
Expand Down
7 changes: 4 additions & 3 deletions compiler/rustc_type_ir/src/interner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::borrow::Borrow;
use std::fmt::Debug;
use std::hash::Hash;
use std::ops::Deref;
Expand Down Expand Up @@ -383,12 +384,12 @@ pub trait Interner:
defining_anchor: Self::LocalDefId,
) -> Self::LocalDefIds;

type ProbeRef: Copy + Debug + Hash + Eq + Deref<Target = inspect::Probe<Self>>;
fn mk_probe_ref(self, probe: inspect::Probe<Self>) -> Self::ProbeRef;
type Probe: Debug + Hash + Eq + Borrow<inspect::Probe<Self>>;
fn mk_probe(self, probe: inspect::Probe<Self>) -> Self::Probe;
fn evaluate_root_goal_for_proof_tree_raw(
self,
canonical_goal: CanonicalInput<Self>,
) -> (QueryResult<Self>, Self::ProbeRef);
) -> (QueryResult<Self>, Self::Probe);
}

/// Imagine you have a function `F: FnOnce(&[T]) -> R`, plus an iterator `iter`
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_type_ir/src/solve/inspect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pub type CanonicalState<I, T> = Canonical<I, State<I, T>>;
pub struct GoalEvaluation<I: Interner> {
pub uncanonicalized_goal: Goal<I, I::Predicate>,
pub orig_values: Vec<I::GenericArg>,
pub final_revision: I::ProbeRef,
pub final_revision: I::Probe,
pub result: QueryResult<I>,
}

Expand Down
Loading