Skip to content

Rollup of 7 pull requests #137607

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

Closed
wants to merge 21 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
812727e
Teach structured errors to display short `Ty`
estebank Feb 18, 2025
9884f7b
Add tests
estebank Feb 18, 2025
8413388
Make E0529 a structured error
estebank Feb 18, 2025
2970cd3
Make E0614 a structured error
estebank Feb 18, 2025
ce259e2
Make E0609 a structured error
estebank Feb 18, 2025
2dcd85f
add doc comment detail
estebank Feb 18, 2025
e4ca11f
downgrade bootstrap `cc`
onur-ozkan Feb 23, 2025
62f5a55
Use `as_chunks` in `analyze_source_file_sse2`
real-eren Feb 20, 2025
fb5f804
Update `compiler-builtins` to 0.1.148
tgross35 Feb 24, 2025
37b18f8
add explicit stage fields to `Config`
onur-ozkan Feb 24, 2025
cf6dc74
add coverage for explicit stage fields
onur-ozkan Feb 24, 2025
9ad6011
use stage 2 on cargo and clippy tests when possible
onur-ozkan Feb 24, 2025
ffc955b
Don't require method impls for methods with `Self:Sized` bounds for i…
oli-obk Jan 14, 2025
6cd0721
Revert accidental cargo submodule update
oli-obk Feb 25, 2025
bb15d94
Rollup merge of #135480 - oli-obk:sized-method-on-unsized-impl, r=lcnr
fmease Feb 25, 2025
6b7103f
Rollup merge of #137201 - estebank:structured-errors-long-ty, r=oli-obk
fmease Feb 25, 2025
1a26cc6
Rollup merge of #137360 - real-eren:rustc_span/use-chunks-exact, r=No…
fmease Feb 25, 2025
e40c521
Rollup merge of #137460 - onur-ozkan:downgrade-cc, r=jieyouxu
fmease Feb 25, 2025
662f228
Rollup merge of #137515 - tgross35:update-builtins, r=tgross35
fmease Feb 25, 2025
8e4d6e7
Rollup merge of #137522 - onur-ozkan:137215-follow-ups, r=Kobzol
fmease Feb 25, 2025
d30ed07
Rollup merge of #137597 - oli-obk:push-unkusxkoqrus, r=Kobzol
fmease Feb 25, 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
add coverage for explicit stage fields
Signed-off-by: onur-ozkan <work@onurozkan.dev>
  • Loading branch information
onur-ozkan committed Feb 24, 2025
commit cf6dc742b77b86a95b78d5e40dfe2e080282863f
57 changes: 57 additions & 0 deletions src/bootstrap/src/core/config/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -454,3 +454,60 @@ fn check_rustc_if_unchanged_paths() {
assert!(config.src.join(p).exists(), "{p} doesn't exist.");
}
}

#[test]
fn test_explicit_stage() {
let config = Config::parse_inner(
Flags::parse(&["check".to_owned(), "--config=/does/not/exist".to_owned()]),
|&_| {
toml::from_str(
r#"
[build]
test-stage = 1
"#,
)
},
);

assert!(!config.explicit_stage_from_cli);
assert!(config.explicit_stage_from_config);

let config = Config::parse_inner(
Flags::parse(&[
"check".to_owned(),
"--stage=2".to_owned(),
"--config=/does/not/exist".to_owned(),
]),
|&_| toml::from_str(""),
);

assert!(config.explicit_stage_from_cli);
assert!(!config.explicit_stage_from_config);

let config = Config::parse_inner(
Flags::parse(&[
"check".to_owned(),
"--stage=2".to_owned(),
"--config=/does/not/exist".to_owned(),
]),
|&_| {
toml::from_str(
r#"
[build]
test-stage = 1
"#,
)
},
);

assert!(config.explicit_stage_from_cli);
assert!(config.explicit_stage_from_config);

let config = Config::parse_inner(
Flags::parse(&["check".to_owned(), "--config=/does/not/exist".to_owned()]),
|&_| toml::from_str(""),
);

assert!(!config.explicit_stage_from_cli);
assert!(!config.explicit_stage_from_config);
}