mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename manifest_version to manifest-version

Browse Source 
The current manifests encode this with a dash in the name, so we should preserve
that!
This commit is contained in:
Alex Crichton 2017-02-07 15:47:03 -08:00
parent a797b6e2fe
commit e53eaa385e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/tools/build-manifest/src/main.rs
View File

@ -11,7 +11,7 @@
extern crate toml; extern crate toml;
extern crate rustc_serialize; extern crate rustc_serialize;
use std::collections::HashMap; use std::collections::{BTreeMap, HashMap};
use std::env; use std::env;
use std::fs::File; use std::fs::File;
use std::io::{self, Read, Write}; use std::io::{self, Read, Write};
@ -95,7 +95,6 @@
"x86_64-pc-windows-gnu", "x86_64-pc-windows-gnu",
]; ];
#[derive(RustcEncodable)]
struct Manifest { struct Manifest {
manifest_version: String, manifest_version: String,
date: String, date: String,
@ -171,8 +170,18 @@ fn build(&mut self) {
self.cargo_version = self.version("cargo", "x86_64-unknown-linux-gnu"); self.cargo_version = self.version("cargo", "x86_64-unknown-linux-gnu");
self.digest_and_sign(); self.digest_and_sign();
let manifest = self.build_manifest(); let Manifest { manifest_version, date, pkg } = self.build_manifest();
let manifest = toml::encode(&manifest).to_string();
// Unfortunately we can't use derive(RustcEncodable) here because the
// version field is called `manifest-version`, not `manifest_version`.
// In lieu of that just create the table directly here with a `BTreeMap`
// and wrap it up in a `Value::Table`.
let mut manifest = BTreeMap::new();
manifest.insert("manifest-version".to_string(),
toml::encode(&manifest_version));
manifest.insert("date".to_string(), toml::encode(&date));
manifest.insert("pkg".to_string(), toml::encode(&pkg));
let manifest = toml::Value::Table(manifest).to_string();
let filename = format!("channel-rust-{}.toml", self.channel); let filename = format!("channel-rust-{}.toml", self.channel);
self.write_manifest(&manifest, &filename); self.write_manifest(&manifest, &filename);