Skip to content

Commit

Permalink
Auto merge of #11017 - mbrubeck:rustup3, r=larsbergstrom
Browse files Browse the repository at this point in the history
Update to Rust nightly 2016-04-29

Patch by @fabricedesre from #11010, updated to fix test-tidy and to not conflict with other PRs in the queue. r? @larsbergstrom

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11017)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed May 5, 2016
2 parents 95a1f76 + 1fbc2bb commit ea47891
Show file tree
Hide file tree
Showing 6 changed files with 813 additions and 805 deletions.
2 changes: 1 addition & 1 deletion components/script/Cargo.toml
Expand Up @@ -54,7 +54,7 @@ rand = "0.3"
phf = "0.7.13"
phf_macros = "0.7.13"
ref_filter_map = "1.0"
ref_slice = "0.1.0"
ref_slice = "1.0"
regex = "0.1.43"
rustc-serialize = "0.3"
selectors = {version = "0.5", features = ["heap_size"]}
Expand Down

0 comments on commit ea47891

Please sign in to comment.