diff --git a/README.md b/README.md index 67285da2e3a65..c4a3becacb42f 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Read ["Installing Rust"] from [The Book]. ```sh # Update package mirrors (may be needed if you have a fresh install of MSYS2) $ pacman -Sy pacman-mirrors - + # Choose one based on platform: $ pacman -S mingw-w64-i686-toolchain $ pacman -S mingw-w64-x86_64-toolchain diff --git a/src/doc/nomicon/ownership.md b/src/doc/nomicon/ownership.md index e80c64c3543f8..6be8d3b70286a 100644 --- a/src/doc/nomicon/ownership.md +++ b/src/doc/nomicon/ownership.md @@ -64,4 +64,3 @@ does in fact live as long as we needed. However it was *changed* while we had a reference into it. This is why Rust requires any references to freeze the referent and its owners. - diff --git a/src/doc/trpl/ownership.md b/src/doc/trpl/ownership.md index 5ddbdd6df00b0..89116f77b415a 100644 --- a/src/doc/trpl/ownership.md +++ b/src/doc/trpl/ownership.md @@ -236,13 +236,3 @@ complicated. Luckily, Rust offers a feature, borrowing, which helps us solve this problem. It’s the topic of the next section! - - - - - - - - - - diff --git a/src/doc/trpl/references-and-borrowing.md b/src/doc/trpl/references-and-borrowing.md index 50297b266d98c..8f39f0a122cd3 100644 --- a/src/doc/trpl/references-and-borrowing.md +++ b/src/doc/trpl/references-and-borrowing.md @@ -363,7 +363,7 @@ note: reference must be valid for the block suffix following statement 0 at let y: &i32; let x = 5; y = &x; - + println!("{}", y); } @@ -371,7 +371,7 @@ note: ...but borrowed value is only valid for the block suffix following statement 1 at 3:14 let x = 5; y = &x; - + println!("{}", y); } ``` diff --git a/src/libbacktrace/ChangeLog.jit b/src/libbacktrace/ChangeLog.jit index 6b60e3b3b0738..5ab329c696d77 100644 --- a/src/libbacktrace/ChangeLog.jit +++ b/src/libbacktrace/ChangeLog.jit @@ -6,7 +6,7 @@ * configure.ac: Add --enable-host-shared. * configure: Regenerate. - + Copyright (C) 2013-2014 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/src/libbacktrace/alloc.c b/src/libbacktrace/alloc.c index 143ef68ca5148..b35afc603ba32 100644 --- a/src/libbacktrace/alloc.c +++ b/src/libbacktrace/alloc.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/atomic.c b/src/libbacktrace/atomic.c index fdd2490da7c6b..096a2bed284a1 100644 --- a/src/libbacktrace/atomic.c +++ b/src/libbacktrace/atomic.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/backtrace-supported.h.in b/src/libbacktrace/backtrace-supported.h.in index ab051a1689826..7d4b03350c934 100644 --- a/src/libbacktrace/backtrace-supported.h.in +++ b/src/libbacktrace/backtrace-supported.h.in @@ -13,7 +13,7 @@ met: notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/backtrace.c b/src/libbacktrace/backtrace.c index d352d27a4006d..c87175cc892b2 100644 --- a/src/libbacktrace/backtrace.c +++ b/src/libbacktrace/backtrace.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/backtrace.h b/src/libbacktrace/backtrace.h index 50dcd40751b22..3802d2579a208 100644 --- a/src/libbacktrace/backtrace.h +++ b/src/libbacktrace/backtrace.h @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/btest.c b/src/libbacktrace/btest.c index 9821e34c0c1ba..c555165dcd8f4 100644 --- a/src/libbacktrace/btest.c +++ b/src/libbacktrace/btest.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/configure.ac b/src/libbacktrace/configure.ac index a0e487bb42d71..f2c345cc3614f 100644 --- a/src/libbacktrace/configure.ac +++ b/src/libbacktrace/configure.ac @@ -12,7 +12,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. - + # (3) The name of the author may not be used to # endorse or promote products derived from this software without # specific prior written permission. diff --git a/src/libbacktrace/dwarf.c b/src/libbacktrace/dwarf.c index 54e5ace9b4a68..9ba1a384f3250 100644 --- a/src/libbacktrace/dwarf.c +++ b/src/libbacktrace/dwarf.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. @@ -1605,7 +1605,7 @@ read_line_header (struct backtrace_state *state, struct unit *u, if (!advance (line_buf, hdrlen)) return 0; - + hdr->min_insn_len = read_byte (&hdr_buf); if (hdr->version < 4) hdr->max_ops_per_insn = 1; @@ -1614,7 +1614,7 @@ read_line_header (struct backtrace_state *state, struct unit *u, /* We don't care about default_is_stmt. */ read_byte (&hdr_buf); - + hdr->line_base = read_sbyte (&hdr_buf); hdr->line_range = read_byte (&hdr_buf); diff --git a/src/libbacktrace/dwarf2.def b/src/libbacktrace/dwarf2.def index 71a37b30c9f87..932ce86435131 100644 --- a/src/libbacktrace/dwarf2.def +++ b/src/libbacktrace/dwarf2.def @@ -47,27 +47,27 @@ /* This file declares various DWARF-related constants using a set of macros which can be redefined by the including file. - + The macros are in sections. Each section corresponds to a single set of DWARF constants and has a corresponding key. The key is used in all the macro names. - + The sections are TAG (for DW_TAG_ constants), FORM (DW_FORM_), AT (DW_AT_), OP (DW_OP_), ATE (DW_ATE_), and CFA (DW_CFA_). - + Using TAG as an example, the following macros may be used for each key: - + DW_FIRST_TAG(name, value) - Introduce the first DW_TAG constant. - + DW_TAG(name, value) - Define a subsequent constant. - + DW_TAG_DUP(name, value) - Define a subsequent constant whose value is a duplicate of some other constant. Not all keys use the _DUP macro form. If more than one name shares a value, then the base (DW_TAG) form will be the preferred name and DW_TAG_DUP will hold any alternate names. - + DW_END_TAG - Invoked at the end of the DW_TAG constants. */ DW_FIRST_TAG (DW_TAG_padding, 0x00) diff --git a/src/libbacktrace/dwarf2.h b/src/libbacktrace/dwarf2.h index 120e2c16b4820..c7d49ebb2401b 100644 --- a/src/libbacktrace/dwarf2.h +++ b/src/libbacktrace/dwarf2.h @@ -352,7 +352,7 @@ enum dwarf_macro_record_type DW_MACRO_GNU_lo_user = 0xe0, DW_MACRO_GNU_hi_user = 0xff }; - + /* @@@ For use with GNU frame unwind information. */ #define DW_EH_PE_absptr 0x00 diff --git a/src/libbacktrace/elf.c b/src/libbacktrace/elf.c index 3f14b11a43c83..292e5c0f07c8d 100644 --- a/src/libbacktrace/elf.c +++ b/src/libbacktrace/elf.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/fileline.c b/src/libbacktrace/fileline.c index 0acad0603eeb0..e4b70795bf3c4 100644 --- a/src/libbacktrace/fileline.c +++ b/src/libbacktrace/fileline.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/internal.h b/src/libbacktrace/internal.h index 30f99ca127f8e..98ecc4c24a788 100644 --- a/src/libbacktrace/internal.h +++ b/src/libbacktrace/internal.h @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/mmap.c b/src/libbacktrace/mmap.c index 1ecf131191142..7f6601bc004a2 100644 --- a/src/libbacktrace/mmap.c +++ b/src/libbacktrace/mmap.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/mmapio.c b/src/libbacktrace/mmapio.c index b5a787e0aa6fd..4c038b94c5826 100644 --- a/src/libbacktrace/mmapio.c +++ b/src/libbacktrace/mmapio.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/nounwind.c b/src/libbacktrace/nounwind.c index f53f906b5a89c..247986076b210 100644 --- a/src/libbacktrace/nounwind.c +++ b/src/libbacktrace/nounwind.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/posix.c b/src/libbacktrace/posix.c index 7fa7cd0d5da67..b847ec64781b5 100644 --- a/src/libbacktrace/posix.c +++ b/src/libbacktrace/posix.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/print.c b/src/libbacktrace/print.c index 90ecaf89edad0..99c50099eab7d 100644 --- a/src/libbacktrace/print.c +++ b/src/libbacktrace/print.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/read.c b/src/libbacktrace/read.c index 299f77ba7c629..641a3748399c8 100644 --- a/src/libbacktrace/read.c +++ b/src/libbacktrace/read.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/simple.c b/src/libbacktrace/simple.c index 39c2e902ff77b..542a53ecb1795 100644 --- a/src/libbacktrace/simple.c +++ b/src/libbacktrace/simple.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/sort.c b/src/libbacktrace/sort.c index bcc765e93aa77..9b61149e26aff 100644 --- a/src/libbacktrace/sort.c +++ b/src/libbacktrace/sort.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/state.c b/src/libbacktrace/state.c index a846378e903c2..071c93945d5ff 100644 --- a/src/libbacktrace/state.c +++ b/src/libbacktrace/state.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/stest.c b/src/libbacktrace/stest.c index ec93e680e89ed..c4f9f5ec3b896 100644 --- a/src/libbacktrace/stest.c +++ b/src/libbacktrace/stest.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libbacktrace/unknown.c b/src/libbacktrace/unknown.c index e89cba96f7d91..76dab7a21c1d8 100644 --- a/src/libbacktrace/unknown.c +++ b/src/libbacktrace/unknown.c @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/libstd/os/freebsd/raw.rs b/src/libstd/os/freebsd/raw.rs index 65390aee0e1d0..761e6c96ab738 100644 --- a/src/libstd/os/freebsd/raw.rs +++ b/src/libstd/os/freebsd/raw.rs @@ -138,4 +138,3 @@ mod arch { } } - diff --git a/src/test/compile-fail/transmute-imut-to-mut.rs b/src/test/compile-fail/transmute-imut-to-mut.rs index 2e076337f53ef..62db4c5d366d6 100644 --- a/src/test/compile-fail/transmute-imut-to-mut.rs +++ b/src/test/compile-fail/transmute-imut-to-mut.rs @@ -17,4 +17,3 @@ fn main() { //~^ ERROR mutating transmuted &mut T from &T may cause undefined behavior } - diff --git a/src/test/run-pass/issue-11577.rs b/src/test/run-pass/issue-11577.rs index 81588e8ef78db..c1997fac74b78 100644 --- a/src/test/run-pass/issue-11577.rs +++ b/src/test/run-pass/issue-11577.rs @@ -1,4 +1,3 @@ - // Copyright 2014 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. diff --git a/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs b/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs index 5c8db524cc2ed..10bf096dae7f7 100644 --- a/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs +++ b/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs @@ -1,7 +1,7 @@ // ignore-tidy-cr ignore-license // ignore-tidy-cr (repeated again because of tidy bug) // license is ignored because tidy can't handle the CRLF here properly. - + // Copyright 2014 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. @@ -11,33 +11,33 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. - + // NB: this file needs CRLF line endings. The .gitattributes file in // this directory should enforce it. - + // ignore-pretty - + /// Doc comment that ends in CRLF pub fn foo() {} - + /** Block doc comment that * contains CRLF characters */ pub fn bar() {} - + fn main() { let s = "string literal"; assert_eq!(s, "string\nliteral"); - + let s = "literal with \ escaped newline"; assert_eq!(s, "literal with escaped newline"); - + let s = r"string literal"; assert_eq!(s, "string\nliteral"); - + // validate that our source file has CRLF endings let source = include_str!("lexer-crlf-line-endings-string-literal-doc-comment.rs"); assert!(source.contains("string\r\nliteral"));