Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 11 pull requests #30826

Merged
merged 26 commits into from
Jan 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
810c035
Undo whitespace tweaks pending libbacktrace merge
mmcco Jan 4, 2016
6f0e58f
Stop re-exporting MutateMode's variants.
Ms2ger Jan 6, 2016
ce49e32
Expand EO308 to mention try!
steveklabnik Jan 7, 2016
076e644
macro_rules: proper FIRST/FOLLOW computations for checking macro_rule…
pnkfelix Nov 12, 2015
3703ef5
extending FOLLOW(NT) as specified in amendment.
pnkfelix Nov 17, 2015
3e4b701
Updated future-proofing test, removed outdated test, and added
pnkfelix Nov 24, 2015
c032e0c
After RFC amendment 1384, FOLLOW(pat) includes `|`, so update tests a…
pnkfelix Jan 6, 2016
ea52d9e
[MIR] Fix translation of ConstVal::{Struct, Tuple}
nagisa Jan 7, 2016
a2960bc
update test to reflect other sources of brokenness in it under new
pnkfelix Jan 7, 2016
2f86c16
Change destination accessor to return references
nagisa Jan 7, 2016
cd1f0b7
Fix a typo in rustc_mir::build::scope's documentation
erickt Jan 9, 2016
216e72f
Remove unneeded #[lang = "iterator"]
GuillaumeGomez Jan 10, 2016
8cc149d
Fix link in getting-started.md
vessd Jan 10, 2016
bcf20a7
doc: Add descriptions to links in the index
brson Jan 10, 2016
bac3eec
[breaking-change] remove negate_unsigned feature gate
oli-obk Jan 11, 2016
dd6aa05
Rollup merge of #30538 - oli-obk:kill_unsigned_unary_negation, r=pnkf…
nagisa Jan 11, 2016
6cc2e37
Rollup merge of #30687 - mmcco:lbt, r=eddyb
nagisa Jan 11, 2016
6d6e831
Rollup merge of #30694 - pnkfelix:issue-25658-real-first-follow, r=nrc
nagisa Jan 11, 2016
caf6095
Rollup merge of #30737 - Ms2ger:MutateMode, r=sanxiyn
nagisa Jan 11, 2016
0490606
Rollup merge of #30761 - nagisa:mir-fix-destination, r=michaelwoerister
nagisa Jan 11, 2016
19820c4
Rollup merge of #30768 - steveklabnik:gh28953, r=alexcrichton
nagisa Jan 11, 2016
6aaa606
Rollup merge of #30774 - nagisa:mir-fix-constval-adts, r=arielb1
nagisa Jan 11, 2016
584e145
Rollup merge of #30798 - erickt:fix-doc, r=apasel422
nagisa Jan 11, 2016
b3749b7
Rollup merge of #30808 - GuillaumeGomez:remove_lang_iter, r=alexcrichton
nagisa Jan 11, 2016
0b8370c
Rollup merge of #30812 - D101101:patch-2, r=steveklabnik
nagisa Jan 11, 2016
8dd7eab
Rollup merge of #30814 - brson:docidx, r=steveklabnik
nagisa Jan 11, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/doc/book/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,10 @@ prints the string to the screen. Easy enough!

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

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

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

Expand Down
26 changes: 21 additions & 5 deletions src/doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,28 @@ This is an index of the documentation included with the Rust
compiler. For more comprehensive documentation see [the
website](https://www.rust-lang.org).

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

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

[**The Standard Library API Reference**](std/index.html)
[**Standard Library API Reference**][api]. Documentation for the
standard library.

[**The Rustonomicon**](nomicon/index.html)
[**The Rustonomicon**][nomicon]. An entire book dedicated to
explaining how to write unsafe Rust code. It is for advanced Rust
programmers.

[**Compiler Error Index**][err]. Extended explanations of
the errors produced by the Rust compiler.

[book]: book/index.html
[ref]: reference.html
[api]: std/index.html
[nomicon]: nomicon/index.html
[err]: error-index.html

[**The Compiler Error Index**](error-index.html)
2 changes: 1 addition & 1 deletion src/libbacktrace/ChangeLog.jit
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/libbacktrace/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
# met:

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

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

# (3) The name of the author may not be used to
# endorse or promote products derived from this software without
Expand Down
20 changes: 10 additions & 10 deletions src/libbacktrace/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
# met:

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

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

# (3) The name of the author may not be used to
# endorse or promote products derived from this software without
Expand Down Expand Up @@ -137,10 +137,10 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libbacktrace_la_SOURCES) $(EXTRA_libbacktrace_la_SOURCES) \
$(btest_SOURCES) $(stest_SOURCES)
MULTISRCTOP =
MULTIBUILDTOP =
MULTIDIRS =
MULTISUBDIR =
MULTISRCTOP =
MULTIBUILDTOP =
MULTIDIRS =
MULTISUBDIR =
MULTIDO = true
MULTICLEAN = true
am__can_run_installinfo = \
Expand Down Expand Up @@ -389,7 +389,7 @@ config.h: stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
Expand All @@ -407,7 +407,7 @@ clean-noinstLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES) $(EXTRA_libbacktrace_la_DEPENDENCIES)
libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES) $(EXTRA_libbacktrace_la_DEPENDENCIES)
$(LINK) $(libbacktrace_la_OBJECTS) $(libbacktrace_la_LIBADD) $(LIBS)

