Skip to content

Commit 4405944

Browse files
borsbors
committed
Auto merge of #30826 - nagisa:rollup, r=nagisa
- Successful merges: #30538, #30687, #30694, #30737, #30761, #30768, #30774, #30798, #30808, #30812, #30814 - Failed merges:
2 parents 1586005 + 8dd7eab commit 4405944

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+939
-260
lines changed

‎src/doc/book/getting-started.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,10 @@ prints the string to the screen. Easy enough!
303303

304304
[statically allocated]: the-stack-and-the-heap.html
305305

306-
The line ends with a semicolon (`;`). Rust is an *[expression oriented]*
307-
language, which means that most things are expressions, rather than statements.
308-
The `;` indicates that this expression is over, and the next one is ready to
309-
begin. Most lines of Rust code end with a `;`.
306+
The line ends with a semicolon (`;`). Rust is an *[expression-oriented
307+
language]*, which means that most things are expressions, rather than
308+
statements. The `;` indicates that this expression is over, and the next one is
309+
ready to begin. Most lines of Rust code end with a `;`.
310310

311311
[expression-oriented language]: glossary.html#expression-oriented-language
312312

‎src/doc/index.md

+21-5
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,28 @@ This is an index of the documentation included with the Rust
1010
compiler. For more comprehensive documentation see [the
1111
website](https://www.rust-lang.org).
1212

13-
[**The Rust Programming Language**](book/index.html)
13+
[**The Rust Programming Language**][book]. Also known as "The Book",
14+
The Rust Programming Language is the most comprehensive resource for
15+
all topics related to Rust, and is the primary official document of
16+
the language.
1417

15-
[**The Rust Reference**](reference.html)
18+
[**The Rust Reference**][ref]. While Rust does not have a
19+
specification, the reference tries to describe its working in
20+
detail. It tends to be out of date.
1621

17-
[**The Standard Library API Reference**](std/index.html)
22+
[**Standard Library API Reference**][api]. Documentation for the
23+
standard library.
1824

19-
[**The Rustonomicon**](nomicon/index.html)
25+
[**The Rustonomicon**][nomicon]. An entire book dedicated to
26+
explaining how to write unsafe Rust code. It is for advanced Rust
27+
programmers.
28+
29+
[**Compiler Error Index**][err]. Extended explanations of
30+
the errors produced by the Rust compiler.
31+
32+
[book]: book/index.html
33+
[ref]: reference.html
34+
[api]: std/index.html
35+
[nomicon]: nomicon/index.html
36+
[err]: error-index.html
2037

21-
[**The Compiler Error Index**](error-index.html)

‎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/Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# met:
77

88
# (1) Redistributions of source code must retain the above copyright
9-
# notice, this list of conditions and the following disclaimer.
9+
# notice, this list of conditions and the following disclaimer.
1010

1111
# (2) Redistributions in binary form must reproduce the above copyright
1212
# notice, this list of conditions and the following disclaimer in
1313
# the documentation and/or other materials provided with the
14-
# distribution.
14+
# distribution.
1515

1616
# (3) The name of the author may not be used to
1717
# endorse or promote products derived from this software without

‎src/libbacktrace/Makefile.in

+10-10
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
# met:
2424

2525
# (1) Redistributions of source code must retain the above copyright
26-
# notice, this list of conditions and the following disclaimer.
26+
# notice, this list of conditions and the following disclaimer.
2727

2828
# (2) Redistributions in binary form must reproduce the above copyright
2929
# notice, this list of conditions and the following disclaimer in
3030
# the documentation and/or other materials provided with the
31-
# distribution.
31+
# distribution.
3232

3333
# (3) The name of the author may not be used to
3434
# endorse or promote products derived from this software without
@@ -137,10 +137,10 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
137137
$(LDFLAGS) -o $@
138138
SOURCES = $(libbacktrace_la_SOURCES) $(EXTRA_libbacktrace_la_SOURCES) \
139139
$(btest_SOURCES) $(stest_SOURCES)
140-
MULTISRCTOP =
141-
MULTIBUILDTOP =
142-
MULTIDIRS =
143-
MULTISUBDIR =
140+
MULTISRCTOP =
141+
MULTIBUILDTOP =
142+
MULTIDIRS =
143+
MULTISUBDIR =
144144
MULTIDO = true
145145
MULTICLEAN = true
146146
am__can_run_installinfo = \
@@ -389,7 +389,7 @@ config.h: stamp-h1
389389
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
390390
@rm -f stamp-h1
391391
cd $(top_builddir) && $(SHELL) ./config.status config.h
392-
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
392+
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
393393
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
394394
rm -f stamp-h1
395395
touch $@
@@ -407,7 +407,7 @@ clean-noinstLTLIBRARIES:
407407
echo "rm -f \"$${dir}/so_locations\""; \
408408
rm -f "$${dir}/so_locations"; \
409409
done
410-
libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES) $(EXTRA_libbacktrace_la_DEPENDENCIES)
410+
libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES) $(EXTRA_libbacktrace_la_DEPENDENCIES)
411411
$(LINK) $(libbacktrace_la_OBJECTS) $(libbacktrace_la_LIBADD) $(LIBS)
412412

