Commit Graph

16 Commits

Author SHA1 Message Date
Emilio Cobos Álvarez
90d9196da7 servo: Merge #20454 - Update to rustc 1.25.0-nightly (bacb5c58d 2018-01-26) (from emilio:rustup); r=SimonSapin
Update to rust version 1.26.0-nightly (188e693b3 2018-03-26)

Source-Repo: https://github.com/servo/servo
Source-Revision: d232705106478e0a2e5de78f8b40144408879c36
2018-03-29 09:12:45 -04:00
Simon Sapin
4179ee0fb3 servo: Merge #19829 - Update Rust and use the newly-stable std::ptr::NonNull (from servo:rustup); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: c1ed4bb2d5ed6a4f9967215620d2105cda5ef76a
2018-01-22 11:11:44 -06:00
Simon Sapin
c158411332 servo: Merge #19764 - Upgrade to rustc 1.25.0-nightly (e6072a7b3 2018-01-13) (from servo:rustup); r=SimonSapin
CC #19762

Source-Repo: https://github.com/servo/servo
Source-Revision: 73cb6d415e026cb06f0dc2df1f9f4c803cdf6020
2018-01-14 03:10:13 -06:00
Simon Sapin
24041c9e58 servo: Merge #19683 - Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03) (from servo:rustup); r=jdm
Fixes #19635
Fixes #19637
Fixes #19735
Fixes #19519

Source-Repo: https://github.com/servo/servo
Source-Revision: a22bff8119dd9ef4f85b277de7be6a9e20119f70
2018-01-10 14:00:32 -06:00
Alan Jeffrey
c39a8c9ff8 servo: Merge #19574 - Downgrade to rustc nightly-2017-11-14 (from asajeffrey:rustdown-2017-11-14); r=glennw
<!-- Please describe your changes on the following line: -->

This is causing nightly servo to crash with hardware acceleration.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes work around #19519
- [X] These changes do not require tests because testing requires AWS instances with GPUs.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: 57277acd27968df6323fa925d149f9a8c1c3f0cc
2017-12-18 13:59:23 -06:00
Simon Sapin
5f86fd1eb8 servo: Merge #19476 - Use workspace.default-members to specify default crates for cargo build (from servo:default-members); r=nox
… and 'cargo test', etc. Include Servo and its unit tests, but not Stylo because that would try to compile the style crate with incompatible feature flags: https://github.com/rust-lang/cargo/issues/4463

`workspace.default-members` was added in https://github.com/rust-lang/cargo/pull/4743. Older Cargo versions ignore it.

Source-Repo: https://github.com/servo/servo
Source-Revision: df68eea3f21cc3bbf24d5bbb66be42c4e3a9e427
2017-12-07 06:53:07 -06:00
Simon Sapin
98eb888374 servo: Merge #19213 - Stop using "alternate" rustc builds (from servo:nightly); r=nox
With https://github.com/rust-lang/rust/pull/45810, normal Nightly now has LLVM assertions disabled.

This allows us to entirely stop relying on private/unstable Rust CI artifacts being and remaining available: https://internals.rust-lang.org/t/public-stable-rust-services/6072

Source-Repo: https://github.com/servo/servo
Source-Revision: 856dc3c90ab920880e0bdca171720f37e40dd597
2017-11-14 02:18:20 -06:00
Simon Sapin
c86a4ab713 servo: Merge #19128 - Upgrade to rustc 1.23.0-nightly (02004ef78 2017-11-08) (from servo:asciiext); r=nox
This fixes some new warnings, some of which (in `style`) are treated as errors. See https://users.rust-lang.org/t/psa-dealing-with-warning-unused-import-std-ascii-asciiext-in-today-s-nightly/13726

Source-Repo: https://github.com/servo/servo
Source-Revision: c46c9dc019ffe5447297140c22cd8b6ee95a9f5f
2017-11-09 10:00:38 -06:00
Bastien Orivel
af5b05b1f3 servo: Merge #18868 - Update Rust to 1.22.0-nightly (dcbbfb6e8 2017-10-12) (from Eijebong:bump_rust_version); r=nox
This fixes an ICE when compiling servo with CARGO_INCREMENTAL=1

