diff --git a/files/0001-cargo-clipy-edition.patch b/files/0001-cargo-clipy-edition.patch deleted file mode 100644 --- a/files/0001-cargo-clipy-edition.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml -index 518c2caf6..ef02e1b66 100644 ---- a/src/tools/clippy/Cargo.toml -+++ b/src/tools/clippy/Cargo.toml -@@ -1,3 +1,5 @@ -+cargo-features = ["edition"] -+ - [package] - name = "clippy" - version = "0.0.212" -diff --git a/src/tools/clippy/clippy_dev/Cargo.toml b/src/tools/clippy/clippy_dev/Cargo.toml -index 5380ecd98..4e3c7a250 100644 ---- a/src/tools/clippy/clippy_dev/Cargo.toml -+++ b/src/tools/clippy/clippy_dev/Cargo.toml -@@ -1,3 +1,5 @@ -+cargo-features = ["edition"] -+ - [package] - name = "clippy_dev" - version = "0.0.1" -diff --git a/src/tools/clippy/clippy_lints/Cargo.toml b/src/tools/clippy/clippy_lints/Cargo.toml -index 8907dd365..15da5d658 100644 ---- a/src/tools/clippy/clippy_lints/Cargo.toml -+++ b/src/tools/clippy/clippy_lints/Cargo.toml -@@ -1,3 +1,5 @@ -+cargo-features = ["edition"] -+ - [package] - name = "clippy_lints" - # begin automatic update -diff --git a/src/tools/clippy/rustc_tools_util/Cargo.toml b/src/tools/clippy/rustc_tools_util/Cargo.toml -index 020de6c33..01dca0a65 100644 ---- a/src/tools/clippy/rustc_tools_util/Cargo.toml -+++ b/src/tools/clippy/rustc_tools_util/Cargo.toml -@@ -1,3 +1,5 @@ -+cargo-features = ["edition"] -+ - [package] - name = "rustc_tools_util" - version = "0.1.0" -diff --git a/src/tools/miri/Cargo.toml b/src/tools/miri/Cargo.toml -index f79609c76..669a5d56c 100644 ---- a/src/tools/miri/Cargo.toml -+++ b/src/tools/miri/Cargo.toml -@@ -1,5 +1,3 @@ --cargo-features = ["default-run"] -- - [package] - authors = ["Scott Olson "] - description = "An experimental interpreter for Rust MIR." -diff --git a/src/tools/rls/Cargo.toml b/src/tools/rls/Cargo.toml -index 974b7fda0..73582d0c5 100644 ---- a/src/tools/rls/Cargo.toml -+++ b/src/tools/rls/Cargo.toml -@@ -1,3 +1,5 @@ -+cargo-features = ["edition"] -+ - [package] - name = "rls" - version = "1.31.6" diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : cargo version : 0.32.0 -release : 15 +release : 16 source : - https://static.rust-lang.org/dist/rustc-1.31.0-src.tar.gz : 9ad54dc0baf1db5fc6a79d54e71c439c82aff85cd96778978456f2958211ef06 license : @@ -13,8 +13,7 @@ component : programming summary : The Rust package manager description: | - Cargo is a tool that allows Rust projects to declare their various - dependencies and ensure that you'll always get a repeatable build. + Cargo is a tool that allows Rust projects to declare their various dependencies and ensure that you'll always get a repeatable build. networking : yes builddeps : - pkgconfig(libssl) @@ -24,7 +23,6 @@ rundeps : - rust build : | - %patch -p1 < $pkgfiles/0001-cargo-clipy-edition.patch cd src/tools/cargo cargo build %JOBS% --release install : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -13,16 +13,14 @@ BSD-3-Clause programming The Rust package manager - Cargo is a tool that allows Rust projects to declare their various -dependencies and ensure that you'll always get a repeatable build. + Cargo is a tool that allows Rust projects to declare their various dependencies and ensure that you'll always get a repeatable build. https://solus-project.com/sources/README.Solus cargo The Rust package manager - Cargo is a tool that allows Rust projects to declare their various -dependencies and ensure that you'll always get a repeatable build. + Cargo is a tool that allows Rust projects to declare their various dependencies and ensure that you'll always get a repeatable build. programming @@ -112,7 +110,7 @@ - + 2018-12-07 0.32.0 Packaging update