Skip to content

Commit 11112d7

Browse files
borsbors
committed
---
yaml --- r: 98142 b: refs/heads/master c: fa91446 h: refs/heads/master v: v3
1 parent a4a38a2 commit 11112d7

File tree

33 files changed

+111
-174
lines changed

33 files changed

+111
-174
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 9fe5d1620cc721165062b98229d7fc682f1547ee
2+
refs/heads/master: fa91446b2b0c3ffb4d9a4906e6c74cc5d7dfe447
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: b6400f998497c3958f40997a71756ead344a776d
55
refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36

‎trunk/Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,9 @@ DRIVER_CRATE := $(S)src/driver/driver.rs
371371
LLVM_COMPONENTS=x86 arm mips ipo bitreader bitwriter linker asmparser jit mcjit \
372372
interpreter instrumentation
373373

374+
# Only build these LLVM tools
375+
LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt
376+
374377
define DEF_LLVM_VARS
375378
# The configure script defines these variables with the target triples
376379
# separated by Z. This defines new ones with the expected format.

‎trunk/doc/index.md

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,54 @@
44
<style type="text/css">
55
#TOC { display: none; }
66
.header-section-number { display: none; }
7+
li {list-style-type: none; }
78
</style>
89

9-
[The Rust tutorial](tutorial.html) ([PDF](tutorial.pdf))
10-
[The Rust reference manual](rust.html) ([PDF](rust.pdf))
10+
* [The Rust tutorial](tutorial.html) (* [PDF](tutorial.pdf))
11+
* [The Rust reference manual](rust.html) (* [PDF](rust.pdf))
1112

1213
# Guides
1314

