auto merge of : thestinger/rust/whitespace, r=catamorphism

I just had `git apply` fix most of them and then did a quick skim over the diff to fix a few cases where it did the wrong thing (mostly replacing tabs with 4 spaces, when someone's editor had them at 8 spaces).
This commit is contained in:
bors 2013-05-04 00:48:37 -07:00
commit 1f65e4a1d5
433 changed files with 196 additions and 597 deletions

9
.gitattributes vendored Normal file

@ -0,0 +1,9 @@
[attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
* text=auto
*.cpp rust
*.h rust
*.rs rust
src/rt/msvc/* -whitespace
src/rt/vg/* -whitespace
src/rt/linenoise/* -whitespace

@ -367,4 +367,3 @@ their own copyright notices and license terms:
has chosen for the collective work, enumerated at the top
of this file. The only difference is the retention of
copyright itself, held by the contributor.

@ -250,7 +250,7 @@ Version 0.3 (July 2012)
* Slices and fixed-size, interior-allocated vectors
* #!-comments for lang versioning, shell execution
* Destructors and iface implementation for classes;
type-parameterized classes and class methods
type-parameterized classes and class methods
* 'const' type kind for types that can be used to implement
shared-memory concurrency patterns
@ -261,7 +261,7 @@ Version 0.3 (July 2012)
'crust', 'native' (now 'extern'), 'cont' (now 'again')
* Constructs: do-while loops ('do' repurposed), fn binding,
resources (replaced by destructors)
resources (replaced by destructors)
* Compiler reorganization
* Syntax-layer of compiler split into separate crate
@ -276,7 +276,7 @@ Version 0.3 (July 2012)
* Extensive work on libuv interface
* Much vector code moved to libraries
* Syntax extensions: #line, #col, #file, #mod, #stringify,
#include, #include_str, #include_bin
#include, #include_str, #include_bin
* Tool improvements
* Cargo automatically resolves dependencies

@ -1,6 +1,6 @@
The markdown docs are only generated by make when node is installed (use
`make doc`). If you don't have node installed you can generate them yourself.
Unfortunately there's no real standard for markdown and all the tools work
`make doc`). If you don't have node installed you can generate them yourself.
Unfortunately there's no real standard for markdown and all the tools work
differently. pandoc is one that seems to work well.
To generate an html version of a doc do something like:
@ -10,4 +10,4 @@ The syntax for pandoc flavored markdown can be found at:
http://johnmacfarlane.net/pandoc/README.html#pandocs-markdown
A nice quick reference (for non-pandoc markdown) is at:
http://kramdown.rubyforge.org/quickref.html
http://kramdown.rubyforge.org/quickref.html

@ -3351,4 +3351,3 @@ Additional specific influences can be seen from the following languages:
* The typeclass system of Haskell.
* The lexical identifier rule of Python.
* The block syntax of Ruby.

@ -402,4 +402,3 @@ tricky. Invoking the `log_syntax!` macro can help elucidate intermediate
states, invoking `trace_macros!(true)` will automatically print those
intermediate states out, and passing the flag `--pretty expanded` as a
command-line argument to the compiler will show the result of expansion.

@ -511,4 +511,3 @@ The parent task first calls `DuplexStream` to create a pair of bidirectional
endpoints. It then uses `task::spawn` to create the child task, which captures
one end of the communication channel. As a result, both parent and child can
send and receive data to and from the other.

@ -1006,9 +1006,9 @@ let mut d = @mut 5; // mutable variable, mutable box
d = @mut 15;
~~~~
A mutable variable and an immutable variable can refer to the same box, given
that their types are compatible. Mutability of a box is a property of its type,
however, so for example a mutable handle to an immutable box cannot be
A mutable variable and an immutable variable can refer to the same box, given
that their types are compatible. Mutability of a box is a property of its type,
however, so for example a mutable handle to an immutable box cannot be
assigned a reference to a mutable box.
~~~~
@ -1041,7 +1041,7 @@ let y = x.clone(); // y is a newly allocated box
let z = x; // no new memory allocated, x can no longer be used
~~~~
Since in owned boxes mutability is a property of the owner, not the
Since in owned boxes mutability is a property of the owner, not the
box, mutable boxes may become immutable when they are moved, and vice-versa.
~~~~

@ -7,4 +7,3 @@
</center>
</div>

@ -11,7 +11,7 @@
# Create variables HOST_<triple> containing the host part
# of each target triple. For example, the triple i686-darwin-macos
# would create a variable HOST_i686-darwin-macos with the value
# would create a variable HOST_i686-darwin-macos with the value
# i386.
define DEF_HOST_VAR
HOST_$(1) = $(subst i686,i386,$(word 1,$(subst -, ,$(1))))
@ -276,8 +276,8 @@ CFG_GCCISH_CFLAGS_i686-pc-mingw32 := -Wall -Werror -g -march=i686
CFG_GCCISH_CXXFLAGS_i686-pc-mingw32 := -fno-rtti
CFG_GCCISH_LINK_FLAGS_i686-pc-mingw32 := -shared -fPIC -g
CFG_GCCISH_DEF_FLAG_i686-pc-mingw32 :=
CFG_GCCISH_PRE_LIB_FLAGS_i686-pc-mingw32 :=
CFG_GCCISH_POST_LIB_FLAGS_i686-pc-mingw32 :=
CFG_GCCISH_PRE_LIB_FLAGS_i686-pc-mingw32 :=
CFG_GCCISH_POST_LIB_FLAGS_i686-pc-mingw32 :=
CFG_DEF_SUFFIX_i686-pc-mingw32 := .mingw32.def
CFG_INSTALL_NAME_i686-pc-mingw32 =
CFG_LIBUV_LINK_FLAGS_i686-pc-mingw32 := -lWs2_32 -lpsapi -liphlpapi

@ -1,27 +1,27 @@
# This is a procedure to define the targets for building
# the runtime.
# the runtime.
#
# Argument 1 is the target triple.
#
# This is not really the right place to explain this, but
# for those of you who are not Makefile gurus, let me briefly
# cover the $ expansion system in use here, because it
# cover the $ expansion system in use here, because it
# confused me for a while! The variable DEF_RUNTIME_TARGETS
# will be defined once and then expanded with different
# values substituted for $(1) each time it is called.
# That resulting text is then eval'd.
# That resulting text is then eval'd.
#
# For most variables, you could use a single $ sign. The result
# is that the substitution would occur when the CALL occurs,
# I believe. The problem is that the automatic variables $< and $@
# need to be expanded-per-rule. Therefore, for those variables at
# least, you need $$< and $$@ in the variable text. This way, after
# least, you need $$< and $$@ in the variable text. This way, after
# the CALL substitution occurs, you will have $< and $@. This text
# will then be evaluated, and all will work as you like.
#
# Reader beware, this explanantion could be wrong, but it seems to
# fit the experimental data (i.e., I was able to get the system
# working under these assumptions).
# fit the experimental data (i.e., I was able to get the system
# working under these assumptions).
# Hack for passing flags into LIBUV, see below.
LIBUV_FLAGS_i386 = -m32 -fPIC

@ -7,16 +7,16 @@ $(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)): \
$(S)src/etc/get-snapshot.py $(MKFILE_DEPS)
@$(call E, fetch: $@)
# Note: the variable "SNAPSHOT_FILE" is generally not set, and so
# we generally only pass one argument to this script.
# we generally only pass one argument to this script.
ifdef CFG_ENABLE_LOCAL_RUST
$(Q)$(S)src/etc/local_stage0.sh $(CFG_BUILD_TRIPLE) $(CFG_LOCAL_RUST_ROOT)
else
else
$(Q)$(CFG_PYTHON) $(S)src/etc/get-snapshot.py $(CFG_BUILD_TRIPLE) $(SNAPSHOT_FILE)
ifdef CFG_ENABLE_PAX_FLAGS
@$(call E, apply PaX flags: $@)
@"$(CFG_PAXCTL)" -cm "$@"
endif
endif
endif
$(Q)touch $@
# Host libs will be extracted by the above rule

@ -179,9 +179,9 @@ tidy:
$(Q)find $(S)src/etc -name '*.py' \
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
$(Q)echo $(ALL_CS) \
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
$(Q)echo $(ALL_HS) \
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
endif
@ -709,4 +709,3 @@ endef
$(foreach host,$(CFG_HOST_TRIPLES), \
$(eval $(call DEF_CHECK_FAST_FOR_H,$(host))))

@ -9,7 +9,7 @@ my $anchors = {};
my $i = 0;
foreach $line (@lines) {
$i++;
if ($line =~ m/id="([^"]+)"/) {
if ($line =~ m/id="([^"]+)"/) {
$anchors->{$1} = $i;
}
}
@ -17,10 +17,9 @@ foreach $line (@lines) {
$i = 0;
foreach $line (@lines) {
$i++;
while ($line =~ m/href="#([^"]+)"/g) {
while ($line =~ m/href="#([^"]+)"/g) {
if (! exists($anchors->{$1})) {
print "$file:$i: $1 referenced\n";
}
}
}

@ -8,4 +8,3 @@ Instructions for Ubuntu Linux 12.04+
2) Copy the included "share" folder into "~/.local/"
3) Open a shell in "~/.local/share/" and run "update-mime-database mime"

@ -123,11 +123,11 @@
<keyword>mode_t</keyword>
<keyword>ssize_t</keyword>
</context>
<context id="self" style-ref="identifier">
<keyword>self</keyword>
</context>
<context id="constants" style-ref="constant">
<keyword>true</keyword>
<keyword>false</keyword>
@ -261,4 +261,3 @@
</definitions>
</language>

@ -2,6 +2,6 @@
<mime-type type="text/x-rust">
<comment>Rust Source</comment>
<glob pattern="*.rs"/>
<glob pattern="*.rc"/>
<glob pattern="*.rc"/>
</mime-type>
</mime-info>

@ -14,4 +14,3 @@ while (<>) {
$indent -= 1;
}
}

@ -52,5 +52,3 @@ def download_new_file (date, rev, platform, hsh):
for ff in newestSet["files"]:
download_new_file (newestSet["date"], newestSet["rev"],
ff["platform"], ff["hash"])

@ -243,4 +243,3 @@ int main() {
extra_consts();
printf("}\n");
}

@ -96,4 +96,3 @@ def check_license(name, contents):
return True
return False

@ -1,13 +1,13 @@
#!/bin/sh
TARG_DIR=$1
TARG_DIR=$1
PREFIX=$2
BINDIR=bin
LIBDIR=lib
OS=`uname -s`
case $OS in
case $OS in
("Linux"|"FreeBSD")
BIN_SUF=
LIB_SUF=.so

@ -33,6 +33,3 @@ for line in f.readlines():
print("got download with ok hash")
else:
raise Exception("bad hash on download")

@ -77,4 +77,3 @@ while (my ($key, $substs) = each %funcs) {
}
print "\n";
}

@ -80,4 +80,3 @@ def sugarise_file(path):
for (dirpath, dirnames, filenames) in os.walk('.'):
for name in fnmatch.filter(filenames, '*.r[sc]'):
sugarise_file(os.path.join(dirpath, name))

@ -81,4 +81,3 @@ except UnicodeDecodeError, e:
sys.exit(err)

@ -366,7 +366,7 @@
...
}
{
{
llvm-user-new-leak
Memcheck:Leak
fun:_Znwj
@ -401,7 +401,7 @@
Helgrind:Race
fun:_ZN15lock_and_signal27lock_held_by_current_threadEv
...
}
}
{
lock_and_signal-probably-threadsafe-access-outside-of-lock2

@ -245,4 +245,3 @@ pub mod rustrt {
pub unsafe fn rust_get_task() -> *c_void;
}
}

@ -59,4 +59,3 @@ pub fn log_type<T>(level: u32, object: &T) {
rustrt::rust_log_str(level, transmute(vec::raw::to_ptr(bytes)), len);
}
}

@ -31,4 +31,3 @@ impl<T:Ord> Ord for ~T {
#[inline(always)]
fn gt(&self, other: &~T) -> bool { *(*self) > *(*other) }
}

@ -207,4 +207,3 @@ pub fn mut_offset<T>(ptr: *mut T, count: int) -> *mut T {
use core::sys::size_of;
(ptr as int + count * (size_of::<T>() as int)) as *mut T
}

@ -56,4 +56,3 @@ impl<W: Writer> WriterChan<W> {
impl<W: Writer> GenericChan<~[u8]> for WriterChan<W> {
fn send(&self, _x: ~[u8]) { fail!() }
}

@ -12,4 +12,3 @@ pub enum IpAddr {
Ipv4(u8, u8, u8, u8, u16),
Ipv6
}

@ -47,4 +47,3 @@ impl UdpListener {
impl Listener<UdpStream> for UdpListener {
fn accept(&mut self) -> Option<UdpStream> { fail!() }
}

@ -47,4 +47,3 @@ impl UnixListener {
impl Listener<UnixStream> for UnixListener {
fn accept(&mut self) -> Option<UnixStream> { fail!() }
}

@ -78,4 +78,3 @@ extern {
size: size_t) -> *OpaqueBox;
fn rust_boxed_region_free(region: *BoxedRegion, box: *OpaqueBox);
}

@ -143,4 +143,3 @@ fn borrow_smoke_test() {
}
let _scheduler = take();
}

@ -99,4 +99,3 @@ pub mod rusti {
pub fn frame_address(+f: &once fn(x: *u8));
}
}

@ -2642,4 +2642,3 @@ pub mod derived_property {
bsearch_range_table(c, XID_Start_table)
}
}

@ -81,4 +81,3 @@ extern {
#[rust_stack]
fn rust_get_exchange_count_ptr() -> *mut int;
}

@ -205,4 +205,3 @@ fn test_select_stream_and_oneshot() {
chan.send(());
waitport.recv();
}

@ -169,4 +169,3 @@ pub struct LinkMeta {
vers: @str,
extras_hash: @str
}

@ -18,4 +18,3 @@ pub mod cstore;
pub mod csearch;
pub mod loader;
pub mod filesearch;

@ -802,4 +802,3 @@ fn check_loans_in_block(blk: &ast::blk,
visit::visit_block(blk, self, vt);
}
}

@ -639,4 +639,3 @@ fn add_stmt_to_map(stmt: @ast::stmt,
}
visit::visit_stmt(stmt, self, vt);
}

@ -309,4 +309,3 @@ pub impl LoanContext {
}
}
}

@ -423,4 +423,3 @@ pub fn collect_language_items(crate: @crate,
collector.collect();
copy items
}

@ -1179,4 +1179,3 @@ pub impl categorization {
}
}
}

@ -86,4 +86,3 @@ pub fn pat_binding_ids(dm: resolve::DefMap, pat: @pat) -> ~[node_id] {
pat_bindings(dm, pat, |_bm, b_id, _sp, _pt| found.push(b_id) );
return found;
}

@ -603,4 +603,3 @@ pub fn check_crate(tcx: ty::ctxt,
});
visit::visit_crate(crate, method_map, visitor);
}

@ -968,4 +968,3 @@ pub fn determine_rp_in_crate(sess: Session,
// return final set
return cx.region_paramd_items;
}

@ -186,4 +186,3 @@ impl Subst for ty::ty_param_bounds_and_ty {
}
}
}

@ -190,4 +190,3 @@ pub impl FnType {
Store(bcx, llretval, llretptr);
}
}

@ -799,4 +799,3 @@ pub fn trans_arg_expr(bcx: block,
debug!("--- trans_arg_expr passing %s", val_str(bcx.ccx().tn, val));
return rslt(bcx, val);
}

@ -599,4 +599,3 @@ pub fn make_opaque_cbox_free_glue(
}
}
}

@ -398,4 +398,3 @@ pub fn trans_fail_bounds_check(bcx: block, sp: span,
Unreachable(bcx);
return bcx;
}

@ -855,4 +855,3 @@ pub impl DatumBlock {
self.datum.to_str(self.ccx())
}
}

@ -122,4 +122,3 @@ pub fn maybe_instantiate_inline(ccx: @CrateContext, fn_id: ast::def_id,
}
}
}

@ -153,4 +153,3 @@ pub fn static_size_of_enum(cx: @CrateContext, t: ty::t) -> uint {
_ => cx.sess.bug(~"static_size_of_enum called on non-enum")
}
}

@ -51,4 +51,3 @@ macro_rules! trace(
}
)
)

@ -242,4 +242,3 @@ fn traverse_all_resources_and_impls(cx: &ctx, crate_mod: &_mod) {
..*visit::default_visitor()
}));
}

@ -404,4 +404,3 @@ pub fn ast_purity_constant(purity: ast::purity) -> uint {
ast::extern_fn => 3u
}
}

@ -74,4 +74,3 @@ pub fn add_substr(dest: &mut ~[u8], src: ~[u8]) {
add_u16(&mut *dest, vec::len(src) as u16);
*dest += src;
}

@ -383,4 +383,3 @@ pub fn handle_body(cx: Context, body: &blk) {
});
(v.visit_block)(body, cx, v);
}

@ -649,4 +649,3 @@ pub fn check_pointer_pat(pcx: &pat_ctxt,
#[deriving(Eq)]
enum PointerKind { Managed, Owned, Borrowed }

@ -66,5 +66,3 @@ pub fn coerce(fcx: @mut FnCtxt,
}
}
}

@ -666,5 +666,3 @@ pub fn resolve_in_block(fcx: @mut FnCtxt, bl: &ast::blk) {
.. *visit::default_visitor()
}));
}

@ -1119,4 +1119,3 @@ pub fn check_coherence(crate_context: @mut CrateCtxt, crate: @crate) {
let coherence_checker = @CoherenceChecker(crate_context);
coherence_checker.check_coherence(crate);
}

@ -635,4 +635,3 @@ pub fn super_trait_refs<C:Combine>(
})
}
}

@ -313,4 +313,3 @@ impl Combine for Glb {
super_trait_refs(self, a, b)
}
}

@ -18,4 +18,3 @@ macro_rules! if_ok(
}
)
)

@ -1746,4 +1746,3 @@ fn iterate_until_fixed_point(
}
debug!("---- %s Complete after %u iteration(s)", tag, iteration);
}

@ -278,4 +278,3 @@ pub impl ResolveState {
}
}
}

@ -269,4 +269,3 @@ impl Combine for Sub {
super_trait_refs(self, a, b)
}
}

@ -265,5 +265,3 @@ impl SimplyUnifiable for ast::float_ty {
return ty::terr_float_mismatch(err);
}
}

@ -112,4 +112,3 @@ fn should_record_fn_paths() {
assert!(doc.cratemod().mods()[0].fns()[0].path() == ~[~"a"]);
}
}

@ -32,4 +32,3 @@ Commands that should succeed:
15. `rustpkg test foo` runs tests and prints their output, if foo contains #[test]s.
16. If foo is installed, `rustpkg uninstall foo; rustpkg list` doesn't include foo in the list

@ -15,4 +15,3 @@ The test runner should check that, after `rustpkg install deeply/nested/path/foo
*/
fn main() {}

@ -1957,4 +1957,3 @@ mod bigint_tests {
assert!(-Zero::zero::<BigInt>() == Zero::zero::<BigInt>());
}
}

@ -1883,4 +1883,3 @@ impl<D:Decoder> DecoderHelpers for D {
}
}
}

