@@ -47,7 +47,7 @@ pub enum DryRun {
47
47
UserSelected ,
48
48
}
49
49
50
- #[ derive( Copy , Clone , Default , PartialEq , Eq ) ]
50
+ #[ derive( Copy , Clone , Default , Debug , Eq , PartialEq ) ]
51
51
pub enum DebuginfoLevel {
52
52
#[ default]
53
53
None ,
@@ -117,7 +117,7 @@ impl Display for DebuginfoLevel {
117
117
/// 2) MSVC
118
118
/// - Self-contained: `-Clinker=<path to rust-lld>`
119
119
/// - External: `-Clinker=lld`
120
- #[ derive( Copy , Clone , Default , PartialEq ) ]
120
+ #[ derive( Copy , Clone , Default , Debug , PartialEq ) ]
121
121
pub enum LldMode {
122
122
/// Do not use LLD
123
123
#[ default]
@@ -2667,11 +2667,14 @@ fn check_incompatible_options_for_ci_rustc(
2667
2667
) -> Result < ( ) , String > {
2668
2668
macro_rules! err {
2669
2669
( $current: expr, $expected: expr) => {
2670
- if let Some ( current) = $current {
2671
- if Some ( current) != $expected {
2670
+ if let Some ( current) = & $current {
2671
+ if Some ( current) != $expected. as_ref ( ) {
2672
2672
return Err ( format!(
2673
- "ERROR: Setting `rust.{}` is incompatible with `rust.download-rustc`." ,
2674
- stringify!( $expected) . replace( "_" , "-" )
2673
+ "ERROR: Setting `rust.{}` is incompatible with `rust.download-rustc`. \
2674
+ Current value: {:?}, Expected value(s): None/{:?}",
2675
+ stringify!( $expected) . replace( "_" , "-" ) ,
2676
+ $current,
2677
+ $expected
2675
2678
) ) ;
2676
2679
} ;
2677
2680
} ;
0 commit comments