Skip to content

[experiment] Turn off never type fallback #122955

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 11 commits into from
Closed

[experiment] Turn off never type fallback #122955

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
18c47e4
Add dependencies to be patched
WaffleLapkin Mar 21, 2024
a7a76a1
Patch the dependencies
WaffleLapkin Mar 22, 2024
975f6af
isable some lints in the patched crates D
WaffleLapkin Mar 23, 2024
0745925
Patch core
WaffleLapkin Mar 23, 2024
d288bdd
Patch the compiler
WaffleLapkin Mar 23, 2024
ff21bc2
Turn off never type fallback
WaffleLapkin Mar 23, 2024
bddded1
Add newline
WaffleLapkin Mar 24, 2024
ca17c4e
Always use beta cargo (crater hack)
WaffleLapkin Apr 2, 2024
6f5aab8
Patch out one more crate
WaffleLapkin Apr 2, 2024
f134381
Hackily disable even more things
WaffleLapkin Apr 3, 2024
517f677
Disable some PGO crates in hopes of actually succeeding try build :sob:
WaffleLapkin Apr 3, 2024
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
Hackily disable even more things
  • Loading branch information
@WaffleLapkin
WaffleLapkin committed Apr 3, 2024
commit f134381569cc649c39481e0e583e11e5e30aaf13
4 changes: 4 additions & 0 deletions src/bootstrap/src/core/build_steps/doc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,10 @@ macro_rules! tool_doc {
/// we do not merge it with the other documentation from std, test and
/// proc_macros. This is largely just a wrapper around `cargo doc`.
fn run(self, builder: &Builder<'_>) {
if stringify!($tool).to_lowercase() == "cargo" {
return;
}

let stage = builder.top_stage;
let target = self.target;

Expand Down
24 changes: 14 additions & 10 deletions src/bootstrap/src/core/build_steps/tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,11 +597,11 @@ impl Step for RustAnalyzer {
)
}

fn make_run(run: RunConfig<'_>) {
run.builder.ensure(RustAnalyzer {
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
target: run.target,
});
fn make_run(_run: RunConfig<'_>) {
// run.builder.ensure(RustAnalyzer {
// compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
// target: run.target,
// });
}

fn run(self, builder: &Builder<'_>) -> PathBuf {
Expand Down Expand Up @@ -644,11 +644,11 @@ impl Step for RustAnalyzerProcMacroSrv {
)
}

fn make_run(run: RunConfig<'_>) {
run.builder.ensure(RustAnalyzerProcMacroSrv {
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
target: run.target,
});
fn make_run(_run: RunConfig<'_>) {
// run.builder.ensure(RustAnalyzerProcMacroSrv {
// compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
// target: run.target,
// });
}

fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
Expand Down Expand Up @@ -784,6 +784,10 @@ macro_rules! tool_extended {
}

fn make_run(run: RunConfig<'_>) {
if stringify!($name).to_lowercase().ends_with("clippy") {
return;
}

run.builder.ensure($name {
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
target: run.target,
Expand Down
4 changes: 2 additions & 2 deletions src/tools/opt-dist/src/training.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use humansize::BINARY;

const LLVM_PGO_CRATES: &[&str] = &[
"syn-1.0.89",
"cargo-0.60.0",
//"cargo-0.60.0",
"serde-1.0.136",
"ripgrep-13.0.0",
"regex-1.5.5",
Expand All @@ -19,7 +19,7 @@ const LLVM_PGO_CRATES: &[&str] = &[
const RUSTC_PGO_CRATES: &[&str] = &[
"externs",
"ctfe-stress-5",
"cargo-0.60.0",
//"cargo-0.60.0",
"token-stream-stress",
"match-stress",
"tuple-stress",
Expand Down