Rolling up PRs in the queue #22520

alexcrichton · 2015-02-19T02:01:59Z

No description provided.

…arse-fail

No need to create a bunch of blocks and a stack allocated temporary just to build a simple loop.

In trans_slice_vec we currently use arrayalloca, which gives us a pointer to the element type with enough memory allocated for the requested number of elements. This works, but everywhere else we use the [n x T] type for fixed size arrays and so we have to bitcast the pointer here. Let's directly use the proper type for the allocation and remove some code duplication along the way.

… that reference `Self`. Fixes rust-lang#18956.

…fe. Fixes rust-lang#22040.

Casting the pointer to an integer requires a ptrtoint, while casting 0 to a pointer is directly folded to a `null` value.

The data pointer used in the slice is never null, using assume() to tell LLVM about it gets rid of various unneeded null checks when iterating over the slice. Since the snapshot compiler is still using an older LLVM version, omit the call in stage0, because compile times explode otherwise. Benchmarks from rust-lang#18193 ```` running 5 tests test _range ... bench: 33329 ns/iter (+/- 417) test assembly ... bench: 33299 ns/iter (+/- 58) test enumerate ... bench: 33318 ns/iter (+/- 83) test iter ... bench: 33311 ns/iter (+/- 130) test position ... bench: 33300 ns/iter (+/- 47) test result: ok. 0 passed; 0 failed; 0 ignored; 5 measured ```` Fixes rust-lang#18193

* cast 3-valued `core::cmp::Ordering` to `i32`, not `int`. * use `isize`/`usize` in the impl macros.

* Use `i32` (`u32`) in doc examples, not `int` (`u32`). * Switch impl macros to use `isize`/`usize` rather than `int`/`uint`.

…usize`. Likewise, `fn offset` takes an `isize`.

into variance inference; fix various bugs in variance inference so that it considers the correct set of constraints; modify infer to consider the results of variance inference for type arguments.

variance or an associated type.

…nd ownership, and also follows the API of `NonZero` a bit more closely. More to do here I think (including perhaps a new name).

… unsafe pointer.

…ters are used.

alexcrichton · 2015-02-19T03:42:12Z

@bors: r+ 8cd10ce p=100

bors · 2015-02-19T03:42:40Z

⌛ Testing commit 8cd10ce with merge e9128cb...

bors · 2015-02-19T04:15:10Z

💔 Test failed - auto-mac-64-nopt-t

Manishearth · 2015-02-19T04:16:20Z

                                                                                                         ^
/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/os.rs:567:9: 567:28 error: use of deprecated item: use CStr::from_ptr(p).to_bytes() instead, #[deny(deprecated)] on by default
/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/os.rs:567         ffi::c_str_to_bytes(&*argv.offset(i as int)).to_vec()
                                                                                               ^~~~~~~~~~~~~~~~~~~

alexcrichton · 2015-02-19T04:17:09Z

@bors: r+ 58000b2 p=100

bors · 2015-02-19T04:17:57Z

⌛ Testing commit 58000b2 with merge 793f81e...

bors · 2015-02-19T05:39:31Z

💔 Test failed - auto-mac-32-opt

alexcrichton · 2015-02-19T06:33:08Z

@bors: r+ 9887263 p=100

bors · 2015-02-19T06:34:12Z

⌛ Testing commit 9887263 with merge bd829d3...

bors · 2015-02-19T07:59:26Z

💔 Test failed - auto-mac-32-opt

Manishearth · 2015-02-19T08:25:17Z

Seems to be the hash table thing again cc @gankro

I'll be able to have a closer look in a couple of hours, got class.

Manishearth · 2015-02-19T10:42:04Z

Poked at it, not really sure what it is. I'll need to dig up a 32bit system to really look at it.

alexcrichton · 2015-02-19T15:03:44Z

@bors: r+ 0cd54b8 p=100

bors · 2015-02-19T15:03:45Z

🙀 You have the wrong number! Please try again with 163be75.

alexcrichton · 2015-02-19T15:04:04Z

@bors: r+ 163be75 p=100

bors · 2015-02-19T15:04:26Z

⌛ Testing commit 163be75 with merge 3cf3483...

bors · 2015-02-19T16:51:39Z

💔 Test failed - auto-win-32-opt

Manishearth · 2015-02-19T17:50:10Z

I moved this to #22541

(You can push to the rollup branch on my fork to continue it)

Continued from #22520

fhahn and others added 30 commits February 16, 2015 20:52

Move remaning compile-fail tests that are rejected by the parser to p…

5550beb

…arse-fail

Add pfail targets for parse-fail tests

6824f13

Simplify the codegen in iter_vec_loop

378abdb

No need to create a bunch of blocks and a stack allocated temporary just to build a simple loop.

When converting parameters for an object type, be careful of defaults…

02e1d5e

… that reference `Self`. Fixes rust-lang#18956.

Traits that reference Self in the supertrait list are not object-sa…

ff388c1

…fe. Fixes rust-lang#22040.

Implement RandomAccessIterator for Cloned

5705d48

Opt for .cloned() over .map(|x| x.clone()) etc.

2f586b9

Remove usage of .map(|&foo| foo)

061206b

librustc: implement Clone for middle::ty::FreeVar

d2f54e6

Fixed link in ffi documentation

b8527c0

Avoid ptrtoint when checking if a pointer is null

52b5150

Casting the pointer to an integer requires a ptrtoint, while casting 0 to a pointer is directly folded to a `null` value.

Audit core::borrow for use of int/uint: use i32 in doc example.

f82e231

Audit core::cmp for int/uint.

343909b

* cast 3-valued `core::cmp::Ordering` to `i32`, not `int`. * use `isize`/`usize` in the impl macros.

Audit core::default for int/uint usage.

e240cb9

* Use `i32` (`u32`) in doc examples, not `int` (`u32`). * Switch impl macros to use `isize`/`usize` rather than `int`/`uint`.

Audit core::intrinsics for int/uint: size_of/align_of use `…