@ -100,4 +100,3 @@ fn test_task_pool() {
pool.execute(|i| io::println(fmt!("Hello from thread %u!", *i)));
}
}

@ -80,4 +80,3 @@ impl proto::visitor<(), (), ()> for @ext_ctxt {
}
}
}

@ -104,4 +104,3 @@ pub fn analyze(proto: protocol, _cx: @ext_ctxt) {
proto.bounded = Some(true);
}
}

@ -85,4 +85,3 @@ pub fn expand_proto(cx: @ext_ctxt, _sp: span, id: ast::ident,
// compile
base::MRItem(proto.compile(cx))
}

@ -217,4 +217,3 @@ pub fn visit<Tproto, Tstate, Tmessage, V: visitor<Tproto, Tstate, Tmessage>>(
};
visitor.visit_proto(proto, states)
}

@ -760,4 +760,3 @@ fn expand_parse_call(cx: @ext_ctxt,
id_ext(cx, parse_method),
arg_exprs)
}

@ -298,4 +298,3 @@ pub impl Parser {
}
}

@ -89,4 +89,3 @@ pub mod ext {
pub mod trace_macros;
}

@ -48,5 +48,3 @@ swap_registers:
msr cpsr_cxsf, r2
mov pc, lr

@ -14,4 +14,3 @@ void rust_gpr::load() {
LOAD(r8); LOAD(r9); LOAD(r10); LOAD(r11);
LOAD(r12); LOAD(r13); LOAD(r14); LOAD(r15);
}

