From 87db93687e3bd175d9032fe65765018917712ec0 Mon Sep 17 00:00:00 2001 From: Lukas Piatkowski Date: Mon, 19 Oct 2020 07:19:37 -0700 Subject: [PATCH] rust/shed/hostname: rename hostname dependency to unbreak doctests (#15) Summary: Pull Request resolved: https://github.com/facebookexperimental/rust-shed/pull/15 With the update from rustc 1.44 to 1.47 the doctests started to break when building a crate that depends on a different crate of the same name, see this: https://github.com/rust-lang/cargo/issues/6819 This diff also removes the TravisCI build as it was broken and unused for some time. Reviewed By: krallin Differential Revision: D24390815 fbshipit-source-id: fa9c78ef394640afbf8c419f8276bbf339960406 --- build/fbcode_builder/specs/rust_shed.py | 24 --------------------- eden/mononoke/mercurial/mutation/Cargo.toml | 2 +- eden/mononoke/mononoke_types/Cargo.toml | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 build/fbcode_builder/specs/rust_shed.py diff --git a/build/fbcode_builder/specs/rust_shed.py b/build/fbcode_builder/specs/rust_shed.py deleted file mode 100644 index f60b7ec023110..0000000000000 --- a/build/fbcode_builder/specs/rust_shed.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) Facebook, Inc. and its affiliates. -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -from shell_quoting import path_join -import specs.fbthrift as fbthrift - - -def fbcode_builder_spec(builder): - builder.enable_rust_toolchain() - return { - "depends_on": [fbthrift], - "steps": [ - builder.set_env( - "THRIFT", path_join(builder.option("prefix"), "bin", "thrift1") - ), - builder.fb_github_cargo_build( - "rust-shed/", github_org="facebookexperimental" - ), - ], - } diff --git a/eden/mononoke/mercurial/mutation/Cargo.toml b/eden/mononoke/mercurial/mutation/Cargo.toml index 3754a62e5a891..313c5b9874f08 100644 --- a/eden/mononoke/mercurial/mutation/Cargo.toml +++ b/eden/mononoke/mercurial/mutation/Cargo.toml @@ -27,7 +27,7 @@ async-trait = "0.1.29" futures = { version = "0.3.5", features = ["async-await", "compat"] } serde_json = "1.0" slog = { version = "2.5", features = ["max_level_debug"] } -smallvec = { version = "=1.4.1", features = [ "serde", "specialization", "union" ] } +smallvec = { version = "1.4.2", features = [ "serde", "specialization", "union" ] } [dev-dependencies] mercurial_types-mocks = { path = "../types/mocks" } diff --git a/eden/mononoke/mononoke_types/Cargo.toml b/eden/mononoke/mononoke_types/Cargo.toml index 1946cba87a3af..8ba0153a929aa 100644 --- a/eden/mononoke/mononoke_types/Cargo.toml +++ b/eden/mononoke/mononoke_types/Cargo.toml @@ -35,7 +35,7 @@ rand = { version = "0.7", features = ["small_rng"] } regex = "1.3.7" serde = { version = "1.0", features = ["derive", "rc"] } serde_derive = "1.0" -smallvec = { version = "=1.4.1", features = [ "serde", "specialization", "union" ] } +smallvec = { version = "1.4.2", features = [ "serde", "specialization", "union" ] } thiserror = "1.0" [dev-dependencies]