Skip to content

Commit 13edda7

Browse files
committed
restore leading space on empty lines in patch files
git apply generally does not care, except for CRLF line endings with CRLF line endings if an empty line in the patch context does not have a leading space it results in a "corrupt patch" error
1 parent 81f60e4 commit 13edda7

20 files changed

+28
-28
lines changed

collector/compile-benchmarks/coercions/0-println.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ index 3fb7c5f..63e7f0f 100644
55
@@ -65574,4 +65574,4 @@ pub static MAPPING: [&'static str; 0xffff] = [
66
"",
77
];
8-
8+
99
-fn main() { }
1010
+fn main() { println!("test"); }

collector/compile-benchmarks/inflate/0-println.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ index b5f3996..8d7766d 100644
44
+++ b/src/lib.rs
55
@@ -184,6 +184,7 @@ impl<'a> BitStream<'a> {
66
}
7-
7+
88
fn fill(&mut self) -> BitState {
99
+ println!("testing");
1010
while self.state.n + 8 <= 32 && self.use_byte() {}

collector/compile-benchmarks/issue-46449/0-io-error-6144.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ index 4b9db94..c44dea6 100644
33
--- a/src/lib.rs
44
+++ b/src/lib.rs
55
@@ -2,7 +2,7 @@ extern crate futures;
6-
6+
77
use futures::{Future, Poll};
8-
8+
99
-const BUFFER_SIZE: usize = 1;
1010
+const BUFFER_SIZE: usize = 6144;
1111
pub struct Error(::std::io::Error);
12-
12+
1313
struct Dummy<T>(T);

collector/compile-benchmarks/issue-46449/1-u32-3072.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ index c44dea6..b555f05 100644
33
--- a/src/lib.rs
44
+++ b/src/lib.rs
55
@@ -2,8 +2,8 @@ extern crate futures;
6-
6+
77
use futures::{Future, Poll};
8-
8+
99
-const BUFFER_SIZE: usize = 6144;
1010
-pub struct Error(::std::io::Error);
1111
+const BUFFER_SIZE: usize = 3072;
1212
+pub struct Error(u32);
13-
13+
1414
struct Dummy<T>(T);
1515
impl<T> Future for Dummy<T> {

collector/compile-benchmarks/issue-46449/2-u8-3072.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ index f8f91d6..b555f05 100644
44
+++ b/src/lib.rs
55
@@ -3,7 +3,7 @@ extern crate futures;
66
use futures::{Future, Poll};
7-
7+
88
const BUFFER_SIZE: usize = 3072;
99
-pub struct Error(u32);
1010
+pub struct Error(u8);
11-
11+
1212
struct Dummy<T>(T);
1313
impl<T> Future for Dummy<T> {

collector/compile-benchmarks/issue-46449/3-empty-3072.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ index f8f91d6..72382a0 100644
44
+++ b/src/lib.rs
55
@@ -3,7 +3,7 @@ extern crate futures;
66
use futures::{Future, Poll};
7-
7+
88
const BUFFER_SIZE: usize = 3072;
99
-pub struct Error(u8);
1010
+pub struct Error;
11-
11+
1212
struct Dummy<T>(T);
1313
impl<T> Future for Dummy<T> {

collector/compile-benchmarks/issue-46449/4-static-str-6144.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ index 72382a0..5d8fc67 100644
33
--- a/src/lib.rs
44
+++ b/src/lib.rs
55
@@ -2,8 +2,8 @@ extern crate futures;
6-
6+
77
use futures::{Future, Poll};
8-
8+
99
-const BUFFER_SIZE: usize = 3072;
1010
-pub struct Error;
1111
+const BUFFER_SIZE: usize = 6144;
1212
+pub struct Error(&'static str);
13-
13+
1414
struct Dummy<T>(T);
1515
impl<T> Future for Dummy<T> {

collector/compile-benchmarks/regex-1.5.5/0-compile-one.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ index 9db743f..ef1948e 100644
44
+++ b/src/compile.rs
55
@@ -137,6 +137,8 @@ impl Compiler {
66
}
7-
7+
88
fn compile_one(mut self, expr: &Hir) -> result::Result<Program, Error> {
99
+ {} // @030
1010
+

collector/compile-benchmarks/regex-1.5.5/1-is-valid-cap-letter.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ index 9bea703..3b6ae94 100644
44
+++ b/src/expand.rs
55
@@ -128,6 +128,7 @@ fn find_cap_ref(replacement: &[u8]) -> Option<CaptureRef<'_>> {
66
}
7-
7+
88
/// Returns true if and only if the given byte is allowed in a capture name.
99
fn is_valid_cap_letter(b: &u8) -> bool {
1010
+ { }

collector/compile-benchmarks/regex-1.5.5/4-byte-frequencies.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ index 92bafc1..6eb5799 100644
44
+++ b/src/freqs.rs
55
@@ -2,7 +2,7 @@
66
// edit directly
7-
7+
88
pub const BYTE_FREQUENCIES: [u8; 256] = [
99
- 55, // '\x00'
1010
+ 54+1, // '\x00'

collector/compile-benchmarks/regex-1.5.5/5-Job.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ index 3c06254..4b72fd4 100644
1010
SaveRestore { slot: usize, old_pos: Option<usize> },
1111
+ Inst { ip: InstPtr, at: InputAt },
1212
}
13-
13+
1414
impl<'a, 'm, 'r, 's, I: Input> Bounded<'a, 'm, 'r, 's, I> {

collector/compile-benchmarks/regex/0-compile-one.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ index 9db743f..ef1948e 100644
44
+++ b/src/compile.rs
55
@@ -137,6 +137,8 @@ impl Compiler {
66
}
7-
7+
88
fn compile_one(mut self, expr: &Expr) -> result::Result<Program, Error> {
99
+ {} // @030
1010
+

collector/compile-benchmarks/regex/1-is-valid-cap-letter.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ index 9bea703..3b6ae94 100644
44
+++ b/src/expand.rs
55
@@ -84,6 +84,7 @@ fn find_cap_ref(mut replacement: &[u8]) -> Option<CaptureRef> {
66
}
7-
7+
88
fn is_valid_cap_letter(b: &u8) -> bool {
99
+ { }
1010
match *b {

collector/compile-benchmarks/regex/2-expand.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ index 9bea703..a28b82d 100644
44
+++ b/src/expand.rs
55
@@ -5,6 +5,7 @@ use memchr::memchr;
66
use bytes::Captures;
7-
7+
88
pub fn expand(caps: &Captures, mut replacement: &[u8], dst: &mut Vec<u8>) {
99
+ { }
1010
while !replacement.is_empty() {

collector/compile-benchmarks/regex/5-byte-frequencies.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ index 92bafc1..6eb5799 100644
44
+++ b/src/freqs.rs
55
@@ -12,7 +12,7 @@
66
// edit directly
7-
7+
88
pub const BYTE_FREQUENCIES: [u8; 256] = [
99
- 55, // '\x00'
1010
+ 54+1, // '\x00'

collector/compile-benchmarks/regex/6-sparse-set.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ index 34c05e7..ef5188e 100644
1616
- /// The number of elements in the set.
1717
- size: usize,
1818
}
19-
19+
2020
impl SparseSet {

collector/compile-benchmarks/regex/7-Job.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ index 3c06254..4b72fd4 100644
1010
SaveRestore { slot: usize, old_pos: Option<usize> },
1111
+ Inst { ip: InstPtr, at: InputAt },
1212
}
13-
13+
1414
impl<'a, 'm, 'r, 's, I: Input> Bounded<'a, 'm, 'r, 's, I> {

collector/compile-benchmarks/serde-1.0.136/0-println.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ index 576fd03c..a825007a 100644
33
--- a/src/de/utf8.rs
44
+++ b/src/de/utf8.rs
55
@@ -41,6 +41,7 @@ pub struct Encode {
6-
6+
77
impl Encode {
88
pub fn as_str(&self) -> &str {
99
+ println!();

collector/compile-benchmarks/style-servo/0-println.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ diff --git a/components/style/matching.rs b/components/style/matching.rs
77
if replacements.intersects(RestyleHint::for_animations()) {
88
+ println!("{:?}", context.shared.traversal_flags.for_animation_only());
99
debug_assert!(context.shared.traversal_flags.for_animation_only());
10-
10+
1111
if replacements.contains(RESTYLE_SMIL) {

collector/compile-benchmarks/style-servo/components/script/dom/bindings/codegen/parser/callback-location.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ index da32340..81c52b7 100644
88
assert self.name.name == obj.identifier.name
99
- return IDLCallbackType(self.location, obj)
1010
+ return IDLCallbackType(obj.location, obj)
11-
11+
1212
if self._promiseInnerType and not self._promiseInnerType.isComplete():
1313
self._promiseInnerType = self._promiseInnerType.complete(scope)
1414
@@ -6521,7 +6521,7 @@ class Parser(Tokenizer):

0 commit comments

Comments
 (0)