This repository was archived by the owner on May 28, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +9
-0
lines changed Expand file tree Collapse file tree 4 files changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -398,6 +398,7 @@ pub enum Edition {
398398 Edition2015 ,
399399 Edition2018 ,
400400 Edition2021 ,
401+ Edition2024 ,
401402}
402403
403404impl Edition {
@@ -784,6 +785,7 @@ impl FromStr for Edition {
784785 "2015" => Edition :: Edition2015 ,
785786 "2018" => Edition :: Edition2018 ,
786787 "2021" => Edition :: Edition2021 ,
788+ "2024" => Edition :: Edition2024 ,
787789 _ => return Err ( ParseEditionError { invalid_input : s. to_string ( ) } ) ,
788790 } ;
789791 Ok ( res)
@@ -796,6 +798,7 @@ impl fmt::Display for Edition {
796798 Edition :: Edition2015 => "2015" ,
797799 Edition :: Edition2018 => "2018" ,
798800 Edition :: Edition2021 => "2021" ,
801+ Edition :: Edition2024 => "2024" ,
799802 } )
800803 }
801804}
Original file line number Diff line number Diff line change @@ -545,6 +545,8 @@ impl DefCollector<'_> {
545545 Edition :: Edition2015 => name ! [ rust_2015] ,
546546 Edition :: Edition2018 => name ! [ rust_2018] ,
547547 Edition :: Edition2021 => name ! [ rust_2021] ,
548+ // FIXME: update this when rust_2024 exists
549+ Edition :: Edition2024 => name ! [ rust_2021] ,
548550 } ;
549551
550552 let path_kind = match self . def_map . data . edition {
Original file line number Diff line number Diff line change @@ -330,6 +330,7 @@ impl CargoWorkspace {
330330 cargo_metadata:: Edition :: E2015 => Edition :: Edition2015 ,
331331 cargo_metadata:: Edition :: E2018 => Edition :: Edition2018 ,
332332 cargo_metadata:: Edition :: E2021 => Edition :: Edition2021 ,
333+ cargo_metadata:: Edition :: _E2024 => Edition :: Edition2024 ,
333334 _ => {
334335 tracing:: error!( "Unsupported edition `{:?}`" , edition) ;
335336 Edition :: CURRENT
Original file line number Diff line number Diff line change @@ -213,6 +213,8 @@ enum EditionData {
213213 Edition2018 ,
214214 #[ serde( rename = "2021" ) ]
215215 Edition2021 ,
216+ #[ serde( rename = "2024" ) ]
217+ Edition2024 ,
216218}
217219
218220impl From < EditionData > for Edition {
@@ -221,6 +223,7 @@ impl From<EditionData> for Edition {
221223 EditionData :: Edition2015 => Edition :: Edition2015 ,
222224 EditionData :: Edition2018 => Edition :: Edition2018 ,
223225 EditionData :: Edition2021 => Edition :: Edition2021 ,
226+ EditionData :: Edition2024 => Edition :: Edition2024 ,
224227 }
225228 }
226229}
You can’t perform that action at this time.
0 commit comments