Skip to content

Commit

Permalink
Bug 1554401 - Part 2: Revendor dependencies. r=emilio
Browse files Browse the repository at this point in the history
Depends on D32567

Differential Revision: https://phabricator.services.mozilla.com/D32568

--HG--
extra : moz-landing-system : lando
  • Loading branch information
Eijebong committed May 25, 2019
1 parent 998c4ce commit f837a8e
Show file tree
Hide file tree
Showing 26 changed files with 2,976 additions and 2,628 deletions.
2 changes: 1 addition & 1 deletion third_party/rust/dwrote/.cargo-checksum.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"files":{"Cargo.toml":"97226421832e89c8a4c1b25a5e86493fc13b0d085ceb913a04f501f5c3859b0b","README.md":"d69d75705e2582721cbfb2d3b4b2af052c71679057a0b2ac53a22c03f1755bba","appveyor.yml":"6a91cdfbcc8c363ead82321b3be509bb7bf9cf8b90c63518d6484371abcfed48","src/bitmap_render_target.rs":"fc13525d7459515e4bf9769c8a8961b046b4d1ba4042591aaf0925dd5edebf64","src/com_helpers.rs":"02535b27bfb0cee6e4d8db3abd22f2d2e8137a4ce3ab3504beaf4fa3ca9370df","src/comptr.rs":"84794cf04b772398e75fdb5d55fd8fa015abf26c61b1f9c761a597133682b2e1","src/font.rs":"a79b944f2f5125bbef9e24921355dc6996f073e3742ddd410b8efaa0df3a3ee2","src/font_collection.rs":"67cd566714f4c0a20cba24dd064ba471e75016fa2672b2153a19878e6b71f24d","src/font_collection_impl.rs":"a585a6ce62083b3346d67619ea47fec46423a7fb04cc11372828389ab26c5a05","src/font_face.rs":"7f78c4132df39857d8118ac3eacbb57e11bca1d69f9d7f8e1c1c24b7a2b69749","src/font_family.rs":"4e948542dba0c158187d0cb2d72343c443380480cacd12894070d0ef1351dd0a","src/font_file.rs":"4bfcaa94c97174e7ab98130011c76ba56c4d25673c02cd46463bb258eecc823b","src/font_file_loader_impl.rs":"71c4153971dbfc21d42ba2e33f159fcb145f7dcfbd17e856e9fd75f0571d41e0","src/gdi_interop.rs":"04dbef7c34bb0fe62c4f2c2ceca62ca94c75a964d744b29b3322a6c3bbb4eabd","src/geometry_sink_impl.rs":"d615de212e55b8b8d95c8d605fc5d78044b4ae4dfd846f706911a16cc3afc049","src/glyph_run_analysis.rs":"23c674e892287884ad92faf02813397e4347d61d3b363f6acb8d578c14e65051","src/helpers.rs":"2f3c57642b24b80c45bbd012e7d6ca1fc524b1b42a8be004cb9b52ea13f4166d","src/lib.rs":"16cc8c236226047bc5ca65f921d2aebec4a3a6101a2c8f2853f39a5db4639e16","src/outline_builder.rs":"0f5c842b2ffe75e21d68f93be6a3834c120bd43303d4e490fdfee9f4f964cdc4","src/rendering_params.rs":"850a51143790f5d29422dc49cbceddc232d814ecd0e6933434ad644e6eec539b","src/test.rs":"158aa4d03655f4efef00327fe72a03dfb504659176aa0eef976ca2485b2c1d74","src/types.rs":"9374d8c5bac80e5e0b66188c5ff4f5f49264e15db837049932d4fd703c33746e"},"package":"c31c624339dab99c223a4b26c2e803b7c248adaca91549ce654c76f39a03f5c8"}
{"files":{"Cargo.toml":"f9e7e5a23ac28b65778fce2d14b4378ce59a2f7cfb954663992c862cc95a7626","README.md":"2583afe9b90e5f23ce4e9926efea35ebbe1bd0fc6d7f8a3097cb1fe589524d50","appveyor.yml":"cc2f2d621f6357214fc14aeccfb387dccec74876e2e977691f532e98e8648088","src/bitmap_render_target.rs":"966d19609319c57af0b41bc3e3a6e78d8ad320e18c2f2927a775c8d461de1f97","src/com_helpers.rs":"1278c5eeffdde4270eac69c407b9bd32ea2ea871a3d7b8cc0455ae9533b02616","src/comptr.rs":"2355265138f0fb358eeb663806d121de2c5289783aeb8ce5fa405109ee4cac5b","src/font.rs":"5443f57dbfde84fe6d40e77b65a835595fa5c8d3cab7069aa5def1113b8f2956","src/font_collection.rs":"de26b878c0b915d3a5b8bdaa381279cee26efa2aa1e4392ad124702d09d082db","src/font_collection_impl.rs":"7007724f027168870674e9b7d42b78c634458cebed6b04563bd37be4c152da4a","src/font_face.rs":"0ebaca13ec525dd9f1963757dd9d6f9229792ee8b4ce42ab9840bc91801d885f","src/font_fallback.rs":"b79ba0a389ef8b2a1cdbb9204a2ed32e0da2945dd5e32a3f9741b1c3e8e18707","src/font_family.rs":"4dc374fbd43fdc160031b2055d79cb8d6aa7fcc020a791bcd8be6bf16ce7cc9b","src/font_file.rs":"c82b8c3ec4d5d2d791b357223c601deff3097df940edf3b2bb3d553422ea23e1","src/font_file_loader_impl.rs":"05c5d332b66a0029d04e27dfc59ba0bd28e0cac82a717d2203a7aa399db6d599","src/gdi_interop.rs":"2c463961e96dde4754ed430e57866e5e16e985f50c95d6a73c40a1a846ba48a6","src/geometry_sink_impl.rs":"0327f47fa709ecf2b663274f04d1c4cbf2277c05db088cb631aa3688aef68f95","src/glyph_run_analysis.rs":"82a553204a3dcb9719d45366e86230054edc2ad4204faea77aa498a46e303b1b","src/helpers.rs":"5386acfa2e5016e07ebe2486e880d86c836ab2c6f31071e545f0136ca640bc2e","src/lib.rs":"571e008d202e67ab8c6b79795f3a74d12210876d34221df4ca661ee5adbe5243","src/outline_builder.rs":"dc548624af669f086bf3f009e9f049fa4606470ba065b1b2bef48da7023140ef","src/rendering_params.rs":"18ffff6e8f4c1b020837cdfaf9acdf0fcda818dbf863c1fbafe66ed23a810167","src/test.rs":"dca44ed337f5b2b9409076428881ed4f57dbc10f09bc5cad7d6bbd8ab4fe2415","src/text_analysis_source.rs":"328fdc42cf8a962363f6da08af6a1936da89158be30ae05dac2e8f653ff432e0","src/text_analysis_source_impl.rs":"70747bb3e6cd7d4ae4acfe181fee0d8fe1f6966c48064597de88ad69120f34da","src/types.rs":"628ba0d2fa199b26e6d47be0a9fd924b9c67401f3ee0d67b41d7b93f96007232"},"package":"0bd1369e02db5e9b842a9b67bce8a2fcc043beafb2ae8a799dd482d46ea1ff0d"}
4 changes: 2 additions & 2 deletions third_party/rust/dwrote/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

