OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #23385 - tamird:cleanup-whitespace, r=alexcrichton 

r? @alexcrichton

Conflicts:
	src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs
This commit is contained in:
Manish Goregaokar 2015-03-17 15:21:22 +05:30
parent 0b463b075e f5765793b6
commit fad4c380e8
419 changed files with 154 additions and 561 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -64,7 +64,7 @@ Read ["Installing Rust"] from [The Book].
# Choose one based on platform:
$ pacman -S mingw-w64-i686-toolchain
$ pacman -S mingw-w64-x86_64-toolchain
$ pacman -S base-devel
```

1
mk/cfg/x86_64-unknown-linux-gnu.mk
View File

@ -25,4 +25,3 @@ CFG_LDPATH_x86_64-unknown-linux-gnu :=
CFG_RUN_x86_64-unknown-linux-gnu=$(2)
CFG_RUN_TARG_x86_64-unknown-linux-gnu=$(call CFG_RUN_x86_64-unknown-linux-gnu,,$(2))
CFG_GNU_TRIPLE_x86_64-unknown-linux-gnu := x86_64-unknown-linux-gnu

2
mk/prepare.mk
View File

@ -221,5 +221,3 @@ prepare-maybe-clean-$(1):
endef

1
mk/util.mk
View File

@ -17,4 +17,3 @@ else
endif
S := $(CFG_SRC_DIR)

98
src/doc/grammar.md
View File

@ -290,7 +290,7 @@ transcriber : '(' transcriber * ')' | '[' transcriber * ']'
# Items and attributes
**FIXME:** grammar?
**FIXME:** grammar?
## Items
@ -301,7 +301,7 @@ item : mod_item | fn_item | type_item | struct_item | enum_item
### Type Parameters
**FIXME:** grammar?
**FIXME:** grammar?
### Modules
@ -338,35 +338,35 @@ path_item : ident | "mod" ;
### Functions
**FIXME:** grammar?
**FIXME:** grammar?
#### Generic functions
**FIXME:** grammar?
**FIXME:** grammar?
#### Unsafety
**FIXME:** grammar?
**FIXME:** grammar?
##### Unsafe functions
**FIXME:** grammar?
**FIXME:** grammar?
##### Unsafe blocks
**FIXME:** grammar?
**FIXME:** grammar?
#### Diverging functions
**FIXME:** grammar?
**FIXME:** grammar?
### Type definitions
**FIXME:** grammar?
**FIXME:** grammar?
### Structures
**FIXME:** grammar?
**FIXME:** grammar?
### Constant items
@ -382,15 +382,15 @@ static_item : "static" ident ':' type '=' expr ';' ;
#### Mutable statics
**FIXME:** grammar?
**FIXME:** grammar?
### Traits
**FIXME:** grammar?
**FIXME:** grammar?
### Implementations
**FIXME:** grammar?
**FIXME:** grammar?
### External blocks
@ -401,11 +401,11 @@ extern_block : [ foreign_fn ] * ;
## Visibility and Privacy
**FIXME:** grammar?
**FIXME:** grammar?
### Re-exporting and Visibility
**FIXME:** grammar?
**FIXME:** grammar?
## Attributes
@ -420,11 +420,11 @@ meta_seq : meta_item [ ',' meta_seq ] ? ;
## Statements
**FIXME:** grammar?
**FIXME:** grammar?
### Declaration statements
**FIXME:** grammar?
**FIXME:** grammar?
A _declaration statement_ is one that introduces one or more *names* into the
enclosing statement block. The declared names may denote new slots or new
@ -432,7 +432,7 @@ items.
#### Item declarations
**FIXME:** grammar?
**FIXME:** grammar?
An _item declaration statement_ has a syntactic form identical to an
[item](#items) declaration within a module. Declaring an item — a
@ -450,35 +450,35 @@ init : [ '=' ] expr ;
### Expression statements
**FIXME:** grammar?
**FIXME:** grammar?
## Expressions
**FIXME:** grammar?
**FIXME:** grammar?
#### Lvalues, rvalues and temporaries
**FIXME:** grammar?
**FIXME:** grammar?
#### Moved and copied types
**FIXME:** Do we want to capture this in the grammar as different productions?
**FIXME:** Do we want to capture this in the grammar as different productions?
### Literal expressions
**FIXME:** grammar?
**FIXME:** grammar?
### Path expressions
**FIXME:** grammar?
**FIXME:** grammar?
### Tuple expressions
**FIXME:** grammar?
**FIXME:** grammar?
### Unit expressions
**FIXME:** grammar?
**FIXME:** grammar?
### Structure expressions
@ -527,7 +527,7 @@ idx_expr : expr '[' expr ']' ;
### Unary operator expressions
**FIXME:** grammar?
**FIXME:** grammar?
### Binary operator expressions
@ -537,31 +537,31 @@ binop_expr : expr binop expr ;
#### Arithmetic operators
**FIXME:** grammar?
**FIXME:** grammar?
#### Bitwise operators
**FIXME:** grammar?
**FIXME:** grammar?
#### Lazy boolean operators
**FIXME:** grammar?
**FIXME:** grammar?
#### Comparison operators
**FIXME:** grammar?
**FIXME:** grammar?
#### Type cast expressions
**FIXME:** grammar?
**FIXME:** grammar?
#### Assignment expressions
**FIXME:** grammar?
**FIXME:** grammar?
#### Compound assignment expressions
**FIXME:** grammar?
**FIXME:** grammar?
#### Operator precedence
@ -680,49 +680,49 @@ return_expr : "return" expr ? ;
# Type system
**FIXME:** is this entire chapter relevant here? Or should it all have been covered by some production already?
**FIXME:** is this entire chapter relevant here? Or should it all have been covered by some production already?
## Types
### Primitive types
**FIXME:** grammar?
**FIXME:** grammar?
#### Machine types
**FIXME:** grammar?
**FIXME:** grammar?
#### Machine-dependent integer types
**FIXME:** grammar?
**FIXME:** grammar?
### Textual types
**FIXME:** grammar?
**FIXME:** grammar?
### Tuple types
**FIXME:** grammar?
**FIXME:** grammar?
### Array, and Slice types
**FIXME:** grammar?
**FIXME:** grammar?
### Structure types
**FIXME:** grammar?
**FIXME:** grammar?
### Enumerated types
**FIXME:** grammar?
**FIXME:** grammar?
### Pointer types
**FIXME:** grammar?
**FIXME:** grammar?
### Function types
**FIXME:** grammar?
**FIXME:** grammar?
### Closure types
@ -739,15 +739,15 @@ bound := path | lifetime
### Object types
**FIXME:** grammar?
**FIXME:** grammar?
### Type parameters
**FIXME:** grammar?
**FIXME:** grammar?
### Self types
**FIXME:** grammar?
**FIXME:** grammar?
## Type kinds
@ -755,7 +755,7 @@ bound := path | lifetime
# Memory and concurrency models
**FIXME:** is this entire chapter relevant here? Or should it all have been covered by some production already?
**FIXME:** is this entire chapter relevant here? Or should it all have been covered by some production already?
## Memory model

1
src/doc/not_found.md
View File

@ -63,4 +63,3 @@ function populate_rust_search() {
populate_site_search();
populate_rust_search();
</script>

2
src/doc/trpl/arrays-vectors-and-slices.md
View File

@ -49,7 +49,7 @@ languages.
A *vector* is a dynamic or "growable" array, implemented as the standard
library type [`Vec<T>`](../std/vec/) (we'll talk about what the `<T>` means
later). Vectors always allocate their data on the heap. Vectors are to slices
later). Vectors always allocate their data on the heap. Vectors are to slices
what `String` is to `&str`. You can create them with the `vec!` macro:
```{rust}