Source-Repo: https://github.com/servo/servo
Source-Revision: f0b8dad063b459db12ac27d44afff32cd6923d30
2017-10-13 19:43:49 -05:00
Anthony Ramine
5a896269d6 servo: Merge #18797 - Update Rust to 1.22.0-nightly (a47c9f870 2017-10-11) (from servo:THICC-LTO); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: acd857fff9c97aeb06ba13ccb33051161db147a5
2017-10-12 08:08:08 -05:00
Simon Sapin
5aa217f9fe servo: Merge #18760 - Upgrade to rustc 1.22.0-nightly (d7e73e4b1 2017-10-04) (from servo:rustup); r=nox
This version fixes large regressions in incremental compilation performance.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2de0e5f99e925fa9e533a49e259bb6df287400f3
2017-10-05 23:51:48 -05:00
Simon Sapin
204aba1c0f servo: Merge #18693 - Upgrade to rustc 1.22.0-nightly (c6884b12d 2017-09-30) (from servo:rustup); r=nox
A new `AddAssign` impl in the standard library made inference ambiguous.

Source-Repo: https://github.com/servo/servo
Source-Revision: a2403c5cd63d689283bc35ff9c11329a7b522caf
2017-10-01 09:46:05 -05:00
Simon Sapin
3abcf7657d servo: Merge #18541 - Upgrade to rustc 1.22.0-nightly (277476c4f 2017-09-16) (from servo:rustup); r=SimonSapin
https://github.com/rust-lang/rust/pull/43017

Source-Repo: https://github.com/servo/servo
Source-Revision: c28cf7490f2def7335c7c12e70e12e343eb1ec05
2017-09-17 08:32:23 -05:00
Simon Sapin
22c36a33ca servo: Merge #18420 - Get rustc commit hash from channel manifest (from servo:toml); r=nox,emilio
… added in https://github.com/rust-lang/rust/pull/44218, instead of using the GitHub API.

Also upgrade to rustc 1.22.0-nightly (d93036a04 2017-09-07).

Source-Repo: https://github.com/servo/servo
Source-Revision: af077a722225193b38d80622fb939b7719b46db0
2017-09-12 05:01:24 -05:00
Simon Sapin
7fb0568b4c servo: Merge #18327 - Upgrade to rustc 1.21.0-nightly (7eeac1b81 2017-08-30) (from servo:rustup); r=nox
Fix this error in the new Rust Nightly:

```rust
   Compiling script v0.0.1 (file:///home/simon/servo2/components/script)
error[E0599]: no method named `trace` found for type `&fn(&dom::node::Node) -> u16` in the current scope
   --> /home/simon/servo2/components/script/dom/treewalker.rs:464:10
    |
464 | #[derive(JSTraceable)]
    |          ^^^^^^^^^^^
    |
    = note: JSTraceable is a function, perhaps you wish to call it
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `trace`, perhaps you need to implement it:
            candidate #1: `dom::bindings::trace::JSTraceable`

error: aborting due to previous error

error: Could not compile `script`.
```

~I’ve tried to reproduce it in a minimal test case, but `impl<A, B> SomeTrait for fn(A) -> B` did not apply for `fn(&u32) -> u32` even on Rust 1.19.0 stable. So I don’t know what changed.~ This is very likely https://github.com/servo/servo/pull/18327.

Source-Repo: https://github.com/servo/servo
Source-Revision: fd833d9f18cd9196502b9768ab0ac8c1498b2f68
2017-09-01 13:54:08 -05:00
Simon Sapin
b2b44c1174 servo: Merge #18325 - Switch back to pinning Rust by Nightly date instead of commit hash… (from servo:rustup-toolchain); r=nox
… this time using a `rust-toolchain` file compatible with rustup: https://github.com/rust-lang-nursery/rustup.rs/#the-toolchain-file

And upgrade to rustc 1.21.0-nightly (c11f689d2 2017-08-29)

----

Now if both `system-rust` and `system-cargo` are set to `true` in `.servobuild`’s `[tools]` section, and the corresponding `rustc` and `cargo` binaries are in fact rustup’s wrappers, then rustup will use the correct version based on `rust-toolchain`.

CC https://github.com/servo/servo/issues/11361

Unlike https://github.com/servo/servo/pull/17927, this does not make mach use rustup directly. That should wait until https://github.com/rust-lang-nursery/rustup.rs/issues/1099 is fixed.

Source-Repo: https://github.com/servo/servo
Source-Revision: c4800a6c83e6fdabaf7c4eff70a24487d16f18ff
2017-08-31 07:47:34 -05:00