@@ -14,7 +14,7 @@ use std::process::Command;
1414use build_helper:: { self , output, t} ;
1515
1616use crate :: builder:: { Builder , Compiler , Kind , RunConfig , ShouldRun , Step } ;
17- use crate :: cache:: { Interned , INTERNER } ;
17+ use crate :: cache:: Interned ;
1818use crate :: compile;
1919use crate :: config:: TargetSelection ;
2020use crate :: dist;
@@ -1613,55 +1613,6 @@ impl Step for CrateLibrustc {
16131613 }
16141614}
16151615
1616- #[ derive( Debug , Copy , Clone , PartialEq , Eq , Hash ) ]
1617- pub struct CrateNotDefault {
1618- compiler : Compiler ,
1619- target : TargetSelection ,
1620- test_kind : TestKind ,
1621- krate : & ' static str ,
1622- }
1623-
1624- impl Step for CrateNotDefault {
1625- type Output = ( ) ;
1626-
1627- fn should_run ( run : ShouldRun < ' _ > ) -> ShouldRun < ' _ > {
1628- run. path ( "src/librustc_asan" )
1629- . path ( "src/librustc_lsan" )
1630- . path ( "src/librustc_msan" )
1631- . path ( "src/librustc_tsan" )
1632- }
1633-
1634- fn make_run ( run : RunConfig < ' _ > ) {
1635- let builder = run. builder ;
1636- let compiler = builder. compiler ( builder. top_stage , run. build_triple ( ) ) ;
1637-
1638- let test_kind = builder. kind . into ( ) ;
1639-
1640- builder. ensure ( CrateNotDefault {
1641- compiler,
1642- target : run. target ,
1643- test_kind,
1644- krate : match run. path {
1645- _ if run. path . ends_with ( "src/librustc_asan" ) => "rustc_asan" ,
1646- _ if run. path . ends_with ( "src/librustc_lsan" ) => "rustc_lsan" ,
1647- _ if run. path . ends_with ( "src/librustc_msan" ) => "rustc_msan" ,
1648- _ if run. path . ends_with ( "src/librustc_tsan" ) => "rustc_tsan" ,
1649- _ => panic ! ( "unexpected path {:?}" , run. path) ,
1650- } ,
1651- } ) ;
1652- }
1653-
1654- fn run ( self , builder : & Builder < ' _ > ) {
1655- builder. ensure ( Crate {
1656- compiler : self . compiler ,
1657- target : self . target ,
1658- mode : Mode :: Std ,
1659- test_kind : self . test_kind ,
1660- krate : INTERNER . intern_str ( self . krate ) ,
1661- } ) ;
1662- }
1663- }
1664-
16651616#[ derive( Debug , Copy , Clone , PartialEq , Eq , PartialOrd , Ord , Hash ) ]
16661617pub struct Crate {
16671618 pub compiler : Compiler ,
0 commit comments