4
src/doc/trpl/crates-and-modules.md
View File

@ -551,9 +551,9 @@ module, we now have a `phrases::japanese::hello()` function and a
`phrases::japanese::farewells::goodbye()`. Our internal organization doesn't
define our external interface.
Here we have a `pub use` for each function we want to bring into the
Here we have a `pub use` for each function we want to bring into the
`japanese` scope. We could alternatively use the wildcard syntax to include
everything from `greetings` into the current scope: `pub use self::greetings::*`.
everything from `greetings` into the current scope: `pub use self::greetings::*`.
What about the `self`? Well, by default, `use` declarations are absolute paths,
starting from your crate root. `self` makes that path relative to your current

11
src/doc/trpl/documentation.md
View File

@ -306,23 +306,23 @@ println!("{}", x + y);
Here's the same explanation, in raw text:
> First, we set `x` to five:
>
>
> ```text
> let x = 5;
> # let y = 6;
> # println!("{}", x + y);
> ```
>
>
> Next, we set `y` to six:
>
>
> ```text
> # let x = 5;
> let y = 6;
> # println!("{}", x + y);
> ```
>
>
> Finally, we print the sum of `x` and `y`:
>
>
> ```text
> # let x = 5;
> # let y = 6;
@ -521,4 +521,3 @@ This sets a few different options, with a logo, favicon, and a root URL.
- `--html-before-content FILE`: includes the contents of FILE directly after
`<body>`, before the rendered content (including the search bar).
- `--html-after-content FILE`: includes the contents of FILE after all the rendered content.

1
src/doc/trpl/ffi.md
View File

@ -543,4 +543,3 @@ The `extern` makes this function adhere to the C calling convention, as
discussed above in "[Foreign Calling
Conventions](ffi.html#foreign-calling-conventions)". The `no_mangle`
attribute turns off Rust's name mangling, so that it is easier to link to.

6
src/doc/trpl/method-syntax.md
View File

@ -61,15 +61,15 @@ struct Circle {
impl Circle {
fn reference(&self) {
println!("taking self by reference!");
println!("taking self by reference!");
}
fn mutable_reference(&mut self) {
println!("taking self by mutable reference!");
println!("taking self by mutable reference!");
}
fn takes_ownership(self) {
println!("taking ownership of self!");
println!("taking ownership of self!");
}
}
```

