mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1431776 - Update Cargo lockfiles and re-vendor rust dependencies r=jrmuizel 

MozReview-Commit-ID: CGFjsnpjrDe

--HG--
extra : rebase_source : 1aab040b85371a509632dbe6a511aa90ee3d050d
This commit is contained in:
Kartikaya Gupta 2018-01-24 09:16:36 -05:00
Родитель 237e33208b
Коммит ecdb4869cb
7 изменённых файлов: 42 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
third_party/rust/gleam/.cargo-checksum.json поставляемый
Просмотреть файл

@ -1 +1 @@
{"files":{".travis.yml":"29b74b95210896ce634c11a9037638668473b5a1b3b1716c505cb04dbb6341fa","COPYING":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"764daa15ab6e7c346adfe2a85e2f8c195016cf059fe23965385e987876f9489a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"2de24b7458d6b88f20324303a48acf64a4f2bbfb83d2ec4d6ff2b4f4a1fd2275","build.rs":"b37b2926b74c1f01bfed9aeaac7286e6570b2b2cc80e51a7583f30c039675ddc","src/gl.rs":"ccc928f20a07d9f256d99e9933394668d1ac7248a5ae08622d564cb33e6a3ce4","src/gl_fns.rs":"7de1a3e4e747c8bfeea6891bf74968c68d409f30b6ef85ff71d49caba1509a06","src/gles_fns.rs":"47af71905b0d88b79fc0dca74146bfb316b44e5e204cc8e54b189f3dd2af2dd5","src/lib.rs":"16610c19b45a3f26d56b379a3591aa2e4fc9477e7bd88f86b31c6ea32e834861"},"package":"4f756699879522bc654ecc44ad42ad14c59803c2dacfa5a67a7fc27257a8b4e9"}
{"files":{".travis.yml":"29b74b95210896ce634c11a9037638668473b5a1b3b1716c505cb04dbb6341fa","COPYING":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"dacadef6f04af7170b41899ce02202e0f261b03fb4907828095ea6b0480e20a4","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"2de24b7458d6b88f20324303a48acf64a4f2bbfb83d2ec4d6ff2b4f4a1fd2275","build.rs":"b37b2926b74c1f01bfed9aeaac7286e6570b2b2cc80e51a7583f30c039675ddc","src/gl.rs":"aecca69eced4fa373a58dd8253a2811e5e10d8e247e9a935943ac5160273d1bc","src/gl_fns.rs":"7414bf2232d181de751941b47e67f0b9a74f3672788684556b8bf61773c1d8ee","src/gles_fns.rs":"51bbbece61ebec9cfb6d68eda1fffc1a9955af58f848c9f0e6fb026e5c65e5df","src/lib.rs":"16610c19b45a3f26d56b379a3591aa2e4fc9477e7bd88f86b31c6ea32e834861"},"package":"959c818d9bbe9f7b7db55dce0bc44673c4da4f4ee122536c40550f984c3b8017"}

2
third_party/rust/gleam/Cargo.toml поставляемый
Просмотреть файл

@ -12,7 +12,7 @@
[package]
name = "gleam"
version = "0.4.19"
version = "0.4.20"
authors = ["The Servo Project Developers"]
build = "build.rs"
description = "Generated OpenGL bindings and wrapper for Servo."

6
third_party/rust/gleam/src/gl.rs поставляемый
Просмотреть файл

@ -253,6 +253,12 @@ pub trait Gl {
format: GLenum,
ty: GLenum,
offset: usize);
fn get_tex_image_into_buffer(&self,
target: GLenum,
level: GLint,
format: GLenum,
ty: GLenum,
output: &mut [u8]);
fn get_integer_v(&self, name: GLenum) -> GLint;
fn get_integer_64v(&self, name: GLenum) -> GLint64;
fn get_integer_iv(&self, name: GLenum, index: GLuint) -> GLint;

15
third_party/rust/gleam/src/gl_fns.rs поставляемый
Просмотреть файл

@ -597,6 +597,21 @@ impl Gl for GlFns {
}
}
fn get_tex_image_into_buffer(&self,
target: GLenum,
level: GLint,
format: GLenum,
ty: GLenum,
output: &mut [u8]) {
unsafe {
self.ffi_gl_.GetTexImage(target,
level,
format,
ty,
output.as_mut_ptr() as *mut _);
}
}
fn get_integer_v(&self, name: GLenum) -> GLint {
let mut result = 0;
unsafe {

11
third_party/rust/gleam/src/gles_fns.rs поставляемый
Просмотреть файл

@ -621,6 +621,17 @@ impl Gl for GlesFns {
}
}
#[allow(unused_variables)]
fn get_tex_image_into_buffer(&self,
target: GLenum,
level: GLint,
format: GLenum,
ty: GLenum,
output: &mut [u8]) {
panic!("not supported");
}
fn get_integer_v(&self, name: GLenum) -> GLint {
let mut result = 0;
unsafe {

8
toolkit/library/gtest/rust/Cargo.lock сгенерированный
Просмотреть файл

@ -613,7 +613,7 @@ dependencies = [
[[package]]
name = "gleam"
version = "0.4.19"
version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gl_generator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1538,7 +1538,7 @@ dependencies = [
"euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1577,7 +1577,7 @@ dependencies = [
"dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
"foreign-types 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1674,7 +1674,7 @@ dependencies = [
"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
"checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
"checksum gl_generator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f5c19cde55637681450c92f7a05ea16c78e2b6d0587e601ec1ebdab6960854b"
"checksum gleam 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "4f756699879522bc654ecc44ad42ad14c59803c2dacfa5a67a7fc27257a8b4e9"
"checksum gleam 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "959c818d9bbe9f7b7db55dce0bc44673c4da4f4ee122536c40550f984c3b8017"
"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
"checksum ident_case 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9826188e666f2ed92071d2dadef6edc430b11b158b5b2b3f4babbcc891eaaa"
"checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"

8
toolkit/library/rust/Cargo.lock сгенерированный
Просмотреть файл

@ -612,7 +612,7 @@ dependencies = [
[[package]]
name = "gleam"
version = "0.4.19"
version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gl_generator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1550,7 +1550,7 @@ dependencies = [
"euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1589,7 +1589,7 @@ dependencies = [
"dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
"foreign-types 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1686,7 +1686,7 @@ dependencies = [
"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
"checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
"checksum gl_generator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f5c19cde55637681450c92f7a05ea16c78e2b6d0587e601ec1ebdab6960854b"
"checksum gleam 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "4f756699879522bc654ecc44ad42ad14c59803c2dacfa5a67a7fc27257a8b4e9"
"checksum gleam 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "959c818d9bbe9f7b7db55dce0bc44673c4da4f4ee122536c40550f984c3b8017"
"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
"checksum ident_case 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9826188e666f2ed92071d2dadef6edc430b11b158b5b2b3f4babbcc891eaaa"
"checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"