@@ -239,7 +239,12 @@ impl Builder {
239239 self . package ( "rust-std" , & mut manifest. pkg , TARGETS ) ;
240240 self . package ( "rust-docs" , & mut manifest. pkg , TARGETS ) ;
241241 self . package ( "rust-src" , & mut manifest. pkg , & [ "*" ] ) ;
242- self . package ( "rls" , & mut manifest. pkg , HOSTS ) ;
242+ let rls_package_name = if self . rust_release == "nightly" {
243+ "rls"
244+ } else {
245+ "rls-preview"
246+ } ;
247+ self . package ( rls_package_name, & mut manifest. pkg , HOSTS ) ;
243248 self . package ( "rust-analysis" , & mut manifest. pkg , TARGETS ) ;
244249
245250 let mut pkg = Package {
@@ -276,7 +281,7 @@ impl Builder {
276281 }
277282
278283 extensions. push ( Component {
279- pkg : "rls" . to_string ( ) ,
284+ pkg : rls_package_name . to_string ( ) ,
280285 target : host. to_string ( ) ,
281286 } ) ;
282287 extensions. push ( Component {
@@ -353,7 +358,7 @@ impl Builder {
353358 format ! ( "rust-src-{}.tar.gz" , self . rust_release)
354359 } else if component == "cargo" {
355360 format ! ( "cargo-{}-{}.tar.gz" , self . cargo_release, target)
356- } else if component == "rls" {
361+ } else if component == "rls" || component == "rls-preview" {
357362 format ! ( "rls-{}-{}.tar.gz" , self . rls_release, target)
358363 } else {
359364 format ! ( "{}-{}-{}.tar.gz" , component, self . rust_release, target)
@@ -363,7 +368,7 @@ impl Builder {
363368 fn cached_version ( & self , component : & str ) -> & str {
364369 if component == "cargo" {
365370 & self . cargo_version
366- } else if component == "rls" {
371+ } else if component == "rls" || component == "rls-preview" {
367372 & self . rls_version
368373 } else {
369374 & self . rust_version
0 commit comments