diff options
author | Rasmus Thomsen <oss@cogitri.dev> | 2019-07-07 22:34:53 +0200 |
---|---|---|
committer | Leo <thinkabit.ukim@gmail.com> | 2019-08-30 02:59:13 -0300 |
commit | 6c8381ba967cd3842484965f3f7c1200a42a5539 (patch) | |
tree | f2f504337d74d67be7ecd204e8d3ec531139b602 /community/rust/cargo-tests-fix-package-include-exclude.patch | |
parent | 7184ba0dd972247e83d1e0204c1f43c247ad84e5 (diff) | |
download | aports-6c8381ba967cd3842484965f3f7c1200a42a5539.tar.bz2 aports-6c8381ba967cd3842484965f3f7c1200a42a5539.tar.xz |
community/rust: upgrade to 1.37.0, enable on aarch64&x86 again
Use upstream triplets for now, rust doesn't seem to want to work with our
triplets...
See https://github.com/rust-lang/rust/issues/62447
Diffstat (limited to 'community/rust/cargo-tests-fix-package-include-exclude.patch')
-rw-r--r-- | community/rust/cargo-tests-fix-package-include-exclude.patch | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/community/rust/cargo-tests-fix-package-include-exclude.patch b/community/rust/cargo-tests-fix-package-include-exclude.patch deleted file mode 100644 index 4cdf21314b..0000000000 --- a/community/rust/cargo-tests-fix-package-include-exclude.patch +++ /dev/null @@ -1,92 +0,0 @@ -From dd998a096b0e04bea7d84a8e975d84d820b725f0 Mon Sep 17 00:00:00 2001 -From: Ximin Luo <infinity0@pwned.gg> -Date: Sun, 4 Nov 2018 08:59:20 -0800 -Subject: [PATCH] Fix package::include/exclude tests so they work even if - running them not in cargo.git - ---- - src/tools/cargo/tests/testsuite/package.rs | 22 ++++++++++++++-------- - 1 file changed, 14 insertions(+), 8 deletions(-) - -diff --git a/src/tools/cargo/tests/testsuite/package.rs b/src/tools/cargo/tests/testsuite/package.rs -index b9c1cae045..d34951f89b 100644 ---- a/src/tools/cargo/tests/testsuite/package.rs -+++ b/src/tools/cargo/tests/testsuite/package.rs -@@ -285,7 +285,8 @@ dependency `bar` does not specify a version. - - #[test] - fn exclude() { -- let p = project() -+ let root = paths::root().join("exclude"); -+ let repo = git::repo(&root) - .file("Cargo.toml", r#" - [project] - name = "foo" -@@ -348,7 +349,8 @@ fn exclude() { - .file("some_dir/dir_deep_5/some_dir/file", "") - .build(); - -- p.cargo("package --no-verify -v") -+ cargo_process("package --no-verify -v") -+ .cwd(repo.root()) - .with_stdout("") - .with_stderr( - "\ -@@ -366,7 +368,6 @@ See [..] - See [..] - [WARNING] [..] file `some_dir/file_deep_1` WILL be excluded [..] - See [..] --[WARNING] No (git) Cargo.toml found at `[..]` in workdir `[..]` - [PACKAGING] foo v0.0.1 ([..]) - [ARCHIVING] [..] - [ARCHIVING] [..] -@@ -386,14 +387,17 @@ See [..] - [ARCHIVING] [..] - [ARCHIVING] [..] - [ARCHIVING] [..] -+[ARCHIVING] .cargo_vcs_info.json - ", - ).run(); - -- assert!(p.root().join("target/package/foo-0.0.1.crate").is_file()); -+ assert!(repo.root().join("target/package/foo-0.0.1.crate").is_file()); - -- p.cargo("package -l") -+ cargo_process("package -l") -+ .cwd(repo.root()) - .with_stdout( - "\ -+.cargo_vcs_info.json - Cargo.toml - dir_root_1/some_dir/file - dir_root_2/some_dir/file -@@ -418,7 +422,8 @@ src/main.rs - - #[test] - fn include() { -- let p = project() -+ let root = paths::root().join("include"); -+ let repo = git::repo(&root) - .file("Cargo.toml", r#" - [project] - name = "foo" -@@ -432,16 +437,17 @@ fn include() { - .file("src/bar.txt", "") // should be ignored when packaging - .build(); - -- p.cargo("package --no-verify -v") -+ cargo_process("package --no-verify -v") -+ .cwd(repo.root()) - .with_stderr( - "\ - [WARNING] manifest has no description[..] - See http://doc.crates.io/manifest.html#package-metadata for more info. --[WARNING] No (git) Cargo.toml found at `[..]` in workdir `[..]` - [PACKAGING] foo v0.0.1 ([..]) - [ARCHIVING] [..] - [ARCHIVING] [..] - [ARCHIVING] [..] -+[ARCHIVING] .cargo_vcs_info.json - ", - ).run(); - } |