about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-02-10 23:41:34 -0500
committerGitHub <noreply@github.com>2017-02-10 23:41:34 -0500
commit4269e5207eff7d653e232516f4d612fb3d19fa4a (patch)
tree64551c03a0009f5d4e8308e20b5a036489d83e40 /src/tools
parentbf750890c986defa0daad7d50b509497496565f0 (diff)
parentde59d5d73775f8ccf948480cbd5d90dc72e1b40f (diff)
Rollup merge of #39676 - alexcrichton:fix-again, r=brson
Actually fix manifest generation

The previous fix contained an error where `toml::encode` returned a runtime
error, so this version just constructs a literal `toml::Value`.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/build-manifest/src/main.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
index 6fe8b96b75b..991cd02d215 100644
--- a/src/tools/build-manifest/src/main.rs
+++ b/src/tools/build-manifest/src/main.rs
@@ -179,8 +179,8 @@ impl Builder {
         // 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));
+                        toml::Value::String(manifest_version));
+        manifest.insert("date".to_string(), toml::Value::String(date));
         manifest.insert("pkg".to_string(), toml::encode(&pkg));
         let manifest = toml::Value::Table(manifest).to_string();