Skip to content

Commit

Permalink
Rollup merge of rust-lang#119538 - nnethercote:cleanup-errors-5, r=co…
Browse files Browse the repository at this point in the history
…mpiler-errors

Cleanup error handlers: round 5

More rustc_errors cleanups. A sequel to rust-lang#119171.

r? ````@compiler-errors````
  • Loading branch information
compiler-errors authored Jan 5, 2024
2 parents fe71e04 + a56eff2 commit 41b758f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@ impl<G: EmissionGuarantee> IntoDiagnostic<'_, G> for TargetFeatureDisableOrEnabl
fluent::codegen_gcc_target_feature_disable_or_enable
);
if let Some(span) = self.span {
diag.set_span(span);
diag.span(span);
};
if let Some(missing_features) = self.missing_features {
diag.subdiagnostic(missing_features);
}
diag.set_arg("features", self.features.join(", "));
diag.arg("features", self.features.join(", "));
diag
}
}

0 comments on commit 41b758f

Please sign in to comment.