Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upAdd support for non-UTF8 CSS stylesheets, with rust-encoding. #1377
Conversation
Upstream: https://github.com/lifthrasiir/rust-encoding Servo’s fork: https://github.com/mozilla-servo/rust-encoding As of this writing, upstream’s master branch targets Rust 0.8, and its rust-0.9-pre branch targets Rust master. Servo uses a Rust version in-between those. I pushed a rust-servo branch to our fork that backports from rust-0.9-pre.
|
My rust-encoding commits that are not yet upstream: |
|
rust-encoding changes are now upstream. Our fork only differs in the Rust version that is targeted. |
This comment has been minimized.
This comment has been minimized.
kmcallister
commented on 4f673f0
Dec 13, 2013
|
r+ |
This comment has been minimized.
This comment has been minimized.
|
r=kmcallister (This additional commit only renames one type from rust-encoding) |
This comment has been minimized.
This comment has been minimized.
|
saw approval from kmcallister |
This comment has been minimized.
This comment has been minimized.
|
merging SimonSapin/servo/encoding = b6b8963 into auto |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
some tests failed: |
Depends on servo/rust-cssparser#33 being merged. Also (unrelated) pass around a base URL for stylesheets. Adds a new dependency: Upstream: https://github.com/lifthrasiir/rust-encoding Servo’s fork: https://github.com/mozilla-servo/rust-encoding As of this writing, upstream’s master branch targets Rust 0.8, and its rust-0.9-pre branch targets Rust master. Servo uses a Rust version in-between those. I pushed a rust-servo branch to our fork that backports from rust-0.9-pre, and also included some changes that have yet to be merged in upstream pull requests.
This comment has been minimized.
This comment has been minimized.
|
r=kmcallister |
This comment has been minimized.
This comment has been minimized.
|
saw approval from kmcallister |
This comment has been minimized.
This comment has been minimized.
|
merging SimonSapin/servo/encoding = c4c332b into auto |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
all tests pass: |
This comment has been minimized.
This comment has been minimized.
|
fast-forwarding master to auto = 45c092c |
Depends on servo/rust-cssparser#33 being merged. Also (unrelated) pass around a base URL for stylesheets. Adds a new dependency: Upstream: https://github.com/lifthrasiir/rust-encoding Servo’s fork: https://github.com/mozilla-servo/rust-encoding As of this writing, upstream’s master branch targets Rust 0.8, and its rust-0.9-pre branch targets Rust master. Servo uses a Rust version in-between those. I pushed a rust-servo branch to our fork that backports from rust-0.9-pre, and also included some changes that have yet to be merged in upstream pull requests.
bors-servo
merged commit c4c332b
into
servo:master
SimonSapin commentedDec 11, 2013
Depends on servo/rust-cssparser#33 being merged.
Also (unrelated) pass around a base URL for stylesheets.
Adds a new dependency:
Upstream: https://github.com/lifthrasiir/rust-encoding
Servo’s fork: https://github.com/mozilla-servo/rust-encoding
As of this writing, upstream’s master branch targets Rust 0.8, and its rust-0.9-pre branch targets Rust master. Servo uses a Rust version in-between those. I pushed a rust-servo branch to our fork that backports from rust-0.9-pre, and also included some changes that have yet to be merged in upstream pull requests.