Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #24283 - servo:rustup, r=jdm

Browse source 
Upgrade to rustc 1.39.0-nightly (66bf391c3 2019-09-23)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24283)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-09-25 13:54:00 -04:00 • committed by GitHub
commit 5518951143
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/layout/inline.rs
View file

@ -1048,7 +1048,9 @@ impl InlineFlow {
inline_start_position_for_fragment =
inline_start_position_for_fragment + slack_inline_size
},
TextAlign::Left | TextAlign::ServoLeft | TextAlign::Right | TextAlign::ServoRight => unreachable!(),
TextAlign::Left | TextAlign::ServoLeft | TextAlign::Right | TextAlign::ServoRight => {
unreachable!()
},
}
// Lay out the fragments in visual order.

2
components/style/Cargo.toml
View file

@ -82,7 +82,7 @@ void = "1.0.2"
[build-dependencies]
lazy_static = "1"
log = "0.4"
bindgen = {version = "0.49", optional = true, default-features = false}
bindgen = {version = "0.51", optional = true, default-features = false}
regex = {version = "1.1", optional = true}
walkdir = "2.1.4"
toml = {version = "0.5", optional = true, default-features = false}