[package]
name = "dwrote"
version = "0.8.0"
authors = ["Vladimir Vukicevic <[email protected]>"]
version = "0.9.0"
authors = ["The Servo Project Developers", "Vladimir Vukicevic <[email protected]>"]
description = "Lightweight binding to DirectWrite."
license = "MPL-2.0"
repository = "https://github.com/servo/dwrote-rs"
Expand Down
24 changes: 12 additions & 12 deletions third_party/rust/dwrote/README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# dwrote
A thin wrapper around Windows DirectWrite for Rust

Dwrote provides access to pieces of DirectWrite needed by WebRender
and Servo. It can be easily extended to other parts of DirectWrite,
but full mapping of the DirectWrite API is not a goal (pull requests
accepted, of course).

There are a few additional helper functions on individual types that
don't exist in DirectWrite, and a few have had their signatures changed,
but for the most part this library attempts to replicate the DirectWrite
API.
# dwrote
A thin wrapper around Windows DirectWrite for Rust

Dwrote provides access to pieces of DirectWrite needed by WebRender
and Servo. It can be easily extended to other parts of DirectWrite,
but full mapping of the DirectWrite API is not a goal (pull requests
accepted, of course).

There are a few additional helper functions on individual types that
don't exist in DirectWrite, and a few have had their signatures changed,
but for the most part this library attempts to replicate the DirectWrite
API.
244 changes: 122 additions & 122 deletions third_party/rust/dwrote/appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,122 +1,122 @@
# Appveyor configuration template for Rust using rustup for Rust installation
# https://github.com/starkat99/appveyor-rust

