@@ -25,7 +25,6 @@ extern crate structopt;
25
25
extern crate tar;
26
26
extern crate tee;
27
27
extern crate tempdir;
28
- extern crate toml;
29
28
extern crate xz2;
30
29
31
30
use std:: env;
@@ -50,7 +49,6 @@ use structopt::StructOpt;
50
49
use tar:: Archive ;
51
50
use tee:: TeeReader ;
52
51
use tempdir:: TempDir ;
53
- use toml:: Value ;
54
52
use xz2:: read:: XzDecoder ;
55
53
56
54
/// The first commit which build artifacts are made available through the CI for
@@ -197,33 +195,15 @@ impl Bound {
197
195
Bound :: Commit ( commit) => Ok ( Bound :: Commit ( commit) ) ,
198
196
Bound :: Date ( date) => {
199
197
let date_str = date. format ( "%Y-%m-%d" ) ;
200
- let url = format ! ( "{}/{}/channel-rust-nightly.toml " , NIGHTLY_SERVER , date_str) ;
198
+ let url = format ! ( "{}/{}/channel-rust-nightly-git-commit-hash.txt " , NIGHTLY_SERVER , date_str) ;
201
199
202
200
eprintln ! ( "fetching {}" , url) ;
203
201
let client = Client :: new ( ) ;
204
202
let name = format ! ( "nightly manifest {}" , date_str) ;
205
203
let ( response, mut bar) = download_progress ( & client, & name, & url) ?;
206
204
let mut response = TeeReader :: new ( response, & mut bar) ;
207
- let mut toml_buf = String :: new ( ) ;
208
- response. read_to_string ( & mut toml_buf) ?;
209
-
210
- let manifest = toml_buf. parse :: < Value > ( ) . unwrap ( ) ;
211
-
212
- let commit = match manifest {
213
- Value :: Table ( t) => match t. get ( "pkg" ) {
214
- Some ( & Value :: Table ( ref t) ) => match t. get ( "rust" ) {
215
- Some ( & Value :: Table ( ref t) ) => match t. get ( "git_commit_hash" ) {
216
- Some ( & Value :: String ( ref hash) ) => hash. to_owned ( ) ,
217
- _ => bail ! (
218
- "not a rustup manifest (no valid git_commit_hash key under rust"
219
- ) ,
220
- } ,
221
- _ => bail ! ( "not a rustup manifest (no rust key under pkg)" ) ,
222
- } ,
223
- _ => bail ! ( "not a rustup manifest (missing pkg key)" ) ,
224
- } ,
225
- _ => bail ! ( "not a rustup manifest (not a table at root)" ) ,
226
- } ;
205
+ let mut commit = String :: new ( ) ;
206
+ response. read_to_string ( & mut commit) ?;
227
207
228
208
eprintln ! ( "converted {} to {}" , date_str, commit) ;
229
209
0 commit comments