Feature gate epoches

diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs
index 30c2b433ffc1e99e4d2063392f3d1d34f0a4a840..10597e55ee6251fe81decd558f6fb64577f2f0c4 100644 (file)
--- a/src/cargo/core/features.rs
+++ b/src/cargo/core/features.rs
@@ -146,6 +146,9 @@ features! {
 
         // Downloading packages from alternative registry indexes.
         [unstable] alternative_registries: bool,
+
+        // Using epochs
+        [unstable] epoch: bool,
     }
 }
 

diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs
index d2e47a692c4a55bfc660d2d79eb86d4d98a54b1c..623d794af82b3242a209e00aa08f69b79700c4aa 100644 (file)
--- a/src/cargo/util/toml/mod.rs
+++ b/src/cargo/util/toml/mod.rs
@@ -718,6 +718,9 @@ impl TomlManifest {
         };
 
         let epoch = if let Some(ref epoch) = project.epoch {
+            features.require(Feature::epoch()).chain_err(|| {
+                "epoches are unstable"
+            })?;
             if let Ok(epoch) = epoch.parse() {
                 epoch
             } else {