3 Commits

Author	SHA1	Message	Date
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