From 564d9e43f5befae54224ad8688a84d914717cf65 Mon Sep 17 00:00:00 2001
From: Nick Parker <nick@nickbp.com>
Date: Mon, 22 Aug 2022 00:42:16 +1200
Subject: [PATCH] Actually nevermind, build-deps just seems to be broken now.

```
thread 'main' panicked at 'activated_features for invalid package: features did not find PackageId { name: "criterion", version: "0.3.6", source: "registry `crates-io`" } NormalOrDevOrArtifactTarget(None)', src/tools/cargo/src/cargo/core/resolver/features.rs:318:14
```
---
 Cargo.toml | 8 +++-----
 Dockerfile | 8 --------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6b1480f..5866469 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,8 +61,6 @@ futures-delay-queue = "0.5" # for benchmarks
 proptest = "1.0" # for property tests
 tempfile = "3" # for benchmarks
 
-# Hack to fix 'cargo build-deps' in Dockerfile:
-# Hide this bench section entirely, for whatever reason build-deps wants to see server.rs.
-[[bench]] # build-deps: skip
-name = "server" # build-deps: skip
-harness = false # build-deps: skip
+[[bench]]
+name = "server"
+harness = false
diff --git a/Dockerfile b/Dockerfile
index 9b4bf1f..ac5a856 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,14 +12,6 @@ RUN apt-get update \
   && cd / \
   && cargo new --bin originz
 
-# Build dependencies on their own as separate step to improve cached builds
-# (only copy Cargo.* to avoid source changes breaking this cache)
-COPY Cargo.toml Cargo.lock /originz
-# Hack: fix for "can't find `server` bench at `benches/server.rs` [...]"
-RUN cd /originz \
-  && sed -i 's/.*build-deps: skip.*//g' Cargo.toml \
-  && cargo build-deps --release
-
 COPY . /originz
 RUN cd /originz && cargo build --release
 
-- 
2.38.5