From 80c6d299d2eb531540205035a3ea87f43a6e858f Mon Sep 17 00:00:00 2001
From: David Herman <david.herman@gmail.com>
Date: Sat, 4 Aug 2018 12:24:32 -0700
Subject: [PATCH 1/2] Rename the `package.json` key to `"toolchain"`.

---
 crates/notion-core/src/serial/manifest.rs | 6 +++---
 package.json                              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/notion-core/src/serial/manifest.rs b/crates/notion-core/src/serial/manifest.rs
index 34c376d15..399cc4299 100644
--- a/crates/notion-core/src/serial/manifest.rs
+++ b/crates/notion-core/src/serial/manifest.rs
@@ -19,11 +19,11 @@ pub struct Manifest {
     #[serde(rename = "devDependencies")]
     pub dev_dependencies: HashMap<String, String>,
 
-    pub notion: Option<NotionManifest>,
+    pub toolchain: Option<ToolchainManifest>,
 }
 
 #[derive(Serialize, Deserialize)]
-pub struct NotionManifest {
+pub struct ToolchainManifest {
     pub node: String,
     pub yarn: Option<String>,
     // FIXME: this should be in the notion config file
@@ -32,7 +32,7 @@ pub struct NotionManifest {
 
 impl Manifest {
     pub fn into_manifest(self) -> Fallible<Option<manifest::Manifest>> {
-        if let Some(notion) = self.notion {
+        if let Some(notion) = self.toolchain {
             return Ok(Some(manifest::Manifest {
                 node: parse_requirements(&notion.node)?,
                 yarn: if let Some(yarn) = notion.yarn {
diff --git a/package.json b/package.json
index d56758f1a..2547270fe 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "devDependencies": {
     "ember-cli": "2.18.1"
   },
-  "notion": {
+  "toolchain": {
     "node": "6.11.1",
     "yarn": "1.7.0"
   }

From 6f594275b60e68b1dfb9489159ec63ace5d9c9e3 Mon Sep 17 00:00:00 2001
From: David Herman <david.herman@gmail.com>
Date: Sat, 4 Aug 2018 23:40:15 -0700
Subject: [PATCH 2/2] Update test fixture with `"toolchain"` key.

---
 crates/notion-core/fixtures/basic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/notion-core/fixtures/basic/package.json b/crates/notion-core/fixtures/basic/package.json
index ef5d3cde6..ff1c33ea1 100644
--- a/crates/notion-core/fixtures/basic/package.json
+++ b/crates/notion-core/fixtures/basic/package.json
@@ -11,7 +11,7 @@
     "@namespaced/something-else": "^6.3.7",
     "eslint": "~4.8.0"
   },
-  "notion": {
+  "toolchain": {
     "node": "6.11.1",
     "yarn": "1.2"
   }