## Operating System (VM environment) ##

# Rust needs at least Visual Studio 2013 Appveyor OS for MSVC targets.
os: Visual Studio 2015

## Build Matrix ##

# This configuration will setup a build for each channel & target combination (12 windows
# combinations in all).
#
# There are 3 channels: stable, beta, and nightly.
#
# Alternatively, the full version may be specified for the channel to build using that specific
# version (e.g. channel: 1.5.0)
#
# The values for target are the set of windows Rust build targets. Each value is of the form
#
# ARCH-pc-windows-TOOLCHAIN
#
# Where ARCH is the target architecture, either x86_64 or i686, and TOOLCHAIN is the linker
# toolchain to use, either msvc or gnu. See https://www.rust-lang.org/downloads.html#win-foot for
# a description of the toolchain differences.
# See https://github.com/rust-lang-nursery/rustup.rs/#toolchain-specification for description of
# toolchains and host triples.
#
# Comment out channel/target combos you do not wish to build in CI.
#
# You may use the `cargoflags` and `RUSTFLAGS` variables to set additional flags for cargo commands
# and rustc, respectively. For instance, you can uncomment the cargoflags lines in the nightly
# channels to enable unstable features when building for nightly. Or you could add additional
# matrix entries to test different combinations of features.
environment:
matrix:

### MSVC Toolchains ###

# Stable 64-bit MSVC
- channel: stable
target: x86_64-pc-windows-msvc
# Stable 32-bit MSVC
# - channel: stable
# target: i686-pc-windows-msvc
# Beta 64-bit MSVC
# - channel: beta
# target: x86_64-pc-windows-msvc
# Beta 32-bit MSVC
# - channel: beta
# target: i686-pc-windows-msvc
# Nightly 64-bit MSVC
# - channel: nightly
# target: x86_64-pc-windows-msvc
#cargoflags: --features "unstable"
# Nightly 32-bit MSVC
# - channel: nightly
# target: i686-pc-windows-msvc
#cargoflags: --features "unstable"

### GNU Toolchains ###

# Stable 64-bit GNU
# - channel: stable
# target: x86_64-pc-windows-gnu
# Stable 32-bit GNU
# - channel: stable
# target: i686-pc-windows-gnu
# Beta 64-bit GNU
# - channel: beta
# target: x86_64-pc-windows-gnu
# Beta 32-bit GNU
# - channel: beta
# target: i686-pc-windows-gnu
# Nightly 64-bit GNU
# - channel: nightly
# target: x86_64-pc-windows-gnu
# #cargoflags: --features "unstable"
# Nightly 32-bit GNU
# - channel: nightly
# target: i686-pc-windows-gnu
#cargoflags: --features "unstable"

### Allowed failures ###

# See Appveyor documentation for specific details. In short, place any channel or targets you wish
# to allow build failures on (usually nightly at least is a wise choice). This will prevent a build
# or test failure in the matching channels/targets from failing the entire build.
matrix:
allow_failures:
- channel: nightly

# If you only care about stable channel build failures, uncomment the following line:
#- channel: beta

## Install Script ##

# This is the most important part of the Appveyor configuration. This installs the version of Rust
# specified by the 'channel' and 'target' environment variables from the build matrix. This uses
# rustup to install Rust.
#
# For simple configurations, instead of using the build matrix, you can simply set the
# default-toolchain and default-host manually here.
install:
- appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
- rustup-init -yv --default-toolchain %channel% --default-host %target%
- set PATH=%PATH%;%USERPROFILE%\.cargo\bin
- rustc -vV
- cargo -vV

## Build Script ##

# 'cargo test' takes care of building for us, so disable Appveyor's build stage. This prevents
# the "directory does not contain a project or solution file" error.
build: false

