Commit Graph

21 Commits

Author SHA1 Message Date
Ms2ger
605a1affe0 servo: Merge #14633 - Update Rust to 1.15.0-nightly (71c06a56a 2016-12-18) (from servo:rustup); r=SimonSapin,nox
Source-Repo: https://github.com/servo/servo
Source-Revision: df667f16b07e78fef50767c0d6912a8c2318225d
2016-12-21 16:24:27 -08:00
Lars Bergstrom
e45c5f815d servo: Merge #14629 - Revert "Update Rust to 1.15.0-nightly (8f02c429a 2016-12-15)." (from larsbergstrom:revert_rustup); r=nox
This reverts commit 5618e797683e7bfc400e8b1879d89f64bfb577fa.

<!-- Please describe your changes on the following line: -->
According to @nox, this breaks MacOS. Should be fine tomorrow:
rust-lang/rust#38430

r? @nox @Ms2ger (or whomever)

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: d918c1424783dedb8bb7f9dcbba00b8fcc0b0254
2016-12-19 06:33:09 -08:00
Ms2ger
e300cd31c3 servo: Merge #14481 - Update Rust to 1.15.0-nightly (8f02c429a 2016-12-15) (from servo:rustup); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 077a54de19ad6336cc6fae5fb4d9897535f67c2b
2016-12-19 03:58:56 -08:00
Anthony Ramine
0db918aa3e servo: Merge #14292 - Update to Rust 1.15.0-nightly (1c448574b 2016-11-28) (from servo:rustup); r=KiChjang
Source-Repo: https://github.com/servo/servo
Source-Revision: f159b5cb1028bf4d2f75b0b48055fe19a8032f8e
2016-11-29 12:20:58 -08:00
Manish Goregaokar
1219f16b31 servo: Merge #10585 - Rust upgrade to 2016-04-12 (from servo:rustup_20160414); r=Ms2ger
This currently spews out a ton of ld errors of the form

```
/home/manishearth/Mozilla/.cargo/git/checkouts/mozjs-06d7f04b6dbb8a8e/master/mozjs/js/src/jit/JitFrameIterator.h:455: error: undefined reference to 'js::jit::SnapshotReader::readAllocation()'
```

cc @nox

Source-Repo: https://github.com/servo/servo
Source-Revision: 3b96bba1d523f9b8c01581a7004f1bdd04a11f73
2016-04-15 16:25:01 +05:00
Anthony Ramine
ec275ffee7 servo: Merge #9888 - Update to Rust 2016-03-05 (from servo:rustup); r=Manishearth
Blocked by https://github.com/Manishearth/rust-tenacious/pull/14.

Source-Repo: https://github.com/servo/servo
Source-Revision: 743e0c9c878a78da873fed4edaa9c8284b2fd12d
2016-03-06 16:03:42 +05:00
Anthony Ramine
0ea769279a servo: Merge #9470 - Bump Rust to 2016-01-31 nightly (from servo:rustup); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 9baa59a6b4de338be6cd65851694785d786cf492
2016-02-02 00:29:46 +05:00
Manish Goregaokar
09d3c7ef66 servo: Merge #8446 - Rust upgrade to rustc 1.6.0-nightly (5b4986fa5 2015-11-08) (from servo:rustup_20151110); r=SimonSapin+Ms2ger+jdm+Manishearth
<s>DO NOT r+ or try+ this</s>