413413
clean-checkPROGRAMS:
@@ -418,10 +418,10 @@ clean-checkPROGRAMS:
418418
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
419419
echo " rm -f" $$list; \
420420
rm -f $$list
421-
btest$(EXEEXT): $(btest_OBJECTS) $(btest_DEPENDENCIES) $(EXTRA_btest_DEPENDENCIES)
421+
btest$(EXEEXT): $(btest_OBJECTS) $(btest_DEPENDENCIES) $(EXTRA_btest_DEPENDENCIES)
422422
@rm -f btest$(EXEEXT)
423423
$(btest_LINK) $(btest_OBJECTS) $(btest_LDADD) $(LIBS)
424-
stest$(EXEEXT): $(stest_OBJECTS) $(stest_DEPENDENCIES) $(EXTRA_stest_DEPENDENCIES)
424+
stest$(EXEEXT): $(stest_OBJECTS) $(stest_DEPENDENCIES) $(EXTRA_stest_DEPENDENCIES)
425425
@rm -f stest$(EXEEXT)
426426
$(LINK) $(stest_OBJECTS) $(stest_LDADD) $(LIBS)
427427

‎src/libbacktrace/alloc.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
77
met:
88
99
(1) Redistributions of source code must retain the above copyright
10-
notice, this list of conditions and the following disclaimer.
10+
notice, this list of conditions and the following disclaimer.
1111
1212
(2) Redistributions in binary form must reproduce the above copyright
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
15-
distribution.
16-
15+
distribution.
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
77
met:
88
99
(1) Redistributions of source code must retain the above copyright
10-
notice, this list of conditions and the following disclaimer.
10+
notice, this list of conditions and the following disclaimer.
1111
1212
(2) Redistributions in binary form must reproduce the above copyright
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
15-
distribution.
16-
15+
distribution.
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
77
met:
88
99
(1) Redistributions of source code must retain the above copyright
10-
notice, this list of conditions and the following disclaimer.
10+
notice, this list of conditions and the following disclaimer.
1111
1212
(2) Redistributions in binary form must reproduce the above copyright
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
15-
distribution.
16-
15+
distribution.
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
77
met:
88
99
(1) Redistributions of source code must retain the above copyright
10-
notice, this list of conditions and the following disclaimer.
10+
notice, this list of conditions and the following disclaimer.
1111
1212
(2) Redistributions in binary form must reproduce the above copyright
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
15-
distribution.
16-
15+
distribution.
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
77
met:
88
99
(1) Redistributions of source code must retain the above copyright
10-
notice, this list of conditions and the following disclaimer.
10+
notice, this list of conditions and the following disclaimer.
1111
1212
(2) Redistributions in binary form must reproduce the above copyright
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
15-
distribution.
16-
15+
distribution.
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

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
77
met:
88
99
(1) Redistributions of source code must retain the above copyright
10-
notice, this list of conditions and the following disclaimer.
10+
notice, this list of conditions and the following disclaimer.
1111
1212
(2) Redistributions in binary form must reproduce the above copyright
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
15-
distribution.
16-
15+
distribution.
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.
@@ -460,7 +460,7 @@ f23 (int f1line, int f2line)
460460
(unsigned int) bdata.index, j + 1);
461461
bdata.failed = 1;
462462
}
463-
}
463+
}
464464

465465
check ("test3", 0, all, f3line, "f23", &bdata.failed);
466466
check ("test3", 1, all, f2line, "f22", &bdata.failed);

‎src/libbacktrace/configure.ac

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
# met:
77

88
# (1) Redistributions of source code must retain the above copyright
9-
# notice, this list of conditions and the following disclaimer.
9+
# notice, this list of conditions and the following disclaimer.
1010

1111
# (2) Redistributions in binary form must reproduce the above copyright
1212
# notice, this list of conditions and the following disclaimer in
1313
# the documentation and/or other materials provided with the
14-
# distribution.
15-
14+
# distribution.
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

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
77
met:
88
99
(1) Redistributions of source code must retain the above copyright
10-
notice, this list of conditions and the following disclaimer.
10+
notice, this list of conditions and the following disclaimer.
1111
1212
(2) Redistributions in binary form must reproduce the above copyright
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
15-
distribution.
16-
15+
distribution.
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.
@@ -1246,7 +1246,7 @@ add_unit_ranges (struct backtrace_state *state, uintptr_t base_address,
12461246

12471247
static int
12481248
find_address_ranges (struct backtrace_state *state, uintptr_t base_address,
1249-
struct dwarf_buf *unit_buf,
1249+
struct dwarf_buf *unit_buf,
12501250
const unsigned char *dwarf_str, size_t dwarf_str_size,
12511251
const unsigned char *dwarf_ranges,
12521252
size_t dwarf_ranges_size,
@@ -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

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
77
met:
88
99
(1) Redistributions of source code must retain the above copyright
10-
notice, this list of conditions and the following disclaimer.
10+
notice, this list of conditions and the following disclaimer.
1111
1212
(2) Redistributions in binary form must reproduce the above copyright
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
15-
distribution.
16-
15+
distribution.
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
77
met:
88
99
(1) Redistributions of source code must retain the above copyright
10-
notice, this list of conditions and the following disclaimer.
10+
notice, this list of conditions and the following disclaimer.
1111
1212
(2) Redistributions in binary form must reproduce the above copyright
1313
notice, this list of conditions and the following disclaimer in
1414
the documentation and/or other materials provided with the
15-
distribution.
16-
15+
distribution.
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.

0 commit comments

Comments
 (0)