@@ -239,7 +239,12 @@ impl Builder {
239
239
self . package ( "rust-std" , & mut manifest. pkg , TARGETS ) ;
240
240
self . package ( "rust-docs" , & mut manifest. pkg , TARGETS ) ;
241
241
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 ) ;
243
248
self . package ( "rust-analysis" , & mut manifest. pkg , TARGETS ) ;
244
249
245
250
let mut pkg = Package {
@@ -276,7 +281,7 @@ impl Builder {
276
281
}
277
282
278
283
extensions. push ( Component {
279
- pkg : "rls" . to_string ( ) ,
284
+ pkg : rls_package_name . to_string ( ) ,
280
285
target : host. to_string ( ) ,
281
286
} ) ;
282
287
extensions. push ( Component {
@@ -353,7 +358,7 @@ impl Builder {
353
358
format ! ( "rust-src-{}.tar.gz" , self . rust_release)
354
359
} else if component == "cargo" {
355
360
format ! ( "cargo-{}-{}.tar.gz" , self . cargo_release, target)
356
- } else if component == "rls" {
361
+ } else if component == "rls" || component == "rls-preview" {
357
362
format ! ( "rls-{}-{}.tar.gz" , self . rls_release, target)
358
363
} else {
359
364
format ! ( "{}-{}-{}.tar.gz" , component, self . rust_release, target)
@@ -363,7 +368,7 @@ impl Builder {
363
368
fn cached_version ( & self , component : & str ) -> & str {
364
369
if component == "cargo" {
365
370
& self . cargo_version
366
- } else if component == "rls" {
371
+ } else if component == "rls" || component == "rls-preview" {
367
372
& self . rls_version
368
373
} else {
369
374
& self . rust_version
0 commit comments