Skip to content

Rollup of 7 pull requests #135086

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.

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 30 commits into from
Jan 4, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3f94047
Switch rtems target to panic unwind
thesummer Nov 23, 2024
ed63d5e
Make Boxy UwU
Noratrieb Dec 31, 2024
f364674
Remove hack for filtering out param-env outlives that match item-boun…
compiler-errors Jan 2, 2025
2a373d7
Make it clearer that the only infers we expect to see when processing…
compiler-errors Jan 2, 2025
dd210ec
Simplify declared_generic_bounds_from_env
compiler-errors Jan 2, 2025
c7cb822
rustdoc: treat `allowed_through_unstable_modules` as deprecation
notriddle Jan 2, 2025
8af769d
Use `is_some_and` helper
notriddle Jan 2, 2025
c5d4996
nit: Make get_infer_ret_ty name more consistent with is_suggestable_i…
compiler-errors Jan 2, 2025
c529fe0
Remove diagnostic_only_typeck and fix placeholder suggestion for cons…
compiler-errors Jan 2, 2025
b85a91f
More refined spans for placeholder error in const/static
compiler-errors Jan 2, 2025
6885ff4
Unconditionally lower generic_arg_infer
compiler-errors Jan 2, 2025
8e344ae
Suppress type param suggestion if encountering invalid const infer
compiler-errors Jan 2, 2025
7601adb
Make suggestion verbose and tweak error message
compiler-errors Jan 2, 2025
0fd64ef
Fix macro shenanigans
compiler-errors Jan 2, 2025
a8516c0
refactor bootstrap path resolution
onur-ozkan Jan 2, 2025
00cd943
adapt bootstrap tests to the new path resolution logic
onur-ozkan Jan 2, 2025
c367c62
revert step order from #134919
onur-ozkan Jan 2, 2025
be2f75f
Revert "bootstrap: temporarily flip `compile::Rustc` vs `compile::Ass…
onur-ozkan Jan 3, 2025
3807440
avoid early return to handle all paths
onur-ozkan Jan 3, 2025
baa7fce
add coverage for multiple paths
onur-ozkan Jan 3, 2025
f7d0842
run-make-support: convert `assertion_helpers` to module
jieyouxu Jan 3, 2025
7b76303
run-make-support: add basic sanity tests for assertion helpers
jieyouxu Jan 3, 2025
6175d73
run-make-support: tidy up assertion failure dumping
jieyouxu Jan 3, 2025
4cd2895
Rollup merge of #133420 - thesummer:rtems-unwind, r=workingjubilee
matthiaskrgr Jan 3, 2025
d1c7ad0
Rollup merge of #134965 - Noratrieb:slightly-late-for-boxing-day-sadl…
matthiaskrgr Jan 3, 2025
cdfe3d7
Rollup merge of #135007 - compiler-errors:outlives-tweaks, r=oli-obk
matthiaskrgr Jan 3, 2025
564a29d
Rollup merge of #135036 - jieyouxu:rmake-be-quiet, r=compiler-errors
matthiaskrgr Jan 3, 2025
f0c03f6
Rollup merge of #135043 - notriddle:notriddle/allowed-through-unstabl…
matthiaskrgr Jan 3, 2025
12cc9b4
Rollup merge of #135044 - compiler-errors:better-infer-suggestions-in…
matthiaskrgr Jan 3, 2025
c02499f
Rollup merge of #135058 - onur-ozkan:path-resolution, r=jieyouxu
matthiaskrgr Jan 3, 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
adapt bootstrap tests to the new path resolution logic
Signed-off-by: onur-ozkan <work@onurozkan.dev>
  • Loading branch information
onur-ozkan committed Jan 3, 2025
commit 00cd94370959ece80f675249ba6f4235a4ff8c3c
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ impl Step for Std {
const DEFAULT: bool = true;

fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.crate_or_deps("sysroot").path("library")
run.crate_or_deps("sysroot").path("library").alias("core")
}

fn make_run(run: RunConfig<'_>) {
Expand Down
5 changes: 4 additions & 1 deletion src/bootstrap/src/core/build_steps/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,10 @@ impl Step for Std {

fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
let builder = run.builder;
run.crate_or_deps("sysroot").path("library").default_condition(builder.config.docs)
run.crate_or_deps("sysroot")
.path("library")
.alias("core")
.default_condition(builder.config.docs)
}

fn make_run(run: RunConfig<'_>) {
Expand Down
8 changes: 8 additions & 0 deletions src/bootstrap/src/core/builder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,14 @@ struct CLIStepPath {
will_be_executed: bool,
}

#[cfg(test)]
impl CLIStepPath {
fn will_be_executed(mut self, will_be_executed: bool) -> Self {
self.will_be_executed = will_be_executed;
self
}
}

impl Debug for CLIStepPath {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", self.path.display())
Expand Down
12 changes: 8 additions & 4 deletions src/bootstrap/src/core/builder/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,17 @@ fn test_intersection() {
};
let library_set = set(&["library/core", "library/alloc", "library/std"]);
let mut command_paths = vec![
PathBuf::from("library/core"),
PathBuf::from("library/alloc"),
PathBuf::from("library/stdarch"),
CLIStepPath::from(PathBuf::from("library/core")),
CLIStepPath::from(PathBuf::from("library/alloc")),
CLIStepPath::from(PathBuf::from("library/stdarch")),
];
let subset = library_set.intersection_removing_matches(&mut command_paths, Kind::Build);
assert_eq!(subset, set(&["library/core", "library/alloc"]),);
assert_eq!(command_paths, vec![PathBuf::from("library/stdarch")]);
assert_eq!(command_paths, vec![
CLIStepPath::from(PathBuf::from("library/core")).will_be_executed(true),
CLIStepPath::from(PathBuf::from("library/alloc")).will_be_executed(true),
CLIStepPath::from(PathBuf::from("library/stdarch")).will_be_executed(false),
]);
}

#[test]
Expand Down