fc0f6e8

…usize`. Likewise, `fn offset` takes an `isize`.

Introduce the new phantomdata/phantomfn markers and integrate them

2594d56

into variance inference; fix various bugs in variance inference so that it considers the correct set of constraints; modify infer to consider the results of variance inference for type arguments.

Report errors for type parameters that are not constrained, either by

91eedfe

variance or an associated type.

Extend coherence check to understand subtyping.

8c841f2

Rewrite Unique<T> so that it is covariant in T, implies NonZero a…

801bc48

…nd ownership, and also follows the API of `NonZero` a bit more closely. More to do here I think (including perhaps a new name).

Constrain operands to outlive the operation. Fixes rust-lang#21422.

f2529ac

Fallout: Port Vec to use Unique

c5579ca

Fallout: btree. Rephrase invariant lifetime in terms of PhantomData.

b3c00a6

Fallout: port btree to use Unique, some markers.

68ebe64

Fallout: EnumSet, add Marker.

c2891cc

Fallout: RingBuf, use Unique.

8dbdcdb

Fallout: arena needs to use phantomdata since invariantlifetime is gone

2bcf3a4

Fallout: AtomicPtr needs phantom data to indicate that it contains an…

1735e41

… unsafe pointer.

Fallout: iter, add markers or other changes such that all type parame…

d801a4d

…ters are used.

alexcrichton force-pushed the rollup branch from 8cd10ce to 58000b2 Compare February 19, 2015 04:16

bors added a commit that referenced this pull request Feb 19, 2015

Auto merge of #22520 - alexcrichton:rollup, r=alexcrichton

793f81e

alexcrichton force-pushed the rollup branch from 58000b2 to 9887263 Compare February 19, 2015 06:32

alexcrichton force-pushed the rollup branch from 9887263 to 0cd54b8 Compare February 19, 2015 15:03

alexcrichton added 2 commits February 19, 2015 07:03

Round 5 test fixes and rebase conflicts

0cd54b8

Merge remote-tracking branch 'origin/master' into rollup

163be75

bors added a commit that referenced this pull request Feb 19, 2015

Auto merge of #22520 - alexcrichton:rollup, r=alexcrichton

3cf3483

Manishearth mentioned this pull request Feb 19, 2015

Rolling up PRs in the queue #22541

Merged

Gankra closed this Feb 19, 2015

bors added a commit that referenced this pull request Feb 19, 2015

Auto merge of #22541 - Manishearth:rollup, r=Gankro

522d09d

Continued from #22520

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rolling up PRs in the queue #22520

Rolling up PRs in the queue #22520

alexcrichton commented Feb 19, 2015

alexcrichton commented Feb 19, 2015

bors commented Feb 19, 2015

bors commented Feb 19, 2015

Manishearth commented Feb 19, 2015

alexcrichton commented Feb 19, 2015

bors commented Feb 19, 2015

bors commented Feb 19, 2015

alexcrichton commented Feb 19, 2015

bors commented Feb 19, 2015

bors commented Feb 19, 2015

Manishearth commented Feb 19, 2015

Manishearth commented Feb 19, 2015

alexcrichton commented Feb 19, 2015

bors commented Feb 19, 2015

alexcrichton commented Feb 19, 2015

bors commented Feb 19, 2015

bors commented Feb 19, 2015

Manishearth commented Feb 19, 2015

Rolling up PRs in the queue #22520

Rolling up PRs in the queue #22520

Conversation

alexcrichton commented Feb 19, 2015

alexcrichton commented Feb 19, 2015

bors commented Feb 19, 2015

bors commented Feb 19, 2015

Manishearth commented Feb 19, 2015

alexcrichton commented Feb 19, 2015

bors commented Feb 19, 2015

bors commented Feb 19, 2015

alexcrichton commented Feb 19, 2015

bors commented Feb 19, 2015

bors commented Feb 19, 2015

Manishearth commented Feb 19, 2015

Manishearth commented Feb 19, 2015

alexcrichton commented Feb 19, 2015

bors commented Feb 19, 2015

alexcrichton commented Feb 19, 2015

bors commented Feb 19, 2015

bors commented Feb 19, 2015

Manishearth commented Feb 19, 2015