Skip to content

Commit 3993b00

Browse files
dguentherdguenther
committed
---
yaml --- r: 108393 b: refs/heads/dist-snap c: b609d57 h: refs/heads/master i: 108391: 951e133 v: v3
1 parent b30e809 commit 3993b00

Some content is hidden

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

43 files changed

+435
-345
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 93a2ee807abafa25555b17b6432d02db53f9e756
9+
refs/heads/dist-snap: b609d57b02eaf67fcc12a708dca1460bd88bcaab
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/mk/tests.mk

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,16 @@ tidy:
247247
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
248248
$(Q)find $(S)src/etc -name '*.py' \
249249
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
250+
$(Q)find $(S)src/doc -name '*.js' \
251+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
252+
$(Q)find $(S)src/etc -name '*.sh' \
253+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
254+
$(Q)find $(S)src/etc -name '*.pl' \
255+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
256+
$(Q)find $(S)src/etc -name '*.c' \
257+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
258+
$(Q)find $(S)src/etc -name '*.h' \
259+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
250260
$(Q)echo $(ALL_CS) \
251261
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
252262
$(Q)echo $(ALL_HS) \

‎branches/dist-snap/src/doc/lib/codemirror-node.js

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
// Copyright (C) 2013 by Marijn Haverbeke <[email protected]> and others
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a copy
4+
// of this software and associated documentation files (the "Software"), to deal
5+
// in the Software without restriction, including without limitation the rights
6+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
// copies of the Software, and to permit persons to whom the Software is
8+
// furnished to do so, subject to the following conditions:
9+
//
10+
// The above copyright notice and this permission notice shall be included in
11+
// all copies or substantial portions of the Software.
12+
//
13+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
// THE SOFTWARE.
20+
121
exports.htmlEscape = function(text) {
222
var replacements = {"<": "&lt;", ">": "&gt;",
323
"&": "&amp;", "\"": "&quot;"};
@@ -105,7 +125,8 @@ exports.runMode = function(string, modespec, callback) {
105125
if (string == "\n")
106126
accum.push("<br>");
107127
else if (style)
108-
accum.push("<span class=\"cm-" + exports.htmlEscape(style) + "\">" + exports.htmlEscape(string) + "</span>");
128+
accum.push("<span class=\"cm-" + exports.htmlEscape(style) + "\">" +
129+
exports.htmlEscape(string) + "</span>");
109130
else
110131
accum.push(exports.htmlEscape(string));
111132
}

‎branches/dist-snap/src/doc/lib/codemirror-rust.js

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
// Copyright (C) 2013 by Marijn Haverbeke <[email protected]> and others
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a copy
4+
// of this software and associated documentation files (the "Software"), to deal
5+
// in the Software without restriction, including without limitation the rights
6+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
// copies of the Software, and to permit persons to whom the Software is
8+
// furnished to do so, subject to the following conditions:
9+
//
10+
// The above copyright notice and this permission notice shall be included in
11+
// all copies or substantial portions of the Software.
12+
//
13+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
// THE SOFTWARE.
20+
121
CodeMirror.defineMode("rust", function() {
222
var indentUnit = 4, altIndentUnit = 2;
323
var valKeywords = {
@@ -422,7 +442,8 @@ CodeMirror.defineMode("rust", function() {
422442
type = lexical.type, closing = firstChar == type;
423443
if (type == "stat") return lexical.indented + indentUnit;
424444
if (lexical.align) return lexical.column + (closing ? 0 : 1);
425-
return lexical.indented + (closing ? 0 : (lexical.info == "match" ? altIndentUnit : indentUnit));
445+
return lexical.indented +
446+
(closing ? 0 : (lexical.info == "match" ? altIndentUnit : indentUnit));
426447
},
427448

428449
electricChars: "{}"

‎branches/dist-snap/src/doc/prep.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
#!/usr/local/bin/node
22

3+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
4+
// file at the top-level directory of this distribution and at
5+
// http://rust-lang.org/COPYRIGHT.
6+
//
7+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
8+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
9+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
10+
// option. This file may not be copied, modified, or distributed
11+
// except according to those terms.
12+
313
/***
414
* Pandoc-style markdown preprocessor that drops extra directives
515
* included for running doc code, and that optionally, when

‎branches/dist-snap/src/etc/adb_run_wrapper.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
# file at the top-level directory of this distribution and at
3+
# http://rust-lang.org/COPYRIGHT.
4+
#
5+
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
# option. This file may not be copied, modified, or distributed
9+
# except according to those terms.
10+
#
11+
# ignore-tidy-linelength
112
#
213
# usage : adb_run_wrapper [test dir - where test executables exist] [test executable]
314
#

‎branches/dist-snap/src/etc/check-links.pl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
#!/usr/bin/perl -w
2+
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
3+
# file at the top-level directory of this distribution and at
4+
# http://rust-lang.org/COPYRIGHT.
5+
#
6+
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
7+
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
8+
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
9+
# option. This file may not be copied, modified, or distributed
10+
# except according to those terms.
211

312
my $file = $ARGV[0];
413

‎branches/dist-snap/src/etc/cmathconsts.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
//
11+
//
112
// This is a helper C program for generating required math constants
213
//
314
// Should only be required when porting to a different target architecture

‎branches/dist-snap/src/etc/emacs/run_rust_emacs_tests.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
# file at the top-level directory of this distribution and at
3+
# http://rust-lang.org/COPYRIGHT.
4+
#
5+
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
# option. This file may not be copied, modified, or distributed
9+
# except according to those terms.
10+
#
111
# This runs the test for emacs rust-mode.
212
# It must be possible to find emacs via PATH.
313
emacs -batch -l rust-mode.el -l rust-mode-tests.el -f ert-run-tests-batch-and-exit

‎branches/dist-snap/src/etc/libc.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
111
/*
212
* This calculates the platform-variable portion of the libc module.
313
* Move code in here only as you discover it is platform-variable.

‎branches/dist-snap/src/etc/licenseck.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
"""
3434

3535
exceptions = [
36+
"doc/lib/codemirror-node.js", # MIT
37+
"doc/lib/codemirror-rust.js", # MIT
3638
"rt/rust_android_dummy.cpp", # BSD, chromium
3739
"rt/rust_android_dummy.h", # BSD, chromium
3840
"rt/isaac/randport.cpp", # public domain

‎branches/dist-snap/src/etc/local_stage0.sh

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
#!/bin/sh
2+
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
3+
# file at the top-level directory of this distribution and at
4+
# http://rust-lang.org/COPYRIGHT.
5+
#
6+
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
7+
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
8+
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
9+
# option. This file may not be copied, modified, or distributed
10+
# except according to those terms.
211

312
TARG_DIR=$1
413
PREFIX=$2
@@ -10,22 +19,22 @@ LIB_PREFIX=lib
1019
OS=`uname -s`
1120
case $OS in
1221
("Linux"|"FreeBSD")
13-
BIN_SUF=
14-
LIB_SUF=.so
15-
break
16-
;;
22+
BIN_SUF=
23+
LIB_SUF=.so
24+
break
25+
;;
1726
("Darwin")
18-
BIN_SUF=
19-
LIB_SUF=.dylib
20-
break
21-
;;
27+
BIN_SUF=
28+
LIB_SUF=.dylib
29+
break
30+
;;
2231
(*)
23-
BIN_SUF=.exe
24-
LIB_SUF=.dll
25-
LIB_DIR=bin
26-
LIB_PREFIX=
27-
break
28-
;;
32+
BIN_SUF=.exe
33+
LIB_SUF=.dll
34+
LIB_DIR=bin
35+
LIB_PREFIX=
36+
break
37+
;;
2938
esac
3039

3140
if [ -z $PREFIX ]; then

‎branches/dist-snap/src/etc/mingw-fix-include/bits/c++config.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
111
#ifndef _FIX_CXXCONFIG_H
212
#define _FIX_CXXCONFIG_H 1
313

‎branches/dist-snap/src/etc/mingw-fix-include/winbase.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
111
#ifndef _FIX_WINBASE_H
212
#define _FIX_WINBASE_H 1
313

‎branches/dist-snap/src/etc/mingw-fix-include/winsock2.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
111
#ifndef _FIX_WINSOCK2_H
212
#define _FIX_WINSOCK2_H 1
313

‎branches/dist-snap/src/libextra/enum_set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ impl<E:CLike> Iterator<E> for Items<E> {
129129
}
130130

131131
fn size_hint(&self) -> (uint, Option<uint>) {
132-
let exact = self.bits.count_ones();
132+
let exact = self.bits.population_count();
133133
(exact, Some(exact))
134134
}
135135
}

‎branches/dist-snap/src/libextra/test.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -904,14 +904,15 @@ pub fn run_test(force_ignore: bool,
904904
monitor_ch: Chan<MonitorMsg>,
905905
testfn: proc()) {
906906
spawn(proc() {
907+
let mut task = task::task();
907908
let (p, c) = Chan::new();
908909
let mut reader = PortReader::new(p);
909910
let stdout = ChanWriter::new(c.clone());
910911
let stderr = ChanWriter::new(c);
911-
let mut task = task::task().named(match desc.name {
912-
DynTestName(ref name) => name.clone().into_maybe_owned(),
913-
StaticTestName(name) => name.into_maybe_owned(),
914-
});
912+
match desc.name {
913+
DynTestName(ref name) => task.name(name.clone()),
914+
StaticTestName(name) => task.name(name),
915+
}
915916
task.opts.stdout = Some(~stdout as ~Writer);
916917
task.opts.stderr = Some(~stderr as ~Writer);
917918
let result_future = task.future_result();

‎branches/dist-snap/src/libgreen/task.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ impl GreenTask {
175175
opts: TaskOpts,
176176
f: proc()) -> ~GreenTask {
177177
let TaskOpts {
178+
watched: _watched,
178179
notify_chan, name, stack_size,
179180
stderr, stdout, logger,
180181
} = opts;

‎branches/dist-snap/src/libnative/task.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ pub fn spawn(f: proc()) {
5757
/// inside the task.
5858
pub fn spawn_opts(opts: TaskOpts, f: proc()) {
5959
let TaskOpts {
60+
watched: _watched,
6061
notify_chan, name, stack_size,
6162
logger, stderr, stdout,
6263
} = opts;

‎branches/dist-snap/src/librustc/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,8 @@ pub fn monitor(f: proc()) {
371371
#[cfg(not(rtopt))]
372372
static STACK_SIZE: uint = 20000000; // 20MB
373373

374-
let mut task_builder = task::task().named("rustc");
374+
let mut task_builder = task::task();
375+
task_builder.name("rustc");
375376

376377
// FIXME: Hacks on hacks. If the env is trying to override the stack size
377378
// then *don't* set it explicitly.

0 commit comments

Comments
 (0)