<s>It causes an OOM (https://github.com/rust-lang/rust/issues/29740) and can crash the OS. Probably will set our CI on fire. </s>

Source-Repo: https://github.com/servo/servo
Source-Revision: f13c72d68e1e7f49e241938bfd6e8a588c68e86b
2015-11-27 10:17:00 +05:00
Lars Bergstrom
3d8fabb5a8 servo: Merge #7837 - Rust upgrade to nightly 20151002 (from larsbergstrom:rustup_20151002); r=Manishearth
r? @Manishearth

Source-Repo: https://github.com/servo/servo
Source-Revision: 375382a2e813ee28405f6cec439330e238c4d2e5
2015-10-05 10:23:44 -06:00
Manish Goregaokar
3e8738a6e4 servo: Merge #7697 - Rust upgrade to rustc 1.5.0-dev (6217b002b 2015-09-21) (from servo:rustup_20150921); r=Ms2ger
Snapshot doesn't exist yet. Rust master+ should work.

Also https://github.com/serde-rs/aster/pull/33 hasn't merged yet.

r? @Ms2ger @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: f7f16870bebdc9359661544054259b37780f1331
2015-09-23 06:45:18 -06:00
Brandon Fairchild
704178a0dd servo: Merge #7662 - Check for multiple import blocks separated by whitespace (from nerith:import); r=frewsxcv
Fixes #7381.

Source-Repo: https://github.com/servo/servo
Source-Revision: a0d3c9223f09757124b1520c4f17e94fa8bbe249
2015-09-19 13:34:51 -06:00
Simon Sapin
d67af4db2f servo: Merge #7509 - Upgrade to rustc 1.4.0-dev (cb9323ec0 2015-09-01) (from servo:rustup_2015-09-01); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: f49615ca7b5d98ee603cf42f705073fbe4d414fb
2015-09-02 01:31:23 -06:00
Johann Tuffe
25ce9ab4be servo: Merge #7265 - Add alphabetical order check for use statements (from tafia:tidy-use); r=Ms2ger
close #7112

Source-Repo: https://github.com/servo/servo
Source-Revision: a5fbb2f2a6fa79755f975feff2435abb6a5dd0e9
2015-08-20 07:43:56 -06:00
João Oliveira
5bbd3b623e servo: Merge #7225 - Replace uses of for foo in bar.iter() and for foo in bar.iter_mut() (from jxs:master); r=nox
closes #7197

Source-Repo: https://github.com/servo/servo
Source-Revision: a1b3f477aa541fda4d1b6ccb02c3e56143f4d217
2015-08-15 03:03:21 -06:00
João Oliveira
728883c59d servo: Merge #7208 - replace .len() == 0 with is_empty() (from jxs:master); r=Ms2ger
closes #7198

Source-Repo: https://github.com/servo/servo
Source-Revision: 85022a4c347dca3f5d28cec3010f7e9410217df4
2015-08-14 00:51:59 -06:00
Simon Sapin
7e8f5555b3 servo: Merge #6548 - Upgrade to rustc 1.3.0-dev (f3b97a74a 2015-07-03) (from servo:rustup_2015-07-03); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: f5f64dab749d0851ef82be3cdc7fb2bd1cb09956
2015-07-03 21:47:02 -06:00
Corey Farwell
3d43073796 servo: Merge #6174 - Reduce max line length from 150 to 120 characters (from frewsxcv:cleanup-long-lines); r=SimonSapin
Part of https://github.com/servo/servo/issues/6041

Source-Repo: https://github.com/servo/servo
Source-Revision: 542519ebfd073662bc9421ac5fa0aa01ebc0d6fe
2015-05-24 18:27:26 -05:00
Ms2ger
f4ea3a3dd0 servo: Merge #5256 - Upgrade rustc to d3c49d2140fc65e8bb7d7cf25bfe74dda6ce5ecf/rustc-1.0.0-de (from servo:rustup_20150311); r=jdm
...v.

Relies on:
* https://github.com/servo/rust-geom/pull/72
* https://github.com/servo/rust-glx/pull/10
* https://github.com/servo/gleam/pull/15
* https://github.com/servo/rust-mozjs/pull/137
* https://github.com/servo/rust-core-text/pull/35
* https://github.com/servo/rust-io-surface/pull/28

Source-Repo: https://github.com/servo/servo
Source-Revision: 99cf9dbfc107bacb84dfe5afa9539a0ede3beac2
2015-03-18 11:25:00 -06:00
Josh Matthews
b11f7d94dc servo: Merge #4719 - Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev (from servo:rustup_20150109); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3f9012864a2cd927cf17a8e11dfa6922add1b7df
2015-01-27 18:15:50 -07:00
Ms2ger
b3c7f9d2ca servo: Merge #4554 - Update rustc to revision 2cfb5acb5a2751c759627377e602bac4f88f2d19 (from servo:rustup_20141221); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1d7148c79f9124779a910fd5291c5fa0543b2dae
2015-01-08 08:00:57 -07:00
Rohan Prinja
6b42fa7d74 servo: Merge #4521 - break up lints.rs into separate files (from ajnirp:separate-lints); r=Manishearth
for #4509

Source-Repo: https://github.com/servo/servo
Source-Revision: 685dec1abc61402ab22db93f4a362a58f8377d68
2015-01-01 01:33:41 -07:00