Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
565,445 Commits 615 Branches 98 Tags 6 GiB
b9aa10448f
Commit Graph

8 Commits

Author SHA1 Message Date
Bastien Orivel
593044f56e 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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5ee4f3f59bb18fb58ceaf231e356bdbd224a0998
 2017-10-13 19:43:49 -05:00
Anthony Ramine
8bd574d0cd 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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 2481c6c16a05469e208c87b63c80efd4fe87c978
 2017-10-12 08:08:08 -05:00
Simon Sapin
9410fbcfa8 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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 12d0d33034c5cb9c163ada37f2dcd6110d143b8e
 2017-10-05 23:51:48 -05:00
Simon Sapin
d2cd01b018 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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : cab8cbc7d7ec90e5f5daf49eba5c6ddf230a9af0
 2017-10-01 09:46:05 -05:00
Simon Sapin
c655b0e964 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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 1e2b6d8c2339a47ed373f4a00dcea43348c04a99
 2017-09-17 08:32:23 -05:00
Simon Sapin
3874af21c1 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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4ec174151648685b4eb0204ec8798d4f82fde9c9
 2017-09-12 05:01:24 -05:00
Simon Sapin
ca59d5a7bd 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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 6abcf458330540d23b69aad3d41f2fe4429fba5a
 2017-09-01 13:54:08 -05:00
Simon Sapin
118c6485b6 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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e3d41159bc4670ea990630e5342fe9b663a79fe5
 2017-08-31 07:47:34 -05:00