Skip to content

Rollup of 4 pull requests #131138

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 19 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4b8a5bd
panic when an interpreter error gets unintentionally discarded
RalfJung Sep 26, 2024
1c7e824
Revert "Drop conditionally applied cargo `-Zon-broken-pipe=kill` flags"
jieyouxu Oct 1, 2024
c4ce8c1
make InterpResult a dedicated type to avoid accidentally discarding t…
RalfJung Sep 29, 2024
38ea690
fix extension for `-Zdump-mir-dataflow` graphviz files
lqd Oct 1, 2024
98d6fdb
make `Borrows` dataflow dumps about its loan domain
lqd Oct 1, 2024
bb5a827
add unstable support for outputting file checksums for use in cargo
Xaeroxe Jun 22, 2024
6ff7a3e
Fix options help text
Xaeroxe Jul 27, 2024
081661b
disregard what we believe is supported in cargo for hash type
Xaeroxe Sep 28, 2024
dba814a
Pile all the checksum info into a comment that goes in the same order…
Xaeroxe Sep 29, 2024
e3089c7
improve shell help text
Xaeroxe Sep 29, 2024
6708d56
Fix bug in depinfo output
Xaeroxe Sep 29, 2024
6fd9ef6
no need to comma delimit this, it's already space delimited
Xaeroxe Sep 29, 2024
0069649
Add basic integration test for checksum-hash-algorithm feature
Xaeroxe Sep 29, 2024
4d9fa6f
add another file to the integration test
Xaeroxe Sep 29, 2024
15efbc6
Write two newlines intentionally
Xaeroxe Oct 2, 2024
9030b26
Rollup merge of #126930 - Xaeroxe:file-checksum-hint, r=chenyukang
matthiaskrgr Oct 2, 2024
ec51e90
Rollup merge of #130885 - RalfJung:interp-error-discard, r=oli-obk
matthiaskrgr Oct 2, 2024
73bd7a6
Rollup merge of #131108 - jieyouxu:revert-broken-pipe, r=onur-ozkan
matthiaskrgr Oct 2, 2024
18ae5f6
Rollup merge of #131121 - lqd:dataflow-viz, r=compiler-errors
matthiaskrgr Oct 2, 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
disregard what we believe is supported in cargo for hash type
  • Loading branch information
Xaeroxe committed Oct 2, 2024
commit 081661b78d44bd41f8a1fd46b9ed11823cd7811e
6 changes: 1 addition & 5 deletions compiler/rustc_session/src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1295,11 +1295,7 @@ mod parse {
) -> bool {
match v.and_then(|s| SourceFileHashAlgorithm::from_str(s).ok()) {
Some(hash_kind) => {
if hash_kind.supported_in_cargo() {
*slot = Some(hash_kind);
} else {
return false;
}
*slot = Some(hash_kind);
}
_ => return false,
}
Expand Down
9 changes: 0 additions & 9 deletions compiler/rustc_span/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1400,15 +1400,6 @@ pub enum SourceFileHashAlgorithm {
Blake3,
}

impl SourceFileHashAlgorithm {
pub fn supported_in_cargo(&self) -> bool {
match self {
Self::Md5 | Self::Sha1 => false,
Self::Sha256 | Self::Blake3 => true,
}
}
}

impl Display for SourceFileHashAlgorithm {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.write_str(match self {
Expand Down