@ -21,4 +21,3 @@ public:
};
#endif

@ -35,7 +35,7 @@ __morestack:
mov r0, r4 // The amount of stack needed
add r1, fp, #20 // Address of stack arguments
mov r2, r5 // Size of stack arguments
// Create new stack
bl upcall_new_stack@plt
@ -64,7 +64,7 @@ __morestack:
// Restore return value
mov r0, r4
mov r1, r5
// Return
pop {r6, fp, lr}
mov pc, lr

@ -28,4 +28,3 @@ get_sp_limit:
get_sp:
mov r0, sp
mov pc, lr

@ -19,5 +19,3 @@
# define RUSTRT_ARG1_S r1
# define RUSTRT_ARG2_S r2
# define RUSTRT_ARG3_S r3

@ -63,5 +63,3 @@ SWAP_REGISTERS:
// Return!
jmp *48(%eax)

@ -20,4 +20,3 @@ void rust_gpr::load() {
LOAD(eax); LOAD(ebx); LOAD(ecx); LOAD(edx);
LOAD(esi); LOAD(edi); LOAD(ebp); LOAD(esi);
}

@ -29,4 +29,3 @@ public:
};
#endif

@ -97,7 +97,7 @@
#endif
.globl MORESTACK
// FIXME: What about _WIN32?
// FIXME: What about _WIN32?
#if defined(__linux__) || defined(__FreeBSD__)
.hidden MORESTACK
#else
@ -253,4 +253,3 @@ L_upcall_del_stack$stub:
.subsections_via_symbols
#endif

@ -30,4 +30,3 @@ public:
};
#endif

@ -121,4 +121,3 @@ SWAP_REGISTERS:
// Jump to the instruction pointer
// found in regs:
jmp *(RUSTRT_IP*8)(ARG1)

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