# Uses 'cargo test' to run tests and build. Alternatively, the project may call compiled programs
#directly or perform other testing commands. Rust will automatically be placed in the PATH
# environment variable.
test_script:
- cargo check --no-default-features
- cargo test --verbose %cargoflags%
# Appveyor configuration template for Rust using rustup for Rust installation
# https://github.com/starkat99/appveyor-rust

## Operating System (VM environment) ##

# Rust needs at least Visual Studio 2013 Appveyor OS for MSVC targets.
os: Visual Studio 2015

## Build Matrix ##

# This configuration will setup a build for each channel & target combination (12 windows
# combinations in all).
#
# There are 3 channels: stable, beta, and nightly.
#
# Alternatively, the full version may be specified for the channel to build using that specific
# version (e.g. channel: 1.5.0)
#
# The values for target are the set of windows Rust build targets. Each value is of the form
#
# ARCH-pc-windows-TOOLCHAIN
#
# Where ARCH is the target architecture, either x86_64 or i686, and TOOLCHAIN is the linker
# toolchain to use, either msvc or gnu. See https://www.rust-lang.org/downloads.html#win-foot for
# a description of the toolchain differences.
# See https://github.com/rust-lang-nursery/rustup.rs/#toolchain-specification for description of
# toolchains and host triples.
#
# Comment out channel/target combos you do not wish to build in CI.
#
# You may use the `cargoflags` and `RUSTFLAGS` variables to set additional flags for cargo commands
# and rustc, respectively. For instance, you can uncomment the cargoflags lines in the nightly
# channels to enable unstable features when building for nightly. Or you could add additional
# matrix entries to test different combinations of features.
environment:
matrix:

### MSVC Toolchains ###

# Stable 64-bit MSVC
- channel: stable
target: x86_64-pc-windows-msvc
# Stable 32-bit MSVC
# - channel: stable
# target: i686-pc-windows-msvc
# Beta 64-bit MSVC
# - channel: beta
# target: x86_64-pc-windows-msvc
# Beta 32-bit MSVC
# - channel: beta
# target: i686-pc-windows-msvc
# Nightly 64-bit MSVC
# - channel: nightly
# target: x86_64-pc-windows-msvc
#cargoflags: --features "unstable"
# Nightly 32-bit MSVC
# - channel: nightly
# target: i686-pc-windows-msvc
#cargoflags: --features "unstable"

### GNU Toolchains ###

# Stable 64-bit GNU
# - channel: stable
# target: x86_64-pc-windows-gnu
# Stable 32-bit GNU
# - channel: stable
# target: i686-pc-windows-gnu
# Beta 64-bit GNU
# - channel: beta
# target: x86_64-pc-windows-gnu
# Beta 32-bit GNU
# - channel: beta
# target: i686-pc-windows-gnu
# Nightly 64-bit GNU
# - channel: nightly
# target: x86_64-pc-windows-gnu
# #cargoflags: --features "unstable"
# Nightly 32-bit GNU
# - channel: nightly
# target: i686-pc-windows-gnu
#cargoflags: --features "unstable"

### Allowed failures ###

# See Appveyor documentation for specific details. In short, place any channel or targets you wish
# to allow build failures on (usually nightly at least is a wise choice). This will prevent a build
# or test failure in the matching channels/targets from failing the entire build.
matrix:
allow_failures:
- channel: nightly

# If you only care about stable channel build failures, uncomment the following line:
#- channel: beta

## Install Script ##

# This is the most important part of the Appveyor configuration. This installs the version of Rust
# specified by the 'channel' and 'target' environment variables from the build matrix. This uses
# rustup to install Rust.
#
# For simple configurations, instead of using the build matrix, you can simply set the
# default-toolchain and default-host manually here.
install:
- appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
- rustup-init -yv --default-toolchain %channel% --default-host %target%
- set PATH=%PATH%;%USERPROFILE%\.cargo\bin
- rustc -vV
- cargo -vV

## Build Script ##

# 'cargo test' takes care of building for us, so disable Appveyor's build stage. This prevents
# the "directory does not contain a project or solution file" error.
build: false

# Uses 'cargo test' to run tests and build. Alternatively, the project may call compiled programs
#directly or perform other testing commands. Rust will automatically be placed in the PATH
# environment variable.
test_script:
- cargo check --no-default-features
- cargo test --verbose %cargoflags%
Loading

0 comments on commit f837a8e

Please sign in to comment.