Skip to content

Commit 80660d6

Browse files
committed
Auto merge of rust-lang#28864 - aarzee:master, r=steveklabnik
Remove leading newlines in files and replace lines containing only whitespace with blank lines
2 parents e7b6056 + aba267f commit 80660d6

33 files changed

+45
-59
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Read ["Installing Rust"] from [The Book].
6767
```sh
6868
# Update package mirrors (may be needed if you have a fresh install of MSYS2)
6969
$ pacman -Sy pacman-mirrors
70-
70+
7171
# Choose one based on platform:
7272
$ pacman -S mingw-w64-i686-toolchain
7373
$ pacman -S mingw-w64-x86_64-toolchain

src/doc/nomicon/ownership.md

-1
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,3 @@ does in fact live as long as we needed. However it was *changed* while we had
6464
a reference into it. This is why Rust requires any references to freeze the
6565
referent and its owners.
6666

67-

src/doc/trpl/ownership.md

-10
Original file line numberDiff line numberDiff line change
@@ -236,13 +236,3 @@ complicated.
236236
Luckily, Rust offers a feature, borrowing, which helps us solve this problem.
237237
It’s the topic of the next section!
238238

239-
240-
241-
242-
243-
244-
245-
246-
247-
248-

src/doc/trpl/references-and-borrowing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -363,15 +363,15 @@ note: reference must be valid for the block suffix following statement 0 at
363363
let y: &i32;
364364
let x = 5;
365365
y = &x;
366-
366+
367367
println!("{}", y);
368368
}
369369
370370
note: ...but borrowed value is only valid for the block suffix following
371371
statement 1 at 3:14
372372
let x = 5;
373373
y = &x;
374-
374+
375375
println!("{}", y);
376376
}
377377
```

src/libbacktrace/ChangeLog.jit

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
* configure.ac: Add --enable-host-shared.
88
* configure: Regenerate.
9-
9+
1010
Copyright (C) 2013-2014 Free Software Foundation, Inc.
1111

1212
Copying and distribution of this file, with or without modification,

src/libbacktrace/alloc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/atomic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/backtrace-supported.h.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ met:
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/backtrace.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/backtrace.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/btest.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# notice, this list of conditions and the following disclaimer in
1313
# the documentation and/or other materials provided with the
1414
# distribution.
15-
15+
1616
# (3) The name of the author may not be used to
1717
# endorse or promote products derived from this software without
1818
# specific prior written permission.

src/libbacktrace/dwarf.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.
@@ -1605,7 +1605,7 @@ read_line_header (struct backtrace_state *state, struct unit *u,
16051605

16061606
if (!advance (line_buf, hdrlen))
16071607
return 0;
1608-
1608+
16091609
hdr->min_insn_len = read_byte (&hdr_buf);
16101610
if (hdr->version < 4)
16111611
hdr->max_ops_per_insn = 1;
@@ -1614,7 +1614,7 @@ read_line_header (struct backtrace_state *state, struct unit *u,
16141614

16151615
/* We don't care about default_is_stmt. */
16161616
read_byte (&hdr_buf);
1617-
1617+
16181618
hdr->line_base = read_sbyte (&hdr_buf);
16191619
hdr->line_range = read_byte (&hdr_buf);
16201620

src/libbacktrace/dwarf2.def

+7-7
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,27 @@
4747

4848
/* This file declares various DWARF-related constants using a set of
4949
macros which can be redefined by the including file.
50-
50+
5151
The macros are in sections. Each section corresponds to a single
5252
set of DWARF constants and has a corresponding key. The key is
5353
used in all the macro names.
54-
54+
5555
The sections are TAG (for DW_TAG_ constants), FORM (DW_FORM_), AT
5656
(DW_AT_), OP (DW_OP_), ATE (DW_ATE_), and CFA (DW_CFA_).
57-
57+
5858
Using TAG as an example, the following macros may be used for each
5959
key:
60-
60+
6161
DW_FIRST_TAG(name, value) - Introduce the first DW_TAG constant.
62-
62+
6363
DW_TAG(name, value) - Define a subsequent constant.
64-
64+
6565
DW_TAG_DUP(name, value) - Define a subsequent constant whose value
6666
is a duplicate of some other constant. Not all keys use the _DUP
6767
macro form. If more than one name shares a value, then the base
6868
(DW_TAG) form will be the preferred name and DW_TAG_DUP will hold
6969
any alternate names.
70-
70+
7171
DW_END_TAG - Invoked at the end of the DW_TAG constants. */
7272

7373
DW_FIRST_TAG (DW_TAG_padding, 0x00)

src/libbacktrace/dwarf2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ enum dwarf_macro_record_type
352352
DW_MACRO_GNU_lo_user = 0xe0,
353353
DW_MACRO_GNU_hi_user = 0xff
354354
};
355-
355+
356356
/* @@@ For use with GNU frame unwind information. */
357357

358358
#define DW_EH_PE_absptr 0x00

src/libbacktrace/elf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/fileline.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/mmap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/mmapio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/nounwind.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/posix.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/print.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/read.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/simple.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/sort.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/state.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/stest.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libbacktrace/unknown.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
1515
distribution.
16-
16+
1717
(3) The name of the author may not be used to
1818
endorse or promote products derived from this software without
1919
specific prior written permission.

src/libstd/os/freebsd/raw.rs

-1
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,3 @@ mod arch {
138138
}
139139
}
140140

141-

src/test/compile-fail/transmute-imut-to-mut.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ fn main() {
1717
//~^ ERROR mutating transmuted &mut T from &T may cause undefined behavior
1818
}
1919

20-

src/test/run-pass/issue-11577.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-cr ignore-license
22
// ignore-tidy-cr (repeated again because of tidy bug)
33
// license is ignored because tidy can't handle the CRLF here properly.
4-
4+
55
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
66
// file at the top-level directory of this distribution and at
77
// http://rust-lang.org/COPYRIGHT.
@@ -11,33 +11,33 @@
1111
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
1212
// option. This file may not be copied, modified, or distributed
1313
// except according to those terms.
14-
14+
1515
// NB: this file needs CRLF line endings. The .gitattributes file in
1616
// this directory should enforce it.
17-
17+
1818
// ignore-pretty
19-
19+
2020
/// Doc comment that ends in CRLF
2121
pub fn foo() {}
22-
22+
2323
/** Block doc comment that
2424
* contains CRLF characters
2525
*/
2626
pub fn bar() {}
27-
27+
2828
fn main() {
2929
let s = "string
3030
literal";
3131
assert_eq!(s, "string\nliteral");
32-
32+
3333
let s = "literal with \
3434
escaped newline";
3535
assert_eq!(s, "literal with escaped newline");
36-
36+
3737
let s = r"string
3838
literal";
3939
assert_eq!(s, "string\nliteral");
40-
40+
4141
// validate that our source file has CRLF endings
4242
let source = include_str!("lexer-crlf-line-endings-string-literal-doc-comment.rs");
4343
assert!(source.contains("string\r\nliteral"));

0 commit comments

Comments
 (0)