clean-checkPROGRAMS:
Expand All @@ -418,10 +418,10 @@ clean-checkPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
btest$(EXEEXT): $(btest_OBJECTS) $(btest_DEPENDENCIES) $(EXTRA_btest_DEPENDENCIES)
btest$(EXEEXT): $(btest_OBJECTS) $(btest_DEPENDENCIES) $(EXTRA_btest_DEPENDENCIES)
@rm -f btest$(EXEEXT)
$(btest_LINK) $(btest_OBJECTS) $(btest_LDADD) $(LIBS)
stest$(EXEEXT): $(stest_OBJECTS) $(stest_DEPENDENCIES) $(EXTRA_stest_DEPENDENCIES)
stest$(EXEEXT): $(stest_OBJECTS) $(stest_DEPENDENCIES) $(EXTRA_stest_DEPENDENCIES)
@rm -f stest$(EXEEXT)
$(LINK) $(stest_OBJECTS) $(stest_LDADD) $(LIBS)

Expand Down
6 changes: 3 additions & 3 deletions src/libbacktrace/alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
met:

(1) Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
notice, this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

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.
Expand Down
6 changes: 3 additions & 3 deletions src/libbacktrace/atomic.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
met:

(1) Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
notice, this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

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.
Expand Down
6 changes: 3 additions & 3 deletions src/libbacktrace/backtrace-supported.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
met:

(1) Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
notice, this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

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.
Expand Down
6 changes: 3 additions & 3 deletions src/libbacktrace/backtrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
met:

(1) Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
notice, this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

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.
Expand Down
6 changes: 3 additions & 3 deletions src/libbacktrace/backtrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
met:

(1) Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
notice, this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

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.
Expand Down
8 changes: 4 additions & 4 deletions src/libbacktrace/btest.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
met:

(1) Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
notice, this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

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.
Expand Down Expand Up @@ -460,7 +460,7 @@ f23 (int f1line, int f2line)
(unsigned int) bdata.index, j + 1);
bdata.failed = 1;
}
}
}

check ("test3", 0, all, f3line, "f23", &bdata.failed);
check ("test3", 1, all, f2line, "f22", &bdata.failed);
Expand Down
6 changes: 3 additions & 3 deletions src/libbacktrace/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
# met:

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

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

# 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.
Expand Down
12 changes: 6 additions & 6 deletions src/libbacktrace/dwarf.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
met:

(1) Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
notice, this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

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.
Expand Down Expand Up @@ -1246,7 +1246,7 @@ add_unit_ranges (struct backtrace_state *state, uintptr_t base_address,

static int
find_address_ranges (struct backtrace_state *state, uintptr_t base_address,
struct dwarf_buf *unit_buf,
struct dwarf_buf *unit_buf,
const unsigned char *dwarf_str, size_t dwarf_str_size,
const unsigned char *dwarf_ranges,
size_t dwarf_ranges_size,
Expand Down Expand Up @@ -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;
Expand All @@ -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);

Expand Down
14 changes: 7 additions & 7 deletions src/libbacktrace/dwarf2.def
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/libbacktrace/dwarf2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/libbacktrace/elf.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
met:

(1) Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
notice, this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

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.
Expand Down
6 changes: 3 additions & 3 deletions src/libbacktrace/fileline.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
met:

(1) Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
notice, this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

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.
Expand Down
Loading