2
src/doc/trpl/static-and-dynamic-dispatch.md
View File

@ -95,7 +95,7 @@ However, the common case is that it is more efficient to use static dispatch,
and one can always have a thin statically-dispatched wrapper function that does
a dynamic dispatch, but not vice versa, meaning static calls are more flexible.
The standard library tries to be statically dispatched where possible for this
reason.
reason.
## Dynamic dispatch

4
src/doc/trpl/testing.md
View File

@ -1,7 +1,7 @@
% Testing
> Program testing can be a very effective way to show the presence of bugs, but
> it is hopelessly inadequate for showing their absence.
> it is hopelessly inadequate for showing their absence.
>
> Edsger W. Dijkstra, "The Humble Programmer" (1972)
@ -308,7 +308,7 @@ extern crate adder;
#[test]
fn it_works() {
assert_eq!(4, adder::add_two(2));
}
}
```
This looks similar to our previous tests, but slightly different. We now have

1
src/etc/featureck.py
View File

@ -242,4 +242,3 @@ print
for line in lines:
print "* " + line
print

2
src/etc/gdb_rust_pretty_printing.py
View File

@ -340,4 +340,4 @@ def extract_length_and_data_ptr_from_std_vec(vec_val):
unique_ptr_val = vec_ptr_val[first_field(vec_ptr_val)]
data_ptr = unique_ptr_val[first_field(unique_ptr_val)]
assert data_ptr.type.code == gdb.TYPE_CODE_PTR
return (length, data_ptr)
return (length, data_ptr)

2
src/etc/mingw-fix-include/README.txt
View File

@ -1,6 +1,6 @@
The purpose of these headers is to fix issues with mingw v4.0, as described in #9246.
This works by adding this directory to GCC include search path before mingw system headers directories,
This works by adding this directory to GCC include search path before mingw system headers directories,
so we can intercept their inclusions and add missing definitions without having to modify files in mingw/include.
Once mingw fixes all 3 issues mentioned in #9246, this directory and all references to it from rust/mk/* may be removed.

1
src/etc/third-party/COPYING.RUNTIME vendored
View File

@ -70,4 +70,3 @@ consistent with the licensing of the Independent Modules.
The availability of this Exception does not imply any general
presumption that third-party software is unaffected by the copyleft
requirements of the license of GCC.

1
src/grammar/check.sh
View File

@ -50,4 +50,3 @@ else
printf "failed. $passed passed; $failed failed; $skipped skipped\n\n"
exit 1
fi

4
src/libbacktrace/Makefile.am
View File

@ -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

18
src/libbacktrace/Makefile.in
View File

@ -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
@ -117,10 +117,10 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libbacktrace_la_SOURCES) $(EXTRA_libbacktrace_la_SOURCES) \
$(btest_SOURCES)
MULTISRCTOP =
MULTIBUILDTOP =
MULTIDIRS =
MULTISUBDIR =
MULTISRCTOP =
MULTIBUILDTOP =
MULTIDIRS =
MULTISUBDIR =
MULTIDO = true
MULTICLEAN = true
ETAGS = etags
@ -362,7 +362,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 $@
@ -380,7 +380,7 @@ clean-noinstLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES)
libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES)
$(LINK) $(libbacktrace_la_OBJECTS) $(libbacktrace_la_LIBADD) $(LIBS)
clean-checkPROGRAMS:
@ -391,7 +391,7 @@ 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)
btest$(EXEEXT): $(btest_OBJECTS) $(btest_DEPENDENCIES)
@rm -f btest$(EXEEXT)
$(btest_LINK) $(btest_OBJECTS) $(btest_LDADD) $(LIBS)

6
src/libbacktrace/alloc.c
View File

@ -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.

6
src/libbacktrace/atomic.c
View File

@ -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.

6
src/libbacktrace/backtrace-supported.h.in
View File

@ -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.

6
src/libbacktrace/backtrace.c
View File

@ -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.

6
src/libbacktrace/backtrace.h
View File

@ -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.

8
src/libbacktrace/btest.c
View File

@ -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.
@ -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);

1
src/libbacktrace/configure vendored
View File

@ -15153,4 +15153,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi

6
src/libbacktrace/configure.ac
View File

@ -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.

12
src/libbacktrace/dwarf.c
View File

@ -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.
@ -1241,7 +1241,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,
@ -1599,7 +1599,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;
@ -1608,7 +1608,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);

6
src/libbacktrace/elf.c
View File

@ -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.

6
src/libbacktrace/fileline.c
View File

@ -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.

4
src/libbacktrace/hashtab.h
View File

@ -1,4 +1,4 @@
/* An expandable hash tables datatype.
/* An expandable hash tables datatype.
Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2009, 2010
Free Software Foundation, Inc.
Contributed by Vladimir Makarov (vmakarov@cygnus.com).
@ -61,7 +61,7 @@ typedef int (*htab_eq) (const void *, const void *);
/* Cleanup function called whenever a live element is removed from
the hash table. */
typedef void (*htab_del) (void *);
/* Function called by htab_traverse for each live element. The first
arg is the slot of the element (which can be passed to htab_clear_slot
if desired), the second arg is the auxiliary pointer handed to

6
src/libbacktrace/internal.h
View File

@ -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.

1
src/libbacktrace/ltmain.sh
View File

@ -8633,4 +8633,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# sh-indentation:2
# End:
# vi:sw=2

6
src/libbacktrace/mmap.c
View File

@ -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.

6
src/libbacktrace/mmapio.c
View File

@ -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.

6
src/libbacktrace/nounwind.c
View File

@ -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.

6
src/libbacktrace/posix.c
View File

@ -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.

6
src/libbacktrace/print.c
View File

@ -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.

6
src/libbacktrace/read.c
View File

@ -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.

6
src/libbacktrace/simple.c
View File

@ -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.

6
src/libbacktrace/state.c
View File

@ -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.

6
src/libbacktrace/unknown.c
View File

@ -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.

1
src/libcore/default.rs
View File

@ -164,4 +164,3 @@ default_impl! { i64, 0 }
default_impl! { f32, 0.0f32 }
default_impl! { f64, 0.0f64 }

1
src/libcore/finally.rs
View File

@ -107,4 +107,3 @@ impl<'a, A, F> Drop for Finallyalizer<'a, A, F> where F: FnMut(&mut A) {
(self.dtor)(self.mutate);
}
}

1
src/libcore/num/float_macros.rs
View File

@ -18,4 +18,3 @@ macro_rules! assert_approx_eq {
"{} is not approximately equal to {}", *a, *b);
})
}

1
src/libcoretest/intrinsics.rs
View File

@ -28,4 +28,3 @@ fn test_typeid_unsized_types() {
assert_eq!(TypeId::of::<Y>(), TypeId::of::<Y>());
assert!(TypeId::of::<X>() != TypeId::of::<Y>());
}

1
src/liblog/macros.rs
View File

@ -197,4 +197,3 @@ macro_rules! log_enabled {
::log::mod_enabled(lvl, module_path!())
})
}

2
src/librustc/README.txt
View File

@ -40,7 +40,7 @@ crates is preferable):
driver that orchestrates all the other passes and various other bits
of miscellany. In general it contains code that runs towards the
end of the compilation process.
Roughly speaking the "order" of the three crates is as follows:
libsyntax -> librustc -> librustc_trans

1
src/librustc/diagnostics.rs
View File

@ -132,4 +132,3 @@ register_diagnostics! {
}
__build_diagnostic_array! { DIAGNOSTICS }

1
src/librustc/metadata/tydecode.rs
View File

@ -963,4 +963,3 @@ fn parse_region_bounds_<'a, 'tcx, F>(st: &mut PState<'a, 'tcx>, conv: &mut F)
}
}
}

1
src/librustc/middle/cfg/graphviz.rs
View File

@ -124,4 +124,3 @@ impl<'a, 'ast> dot::GraphWalk<'a, Node<'a>, Edge<'a>> for LabelledCFG<'a, 'ast>
fn source(&'a self, edge: &Edge<'a>) -> Node<'a> { self.cfg.source(edge) }
fn target(&'a self, edge: &Edge<'a>) -> Node<'a> { self.cfg.target(edge) }
}

1
src/librustc/middle/fast_reject.rs
View File

@ -96,4 +96,3 @@ pub fn simplify_type(tcx: &ty::ctxt,
ty::ty_infer(_) | ty::ty_err => None,
}
}

1
src/librustc/middle/infer/resolve.rs
View File

@ -112,4 +112,3 @@ impl<'a, 'tcx> ty_fold::TypeFolder<'tcx> for FullTypeResolver<'a, 'tcx> {
}
}
}

1
src/librustc/middle/infer/sub.rs
View File

@ -153,4 +153,3 @@ impl<'f, 'tcx> Combine<'tcx> for Sub<'f, 'tcx> {
self.higher_ranked_sub(a, b)
}
}

1
src/librustc/middle/mem_categorization.rs
View File

@ -1635,4 +1635,3 @@ impl<'tcx> UserString<'tcx> for Upvar {
format!("captured outer variable in an `{}` closure", kind)
}
}

2
src/librustc/middle/traits/util.rs
View File

@ -568,5 +568,3 @@ impl<'tcx> fmt::Debug for super::MismatchedProjectionTypes<'tcx> {
write!(f, "MismatchedProjectionTypes(..)")
}
}

1
src/librustc_back/archive.rs
View File

@ -324,4 +324,3 @@ impl<'a> ArchiveBuilder<'a> {
Ok(())
}
}

1
src/librustc_back/target/dragonfly_base.rs
View File

@ -32,4 +32,3 @@ pub fn opts() -> TargetOptions {
.. Default::default()
}
}

1
src/librustc_back/target/freebsd_base.rs
View File

@ -27,4 +27,3 @@ pub fn opts() -> TargetOptions {
.. Default::default()
}
}

1
src/librustc_back/target/openbsd_base.rs
View File

@ -30,4 +30,3 @@ pub fn opts() -> TargetOptions {
.. Default::default()
}
}

1
src/librustc_trans/trans/closure.rs
View File

@ -259,4 +259,3 @@ pub fn trans_closure_expr<'a, 'tcx>(dest: Dest<'a, 'tcx>,
Some(bcx)
}

2
src/librustc_trans/trans/llrepr.rs
View File

@ -34,5 +34,3 @@ impl LlvmRepr for ValueRef {
ccx.tn().val_to_string(*self)
}
}

2
src/librustc_typeck/check/closure.rs
View File

@ -248,5 +248,3 @@ fn self_type_matches_expected_vid<'a,'tcx>(
_ => None,
}
}

2
src/librustc_typeck/check/upvar.rs
View File

@ -556,5 +556,3 @@ impl<'a,'tcx> euv::Delegate<'tcx> for AdjustBorrowKind<'a,'tcx> {
self.adjust_upvar_borrow_kind_for_mut(assignee_cmt);
}
}

1
src/librustc_typeck/check/vtable.rs
View File

@ -302,4 +302,3 @@ pub fn select_new_fcx_obligations(fcx: &FnCtxt) {
Err(errors) => { report_fulfillment_errors(fcx.infcx(), &errors); }
}
}

1
src/librustc_typeck/diagnostics.rs
View File

@ -181,4 +181,3 @@ register_diagnostics! {
}
__build_diagnostic_array! { DIAGNOSTICS }

1
src/librustc_typeck/variance.rs
View File

@ -1350,4 +1350,3 @@ fn glb(v1: ty::Variance, v2: ty::Variance) -> ty::Variance {
(x, ty::Bivariant) | (ty::Bivariant, x) => x,
}
}

1
src/librustdoc/html/item_type.rs
View File

@ -111,4 +111,3 @@ impl fmt::Display for ItemType {
self.to_static_str().fmt(f)
}
}

4
src/librustdoc/html/static/Heuristica-LICENSE.txt
View File

@ -1,7 +1,7 @@
Copyright 1989, 1991 Adobe Systems Incorporated. All rights reserved.
Utopia is either a registered trademark or trademark of Adobe Systems
Incorporated in the United States and/or other countries. Used under
license.
license.
Copyright 2006 Han The Thanh, Vntopia font family, http://vntex.sf.net
@ -26,7 +26,7 @@ with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The

2
src/librustdoc/html/static/SourceCodePro-LICENSE.txt
View File

@ -18,7 +18,7 @@ with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The

2
src/librustdoc/html/static/SourceSerifPro-LICENSE.txt
View File

@ -18,7 +18,7 @@ with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The

1
src/librustdoc/html/static/playpen.js
View File

@ -25,4 +25,3 @@
});
}
}());

1
src/libstd/bool.rs
View File

@ -12,4 +12,3 @@
#![doc(primitive = "bool")]
#![stable(feature = "rust1", since = "1.0.0")]

1
src/rt/msvc/typeof.h
View File

@ -94,4 +94,3 @@ namespace msvc_typeof_impl {
#endif
#endif

2
src/rt/valgrind/memcheck.h
View File

@ -1,4 +1,3 @@
/*
----------------------------------------------------------------
@ -284,4 +283,3 @@ typedef
(zznbytes), 0, 0 )
#endif

1
src/test/auxiliary/changing-crates-a2.rs
View File

@ -11,4 +11,3 @@
#![crate_name = "a"]
pub fn foo<T>() { println!("hello!"); }

1
src/test/auxiliary/coherence-orphan-lib.rs
View File

@ -11,4 +11,3 @@
pub trait TheTrait<T> : ::std::marker::PhantomFn<T> {
fn the_fn(&self);
}

1
src/test/auxiliary/default_type_params_xc.rs
View File

@ -13,4 +13,3 @@ pub struct Heap;
pub struct FakeHeap;
pub struct FakeVec<T, A = FakeHeap> { pub f: Option<(T,A)> }

1
src/test/auxiliary/iss.rs
View File

@ -20,4 +20,3 @@ fn no_op() { }
pub const D : C<fn()> = C {
k: no_op as fn()
};

1
src/test/auxiliary/issue-12133-dylib2.rs
View File

@ -14,4 +14,3 @@
extern crate "issue-12133-rlib" as a;
extern crate "issue-12133-dylib" as b;

1
src/test/auxiliary/issue-13560-3.rs
View File

@ -14,4 +14,3 @@
#[macro_use] #[no_link] extern crate "issue-13560-1" as t1;
#[macro_use] extern crate "issue-13560-2" as t2;

1
src/test/auxiliary/issue-16725.rs
View File

@ -11,4 +11,3 @@
extern {
fn bar();
}

1
src/test/auxiliary/issue-5521.rs
View File

@ -12,4 +12,3 @@
use std::collections::HashMap;
pub type map = Box<HashMap<uint, uint>>;

1
src/test/auxiliary/issue13213aux.rs
View File

@ -27,4 +27,3 @@ mod private {
}
pub static A: S = S { p: private::THREE };

1
src/test/auxiliary/issue_3907.rs
View File

@ -13,4 +13,3 @@ use std::marker::MarkerTrait;
pub trait Foo : MarkerTrait {
fn bar();
}

1
src/test/auxiliary/issue_5844_aux.rs
View File

@ -13,4 +13,3 @@ extern crate libc;
extern "C" {
pub fn rand() -> libc::c_int;
}

1
src/test/auxiliary/issue_8401.rs
View File

@ -24,4 +24,3 @@ fn foo<T>(t: &T) {
let b = B;
bar(unsafe { mem::transmute(&b as &A) }, t)
}

1
src/test/auxiliary/issue_9123.rs
View File

@ -17,4 +17,3 @@ pub trait X {
}
fn dummy(&self) { }
}

1
src/test/auxiliary/issue_9188.rs
View File

@ -21,4 +21,3 @@ pub fn foo<T>() -> &'static int {
pub fn bar() -> &'static int {
foo::<int>()
}

1
src/test/auxiliary/kinds_in_metadata.rs
View File

@ -16,4 +16,3 @@
#![crate_type="lib"]
pub fn f<T:Copy>() {}

2
src/test/auxiliary/lang-item-public.rs
View File

@ -32,5 +32,3 @@ extern fn eh_personality() {}
pub trait Copy : PhantomFn<Self> {
// Empty.
}

1
src/test/auxiliary/namespaced_enums.rs
View File

@ -18,4 +18,3 @@ impl Foo {
pub fn foo() {}
pub fn bar(&self) {}
}

1
src/test/auxiliary/plugin_crate_outlive_expansion_phase.rs
View File

@ -32,4 +32,3 @@ pub fn registrar(_: &mut Registry) {
thread_local!(static FOO: RefCell<Option<Box<Any+Send>>> = RefCell::new(None));
FOO.with(|s| *s.borrow_mut() = Some(box Foo { foo: 10 } as Box<Any+Send>));
}

1
src/test/auxiliary/struct_variant_privacy.rs
View File

@ -11,4 +11,3 @@
enum Bar {
Baz { a: int }
}

1
src/test/auxiliary/trait_bounds_on_structs_and_enums_xc.rs
View File

@ -21,4 +21,3 @@ pub enum Bar<T:Trait> {
BBar(T),
CBar(uint),
}

1
src/test/auxiliary/weak-lang-items.rs
View File

@ -34,4 +34,3 @@ pub fn foo() {
mod std {
pub use core::{option, fmt};
}

1
src/test/auxiliary/where_clauses_xc.rs
View File

@ -27,4 +27,3 @@ impl<T> Equal for T where T: Eq {
pub fn equal<T>(x: &T, y: &T) -> bool where T: Eq {
x == y
}

1
src/test/auxiliary/xcrate_struct_aliases.rs
View File

@ -14,4 +14,3 @@ pub struct S {
}
pub type S2 = S;

1
src/test/auxiliary/xcrate_unit_struct.rs
View File

@ -36,4 +36,3 @@ pub enum EnumWithVariants {
EnumVariant,
EnumVariantArg(int)
}

Some files were not shown because too many files have changed in this diff Show More