14-
[Pointers](guide-pointers.html)
15-
[References and Lifetimes](guide-lifetimes.html)
16-
[Containers and Iterators](guide-container.html)
17-
[Tasks and Communication](guide-tasks.html)
18-
[Foreign Function Interface](guide-ffi.html)
19-
[Macros](guide-macros.html)
20-
[Packaging](guide-rustpkg.html)
21-
[Testing](guide-testing.html)
22-
[Conditions](guide-conditions.html)
23-
[Rust's Runtime](guide-runtime.html)
15+
* [Pointers](guide-pointers.html)
16+
* [References and Lifetimes](guide-lifetimes.html)
17+
* [Containers and Iterators](guide-container.html)
18+
* [Tasks and Communication](guide-tasks.html)
19+
* [Foreign Function Interface](guide-ffi.html)
20+
* [Macros](guide-macros.html)
21+
* [Packaging](guide-rustpkg.html)
22+
* [Testing](guide-testing.html)
23+
* [Conditions](guide-conditions.html)
24+
* [Rust's Runtime](guide-runtime.html)
2425

2526
# Libraries
2627

27-
[The standard library, `libstd`](std/index.html)
28-
[The extra library, `libextra`](extra/index.html)
28+
* [The standard library, `libstd`](std/index.html)
29+
* [The extra library, `libextra`](extra/index.html)
2930

30-
[The M:N runtime library, `libgreen`](green/index.html)
31-
[The 1:1 runtime library, `libnative`](native/index.html)
31+
* [The M:N runtime library, `libgreen`](green/index.html)
32+
* [The 1:1 runtime library, `libnative`](native/index.html)
3233

33-
[The Rust libuv library, `librustuv`](rustuv/index.html)
34-
[The Rust packaging library, `librustpkg`](rustpkg/index.html)
34+
* [The Rust libuv library, `librustuv`](rustuv/index.html)
35+
* [The Rust packaging library, `librustpkg`](rustpkg/index.html)
3536

36-
[The Rust parser, `libsyntax`](syntax/index.html)
37-
[The Rust compiler, `librustc`](rustc/index.html)
37+
* [The Rust parser, `libsyntax`](syntax/index.html)
38+
* [The Rust compiler, `librustc`](rustc/index.html)
3839

3940
# Tooling
4041

41-
[The `rustpkg` manual](rustpkg.html)
42+
* [The `rustdoc` manual](rustdoc.html)
43+
* [The `rustpkg` manual](rustpkg.html)
4244

4345
# FAQs
4446

45-
[Language FAQ](complement-lang-faq.html)
46-
[Project FAQ](complement-project-faq.html)
47-
[Usage FAQ](complement-usage-faq.html)
48-
[Code cheatsheet](complement-cheatsheet.html) - "How do I do X?"
49-
[How to submit a bug report](complement-bugreport.html)
47+
* [Language FAQ](complement-lang-faq.html)
48+
* [Project FAQ](complement-project-faq.html)
49+
* [Usage FAQ](complement-usage-faq.html)
50+
* [Code cheatsheet](complement-cheatsheet.html) - "How do I do X?"
51+
* [How to submit a bug report](complement-bugreport.html)
5052

5153
# External resources
5254

53-
The Rust [IRC channel](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) - `#rust` on irc.mozilla.org
54-
The Rust community on [Reddit](http://reddit.com/r/rust)
55-
The Rust [wiki](http://github.com/mozilla/rust/wiki)
55+
* The Rust [IRC channel](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) - `#rust` on irc.mozilla.org
56+
* The Rust community on [Reddit](http://reddit.com/r/rust)
57+
* The Rust [wiki](http://github.com/mozilla/rust/wiki)

‎trunk/mk/llvm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LLVM_STAMP_$(1) = $$(CFG_LLVM_BUILD_DIR_$(1))/llvm-auto-clean-stamp
2828

2929
$$(LLVM_CONFIG_$(1)): $$(LLVM_DEPS) $$(LLVM_STAMP_$(1))
3030
@$$(call E, make: llvm)
31-
$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1)) $$(CFG_LLVM_BUILD_ENV_$(1))
31+
$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1)) $$(CFG_LLVM_BUILD_ENV_$(1)) ONLY_TOOLS="$$(LLVM_TOOLS)"
3232
$$(Q)touch $$(LLVM_CONFIG_$(1))
3333
endif
3434

‎trunk/src/etc/vim/syntax/rust.vim

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ syn keyword rustTrait OrdIterator MutableDoubleEndedIterator ExactSize
8383
syn keyword rustTrait Times
8484

8585
syn keyword rustTrait Algebraic Trigonometric Exponential Hyperbolic
86-
syn keyword rustTrait Bitwise BitCount Bounded
87-
syn keyword rustTrait Integer Fractional Real RealExt
86+
syn keyword rustTrait Bitwise Bounded Integer Fractional Real RealExt
8887
syn keyword rustTrait Num NumCast CheckedAdd CheckedSub CheckedMul
8988
syn keyword rustTrait Orderable Signed Unsigned Round
9089
syn keyword rustTrait Primitive Int Float ToStrRadix ToPrimitive FromPrimitive

‎trunk/src/libextra/enum_set.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
//! This module defines a container which uses an efficient bit mask
1414
//! representation to hold C-like enum variants.
1515
16+
use std::num::Bitwise;
17+
1618
#[deriving(Clone, Eq, IterBytes, ToStr, Encodable, Decodable)]
1719
/// A specialized Set implementation to use enum types.
1820
pub struct EnumSet<E> {

‎trunk/src/libextra/num/bigint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ A `BigInt` is a combination of `BigUint` and `Sign`.
2222
use std::cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
2323
use std::num;
2424
use std::num::{Zero, One, ToStrRadix, FromStrRadix, Orderable};
25-
use std::num::{ToPrimitive, FromPrimitive};
25+
use std::num::{Bitwise, ToPrimitive, FromPrimitive};
2626
use std::rand::Rng;
2727
use std::str;
2828
use std::uint;

‎trunk/src/libnative/bookeeping.rs renamed to ‎trunk/src/libnative/bookkeeping.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,13 +8,13 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
//! 1:1 Task bookeeping
11+
//! 1:1 Task bookkeeping
1212
//!
1313
//! This module keeps track of the number of running 1:1 tasks so that entry
1414
//! points with libnative know when it's possible to exit the program (once all
1515
//! tasks have exited).
1616
//!
17-
//! The green counterpart for this is bookeeping on sched pools.
17+
//! The green counterpart for this is bookkeeping on sched pools.
1818
1919
use std::sync::atomics;
2020
use std::unstable::mutex::{Mutex, MUTEX_INIT};

‎trunk/src/libnative/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -29,7 +29,7 @@
2929
use std::os;
3030
use std::rt;
3131

32-
mod bookeeping;
32+
mod bookkeeping;
3333
pub mod io;
3434
pub mod task;
3535

@@ -75,6 +75,6 @@ pub fn start(argc: int, argv: **u8, main: proc()) -> int {
7575
/// number of arguments.
7676
pub fn run(main: proc()) -> int {
7777
main();
78-
bookeeping::wait_for_other_tasks();
78+
bookkeeping::wait_for_other_tasks();
7979
os::get_exit_status()
8080
}

‎trunk/src/libnative/task.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -27,7 +27,7 @@ use std::unstable::stack;
2727

2828
use io;
2929
use task;
30-
use bookeeping;
30+
use bookkeeping;
3131

3232
/// Creates a new Task which is ready to execute as a 1:1 task.
3333
pub fn new(stack_bounds: (uint, uint)) -> ~Task {
@@ -82,7 +82,7 @@ pub fn spawn_opts(opts: TaskOpts, f: proc()) {
8282
// Note that this increment must happen *before* the spawn in order to
8383
// guarantee that if this task exits it will always end up waiting for the
8484
// spawned task to exit.
85-
bookeeping::increment();
85+
bookkeeping::increment();
8686

8787
// Spawning a new OS thread guarantees that __morestack will never get
8888
// triggered, but we must manually set up the actual stack bounds once this
@@ -104,7 +104,7 @@ pub fn spawn_opts(opts: TaskOpts, f: proc()) {
104104
let mut task = task;
105105
task.put_runtime(ops as ~rt::Runtime);
106106
task.run(|| { f.take_unwrap()() });
107-
bookeeping::decrement();
107+
bookkeeping::decrement();
108108
})
109109
}
110110

‎trunk/src/librustc/driver/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] {
10111011
for details)", "FEATURE"),
10121012
optopt("", "android-cross-path",
10131013
"The path to the Android NDK", "PATH"),
1014-
optflagopt("W", "warn",
1014+
optmulti("W", "warn",
10151015
"Set lint warnings", "OPT"),
10161016
optmulti("A", "allow",
10171017
"Set lint allowed", "OPT"),

‎trunk/src/librustc/lib.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,9 @@ pub fn run_compiler(args: &[~str], demitter: @diagnostic::Emitter) {
227227
return;
228228
}
229229

230-
// Display the available lint options if "-W help" or only "-W" is given.
231230
let lint_flags = vec::append(matches.opt_strs("W"),
232231
matches.opt_strs("warn"));
233-
234-
let show_lint_options = lint_flags.iter().any(|x| x == &~"help") ||
235-
(matches.opt_present("W") && lint_flags.is_empty());
236-
237-
if show_lint_options {
232+
if lint_flags.iter().any(|x| x == &~"help") {
238233
describe_warnings();
239234
return;
240235
}

‎trunk/src/librustc/util/sha2.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ static H256: [u32, ..8] = [
523523
#[cfg(test)]
524524
mod tests {
525525
use super::{Digest, Sha256, FixedBuffer};
526+
use std::num::Bounded;
526527
use std::vec;
527528
use std::rand::isaac::IsaacRng;
528529
use std::rand::Rng;

‎trunk/src/librustpkg/sha1.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ impl Digest for Sha1 {
445445

446446
#[cfg(test)]
447447
mod tests {
448+
use std::num::Bounded;
448449
use std::rand::{IsaacRng, Rng};
449450
use std::vec;
450451
use extra::hex::FromHex;

‎trunk/src/libstd/num/f32.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use cmath;
1717
use default::Default;
1818
use libc::{c_float, c_int};
1919
use num::{FPCategory, FPNaN, FPInfinite , FPZero, FPSubnormal, FPNormal};
20-
use num::{Zero, One, strconv};
20+
use num::{Zero, One, Bounded, strconv};
2121
use num;
2222
use to_str;
2323
use unstable::intrinsics;

‎trunk/src/libstd/num/f64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use cmath;
1818
use default::Default;
1919
use libc::{c_double, c_int};
2020
use num::{FPCategory, FPNaN, FPInfinite , FPZero, FPSubnormal, FPNormal};
21-
use num::{Zero, One, strconv};
21+
use num::{Zero, One, Bounded, strconv};
2222
use num;
2323
use to_str;
2424
use unstable::intrinsics;

‎trunk/src/libstd/num/i16.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use prelude::*;
1616

1717
use default::Default;
18-
use num::{BitCount, CheckedAdd, CheckedSub, CheckedMul};
18+
use num::{Bitwise, Bounded, CheckedAdd, CheckedSub, CheckedMul};
1919
use num::{CheckedDiv, Zero, One, strconv};
2020
use num::{ToStrRadix, FromStrRadix};
2121
use option::{Option, Some, None};
@@ -24,7 +24,7 @@ use unstable::intrinsics;
2424

2525
int_module!(i16, 16)
2626

27-
impl BitCount for i16 {
27+
impl Bitwise for i16 {
2828
/// Counts the number of bits set. Wraps LLVM's `ctpop` intrinsic.
2929
#[inline]
3030
fn population_count(&self) -> i16 { unsafe { intrinsics::ctpop16(*self) } }

‎trunk/src/libstd/num/i32.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use prelude::*;
1616

1717
use default::Default;
18-
use num::{BitCount, CheckedAdd, CheckedSub, CheckedMul};
18+
use num::{Bitwise, Bounded, CheckedAdd, CheckedSub, CheckedMul};
1919
use num::{CheckedDiv, Zero, One, strconv};
2020
use num::{ToStrRadix, FromStrRadix};
2121
use option::{Option, Some, None};
@@ -24,7 +24,7 @@ use unstable::intrinsics;
2424

2525
int_module!(i32, 32)
2626

27-
impl BitCount for i32 {
27+
impl Bitwise for i32 {
2828
/// Counts the number of bits set. Wraps LLVM's `ctpop` intrinsic.
2929
#[inline]
3030
fn population_count(&self) -> i32 { unsafe { intrinsics::ctpop32(*self) } }

‎trunk/src/libstd/num/i64.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use prelude::*;
1717
use default::Default;
1818
#[cfg(target_word_size = "64")]
1919
use num::CheckedMul;
20-
use num::{BitCount, CheckedAdd, CheckedSub};
20+
use num::{Bitwise, Bounded, CheckedAdd, CheckedSub};
2121
use num::{CheckedDiv, Zero, One, strconv};
2222
use num::{ToStrRadix, FromStrRadix};
2323
use option::{Option, Some, None};
@@ -26,7 +26,7 @@ use unstable::intrinsics;
2626

2727
int_module!(i64, 64)
2828

29-
impl BitCount for i64 {
29+
impl Bitwise for i64 {
3030
/// Counts the number of bits set. Wraps LLVM's `ctpop` intrinsic.
3131
#[inline]
3232
fn population_count(&self) -> i64 { unsafe { intrinsics::ctpop64(*self) } }

‎trunk/src/libstd/num/i8.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use prelude::*;
1616

1717
use default::Default;
18-
use num::{BitCount, CheckedAdd, CheckedSub, CheckedMul};
18+
use num::{Bitwise, Bounded, CheckedAdd, CheckedSub, CheckedMul};
1919
use num::{CheckedDiv, Zero, One, strconv};
2020
use num::{ToStrRadix, FromStrRadix};
2121
use option::{Option, Some, None};
@@ -24,7 +24,7 @@ use unstable::intrinsics;
2424

2525
int_module!(i8, 8)
2626

27-
impl BitCount for i8 {
27+
impl Bitwise for i8 {
2828
/// Counts the number of bits set. Wraps LLVM's `ctpop` intrinsic.
2929
#[inline]
3030
fn population_count(&self) -> i8 { unsafe { intrinsics::ctpop8(*self) } }

‎trunk/src/libstd/num/int.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use prelude::*;
1616

1717
use default::Default;
18-
use num::{BitCount, CheckedAdd, CheckedSub, CheckedMul};
18+
use num::{Bitwise, Bounded, CheckedAdd, CheckedSub, CheckedMul};
1919
use num::{CheckedDiv, Zero, One, strconv};
2020
use num::{ToStrRadix, FromStrRadix};
2121
use option::{Option, Some, None};
@@ -26,7 +26,7 @@ use unstable::intrinsics;
2626
#[cfg(target_word_size = "64")] int_module!(int, 64)
2727

2828
#[cfg(target_word_size = "32")]
29-
impl BitCount for int {
29+
impl Bitwise for int {
3030
/// Counts the number of bits set. Wraps LLVM's `ctpop` intrinsic.
3131
#[inline]
3232
fn population_count(&self) -> int { (*self as i32).population_count() as int }
@@ -41,7 +41,7 @@ impl BitCount for int {
4141
}
4242

4343
#[cfg(target_word_size = "64")]
44-
impl BitCount for int {
44+
impl Bitwise for int {
4545
/// Counts the number of bits set. Wraps LLVM's `ctpop` intrinsic.
4646
#[inline]
4747
fn population_count(&self) -> int { (*self as i64).population_count() as int }

‎trunk/src/libstd/num/int_macros.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,6 @@ impl Integer for $T {
315315
fn is_odd(&self) -> bool { !self.is_even() }
316316
}
317317

318-
impl Bitwise for $T {}
319-
320318
#[cfg(not(test))]
321319
impl BitOr<$T,$T> for $T {
322320
#[inline]
@@ -446,6 +444,7 @@ mod tests {
446444
use i32;
447445
use num;
448446
use num::CheckedDiv;
447+
use num::Bitwise;
449448
use mem;
450449

451450
#[test]

0 commit comments

Comments
 (0)