+++ /dev/null
-From 0dfe70f7e1384620e0e38c7bf58147e95be5e638 Mon Sep 17 00:00:00 2001
-From: Esteban Kuber <esteban@kuber.com.ar>
-Date: Wed, 24 Nov 2021 05:59:42 +0000
-Subject: [PATCH] Change test to not trigger emoji error
-
-This change is needed to land rust-lang/rust#88781, as it changes the
-handling of emojis in source code to treat them as identifiers.
-
-Applied-Upstream: 0.59.0
----
- tests/testsuite/doc.rs | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs
-index 965e7eaa9bd..6bcdd2d02cf 100644
---- a/tests/testsuite/doc.rs
-+++ b/tests/testsuite/doc.rs
-@@ -803,7 +803,7 @@ fn output_not_captured() {
- "a/src/lib.rs",
- "
- /// ```
-- /// ☃
-+ /// `
- /// ```
- pub fn foo() {}
- ",
-@@ -811,9 +811,7 @@ fn output_not_captured() {
- .build();
-
- p.cargo("doc")
-- .without_status()
-- .with_stderr_contains("[..]☃")
-- .with_stderr_contains(r"[..]unknown start of token: \u{2603}")
-+ .with_stderr_contains("[..]unknown start of token: `")
- .run();
- }
-
+++ /dev/null
-From d92dceaeba18e826eca4ae672356cdca0f8803cb Mon Sep 17 00:00:00 2001
-From: Weihang Lo <me@weihanglo.tw>
-Date: Tue, 21 Dec 2021 02:59:41 +0800
-Origin: https://github.com/rust-lang/cargo/pull/10214
-Subject: Remove `build_script::build_script_scan_eacces` test case
-
-Remove the test because cargo ignores it and returns its path during a
-`cargo build`. The caller still has a chance to hit the IO error if they
-does access it.
-
-The original patch is part of a patchset for loop detection, but the
-loop content has been edited out to only contain the test removal.
-
----
- tests/testsuite/build.rs | 6 ++-
- tests/testsuite/build_script.rs | 69 ---------------------------------
- tests/testsuite/package.rs | 7 ++--
- 3 files changed, 8 insertions(+), 74 deletions(-)
-
-diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs
-index 0a98abe3893..40d8067d548 100644
---- a/tests/testsuite/build_script.rs
-+++ b/tests/testsuite/build_script.rs
-@@ -4618,69 +4618,6 @@ fn links_interrupted_can_restart() {
- .run();
- }
-
--#[cargo_test]
--#[cfg(unix)]
--fn build_script_scan_eacces() {
-- // build.rs causes a scan of the whole project, which can be a problem if
-- // a directory is not accessible.
-- use cargo_test_support::git;
-- use std::os::unix::fs::PermissionsExt;
--
-- let p = project()
-- .file("src/lib.rs", "")
-- .file("build.rs", "fn main() {}")
-- .file("secrets/stuff", "")
-- .build();
-- let path = p.root().join("secrets");
-- fs::set_permissions(&path, fs::Permissions::from_mode(0o0)).unwrap();
-- // The last "Caused by" is a string from libc such as the following:
-- // Permission denied (os error 13)
-- p.cargo("build")
-- .with_stderr(
-- "\
--[ERROR] failed to determine package fingerprint for build script for foo v0.0.1 ([..]/foo)
--
--Caused by:
-- failed to determine the most recently modified file in [..]/foo
--
--Caused by:
-- failed to determine list of files in [..]/foo
--
--Caused by:
-- cannot read \"[..]/foo/secrets\"
--
--Caused by:
-- [..]
--",
-- )
-- .with_status(101)
-- .run();
--
-- // Try `package.exclude` to skip a directory.
-- p.change_file(
-- "Cargo.toml",
-- r#"
-- [package]
-- name = "foo"
-- version = "0.0.1"
-- exclude = ["secrets"]
-- "#,
-- );
-- p.cargo("build").run();
--
-- // Try with git. This succeeds because the git status walker ignores
-- // directories it can't access.
-- p.change_file("Cargo.toml", &basic_manifest("foo", "0.0.1"));
-- p.build_dir().rm_rf();
-- let repo = git::init(&p.root());
-- git::add(&repo);
-- git::commit(&repo);
-- p.cargo("build").run();
--
-- // Restore permissions so that the directory can be deleted.
-- fs::set_permissions(&path, fs::Permissions::from_mode(0o755)).unwrap();
--}
--
- #[cargo_test]
- fn dev_dep_with_links() {
- let p = project()
+++ /dev/null
-Already in debcargo-conf.git, can be deleted for next source import.
-
-The upstream code uses -march but not -mfpu on debian armhf, this works
-with gcc-10 but produces an error with gcc-11, set mfpu to fix this.
-
---- a/vendor/cc/src/lib.rs 1973-11-29 21:33:09.000000000 +0000
-+++ b/vendor/cc/src/lib.rs 2021-10-23 23:05:21.409460780 +0000
-@@ -1638,6 +1638,10 @@
- && (target.contains("-linux-") || target.contains("-kmc-solid_"))
- {
- cmd.args.push("-march=armv7-a".into());
-+ if target.ends_with("eabihf") {
-+ // lowest common denominator FPU
-+ cmd.args.push("-mfpu=vfpv3-d16".into());
-+ }
- }
-
- // (x86 Android doesn't say "eabi")
+++ /dev/null
-Already in debcargo-conf.git, can be deleted for next source import.
-
---- a/vendor/curl-sys/build.rs
-+++ b/vendor/curl-sys/build.rs
-@@ -4,7 +4,6 @@
- use std::process::Command;
-
- fn main() {
-- println!("cargo:rerun-if-changed=curl");
- let host = env::var("HOST").unwrap();
- let target = env::var("TARGET").unwrap();
- let windows = target.contains("windows");
+++ /dev/null
-Bug: https://github.com/rust-lang/cargo/issues/10004
-
---- a/src/cargo/core/source/source_id.rs
-+++ b/src/cargo/core/source/source_id.rs
-@@ -621,7 +621,13 @@
- fn test_cratesio_hash() {
- let config = Config::default().unwrap();
- let crates_io = SourceId::crates_io(&config).unwrap();
-- assert_eq!(crate::util::hex::short_hash(&crates_io), "1ecc6299db9ec823");
-+ assert!([
-+ "1ecc6299db9ec823", // 64 LE
-+ "1285ae84e5963aae", // 32 LE
-+ "eae4ba8cbf2ce1c7", // 64 BE
-+ "b420f105fcaca6de", // 32 BE
-+ ]
-+ .contains(&crate::util::hex::short_hash(&crates_io).as_str()));
- }
-
- /// A `Display`able view into a `SourceId` that will write it as a url
-0001-Change-test-to-not-trigger-emoji-error.patch
-0002-Remove-eacces-test.patch
-
2002_disable-net-tests.patch
-2110-use-mfpu-on-armhf.patch
-2111-curl-no-rebuild.patch
-
-2112-handle-4-siphasher-algorithms.patch
2200-workaround-x32-test.patch
projects / cargo.git / commitdiff