aboutsummaryrefslogtreecommitdiffstats
path: root/community/firefox/allow-custom-rust-vendor.patch
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-03-14 00:29:06 +0100
committerRasmus Thomsen <oss@cogitri.dev>2020-03-14 08:21:20 +0100
commit1d258f723c31c630b8159e94a980ef430a9ea27b (patch)
tree8c46a4488ad43da40f4a1252dc09088edf9f8c2b /community/firefox/allow-custom-rust-vendor.patch
parentfe087d48122cfc78dd63956f2d89805b797ac408 (diff)
downloadaports-1d258f723c31c630b8159e94a980ef430a9ea27b.tar.bz2
aports-1d258f723c31c630b8159e94a980ef430a9ea27b.tar.xz
community/firefox: security upgrade to 74.0
Diffstat (limited to 'community/firefox/allow-custom-rust-vendor.patch')
-rw-r--r--community/firefox/allow-custom-rust-vendor.patch40
1 files changed, 20 insertions, 20 deletions
diff --git a/community/firefox/allow-custom-rust-vendor.patch b/community/firefox/allow-custom-rust-vendor.patch
index c20ca46acb..218650f411 100644
--- a/community/firefox/allow-custom-rust-vendor.patch
+++ b/community/firefox/allow-custom-rust-vendor.patch
@@ -13,8 +13,8 @@ Fixes #33.
diff --git a/src/targets.rs b/src/targets.rs
index 6ae570e..90b2736 100644
---- a/third_party/rust/target-lexicon/src/targets.rs
-+++ b/third_party/rust/target-lexicon/src/targets.rs
+--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
@@ -1,6 +1,8 @@
// This file defines all the identifier enums and target-aware logic.
@@ -165,8 +165,8 @@ index 6ae570e..90b2736 100644
}
diff --git a/src/triple.rs b/src/triple.rs
index 36dcd9a..1abda26 100644
---- a/third_party/rust/target-lexicon/src/triple.rs
-+++ b/third_party/rust/target-lexicon/src/triple.rs
+--- a/third_party/rust/target-lexicon.0.9.0/src/triple.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/triple.rs
@@ -322,10 +322,6 @@ mod tests {
Triple::from_str("foo"),
Err(ParseError::UnrecognizedArchitecture("foo".to_owned()))
@@ -190,8 +190,8 @@ Subject: [PATCH 2/7] Add more tests.
diff --git a/src/targets.rs b/src/targets.rs
index 90b2736..7d1f069 100644
---- a/third_party/rust/target-lexicon/src/targets.rs
-+++ b/third_party/rust/target-lexicon/src/targets.rs
+--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
@@ -1174,6 +1174,7 @@ mod tests {
#[test]
@@ -256,8 +256,8 @@ Subject: [PATCH 3/7] Use `.chars().any(...)` instead of
diff --git a/src/targets.rs b/src/targets.rs
index 7d1f069..1078dd3 100644
---- a/third_party/rust/target-lexicon/src/targets.rs
-+++ b/third_party/rust/target-lexicon/src/targets.rs
+--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
++++ b/third_party/rust/target-lexicon/src-0.9.0/targets.rs
@@ -779,12 +779,9 @@ impl FromStr for Vendor {
}
@@ -287,8 +287,8 @@ Subject: [PATCH 4/7] Fix build.rs to generate the correct code to build
diff --git a/build.rs b/build.rs
index a0ba3b7..446f9e7 100644
---- a/third_party/rust/target-lexicon/build.rs
-+++ b/third_party/rust/target-lexicon/build.rs
+--- a/third_party/rust/target-lexicon-0.9.0/build.rs
++++ b/third_party/rust/target-lexicon-0.9.0/build.rs
@@ -32,6 +32,7 @@ mod parse_error {
}
}
@@ -342,8 +342,8 @@ Subject: [PATCH 5/7] Fix custom vendors in `const fn` contexts.
diff --git a/build.rs b/build.rs
index 446f9e7..e88206e 100644
---- a/third_party/rust/target-lexicon/build.rs
-+++ b/third_party/rust/target-lexicon/build.rs
+--- a/third_party/rust/target-lexicon-0.9.0/build.rs
++++ b/third_party/rust/target-lexicon-0.9.0/build.rs
@@ -53,6 +53,8 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
writeln!(out, "use crate::Aarch64Architecture::*;")?;
writeln!(out, "#[allow(unused_imports)]")?;
@@ -382,8 +382,8 @@ index 446f9e7..e88206e 100644
}
diff --git a/src/lib.rs b/src/lib.rs
index 8d6da8d..70f6488 100644
---- a/third_party/rust/target-lexicon/src/lib.rs
-+++ b/third_party/rust/target-lexicon/src/lib.rs
+--- a/third_party/rust/target-lexicon-0.9.0/src/lib.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/lib.rs
@@ -28,7 +28,7 @@ mod triple;
pub use self::host::HOST;
pub use self::parse_error::ParseError;
@@ -396,8 +396,8 @@ index 8d6da8d..70f6488 100644
pub use self::triple::{CallingConvention, Endianness, PointerWidth, Triple};
diff --git a/src/targets.rs b/src/targets.rs
index 1078dd3..7152020 100644
---- a/third_party/rust/target-lexicon/src/targets.rs
-+++ b/third_party/rust/target-lexicon/src/targets.rs
+--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
@@ -4,6 +4,7 @@ use crate::triple::{Endianness, PointerWidth, Triple};
use alloc::boxed::Box;
use alloc::string::String;
@@ -521,8 +521,8 @@ Subject: [PATCH 6/7] Add a testcase with a BOM too, just in case.
diff --git a/src/targets.rs b/src/targets.rs
index 7152020..9a4d990 100644
---- a/third_party/rust/target-lexicon/src/targets.rs
-+++ b/third_party/rust/target-lexicon/src/targets.rs
+--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
@@ -1246,6 +1246,10 @@ mod tests {
Triple::from_str("x86_64-custom‍vendor-linux").is_err(),
"zero-width character hazard"
@@ -547,8 +547,8 @@ Subject: [PATCH 7/7] Use an anonymous function instead of just a local
diff --git a/src/targets.rs b/src/targets.rs
index 9a4d990..eb5a088 100644
---- a/third_party/rust/target-lexicon/src/targets.rs
-+++ b/third_party/rust/target-lexicon/src/targets.rs
+--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
@@ -813,10 +813,9 @@ impl FromStr for Vendor {
}