liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Bump to rand 0.8

This commit is contained in:
Mike Welsh 2020-12-19 13:18:15 -08:00
parent 5503399545
commit 8a0e55d74a
10 changed files with 116 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
Cargo.lock generated
View File

@ -182,6 +182,12 @@ dependencies = [
"rustc-demangle",
]
[[package]]
name = "base-x"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
[[package]]
name = "base64"
version = "0.10.1"
@ -794,7 +800,7 @@ dependencies = [
"nix 0.15.0",
"oboe",
"parking_lot 0.11.1",
"stdweb",
"stdweb 0.1.3",
"thiserror",
"web-sys",
"winapi 0.3.9",
@ -1128,6 +1134,12 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "discard"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
[[package]]
name = "dispatch"
version = "0.2.0"
@ -1560,6 +1572,19 @@ dependencies = [
"wasi 0.9.0+wasi-snapshot-preview1",
]
[[package]]
name = "getrandom"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4"
dependencies = [
"cfg-if 0.1.10",
"libc",
"stdweb 0.4.20",
"wasi 0.9.0+wasi-snapshot-preview1",
"wasm-bindgen",
]
[[package]]
name = "gfx-auxil"
version = "0.7.0"
@ -3122,23 +3147,20 @@ dependencies = [
[[package]]
name = "rand"
version = "0.7.3"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
checksum = "a76330fb486679b4ace3670f117bbc9e16204005c4bde9c4bd372f45bed34f12"
dependencies = [
"getrandom",
"libc",
"rand_chacha",
"rand_core",
"rand_hc",
"rand_pcg",
]
[[package]]
name = "rand_chacha"
version = "0.2.2"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
dependencies = [
"ppv-lite86",
"rand_core",
@ -3146,29 +3168,11 @@ dependencies = [
[[package]]
name = "rand_core"
version = "0.5.1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
checksum = "a8b34ba8cfb21243bd8df91854c830ff0d785fff2e82ebd4434c2644cb9ada18"
dependencies = [
"getrandom",
]
[[package]]
name = "rand_hc"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
dependencies = [
"rand_core",
]
[[package]]
name = "rand_pcg"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
dependencies = [
"rand_core",
"getrandom 0.2.0",
]
[[package]]
@ -3223,7 +3227,7 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
dependencies = [
"getrandom",
"getrandom 0.1.15",
"redox_syscall",
"rust-argon2",
]
@ -3445,6 +3449,7 @@ dependencies = [
"console_log",
"fnv",
"generational-arena",
"getrandom 0.2.0",
"js-sys",
"log",
"ruffle_core",
@ -3632,6 +3637,23 @@ dependencies = [
"syn",
]
[[package]]
name = "serde_json"
version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
dependencies = [
"itoa",
"ryu",
"serde",
]
[[package]]
name = "sha1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
[[package]]
name = "shlex"
version = "0.1.1"
@ -3796,6 +3818,55 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
[[package]]
name = "stdweb"
version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
dependencies = [
"discard",
"rustc_version",
"stdweb-derive",
"stdweb-internal-macros",
"stdweb-internal-runtime",
"wasm-bindgen",
]
[[package]]
name = "stdweb-derive"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.7",
"serde",
"serde_derive",
"syn",
]
[[package]]
name = "stdweb-internal-macros"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
dependencies = [
"base-x",
"proc-macro2 1.0.24",
"quote 1.0.7",
"serde",
"serde_derive",
"serde_json",
"sha1",
"syn",
]
[[package]]
name = "stdweb-internal-runtime"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
[[package]]
name = "storage-map"
version = "0.3.0"

5
core/Cargo.toml
View File

@ -34,15 +34,12 @@ chrono = "0.4"
num-traits = "0.2"
instant = "0.1"
encoding_rs = "0.8.26"
rand = { version = "0.8.0", features = ["std", "small_rng"], default-features = false }
[dependencies.jpeg-decoder]
version = "0.1.20"
default-features = false # can't use rayon on web
[dependencies.rand]
version = "0.7.3"
features = ["small_rng"]
[dev-dependencies]
approx = "0.4.0"
pretty_assertions = "0.6.1"

2
core/src/avm1/activation.rs
View File

@ -1807,7 +1807,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
// and the max value gets converted into an i32, so any number > 2^31 - 1 will return 0.
let max = self.context.avm1.pop().into_number_v1() as i32;
let val = if max > 0 {
self.context.rng.gen_range(0, max)
self.context.rng.gen_range(0..max)
} else {
0
};

4
core/src/avm1/globals.rs
View File

@ -57,8 +57,8 @@ pub fn random<'gc>(
args: &[Value<'gc>],
) -> Result<Value<'gc>, Error<'gc>> {
match args.get(0) {
Some(Value::Number(max)) => {
Ok(activation.context.rng.gen_range(0.0f64, max).floor().into())
Some(&Value::Number(max)) => {
Ok(activation.context.rng.gen_range(0.0f64..max).floor().into())
}
_ => Ok(Value::Undefined), //TODO: Shouldn't this be an error condition?
}

2
core/src/avm1/globals/math.rs
View File

@ -130,7 +130,7 @@ pub fn random<'gc>(
_this: Object<'gc>,
_args: &[Value<'gc>],
) -> Result<Value<'gc>, Error<'gc>> {
Ok(activation.context.rng.gen_range(0.0f64, 1.0f64).into())
Ok(activation.context.rng.gen_range(0.0f64..1.0f64).into())
}
pub fn create<'gc>(

12
core/src/avm1/object/bitmap_data.rs
View File

@ -297,10 +297,10 @@ impl BitmapData {
for x in 0..self.width() {
for y in 0..self.height() {
let pixel_color = if gray_scale {
let gray = rng.gen_range(low, high);
let gray = rng.gen_range(low..high);
Color::argb(
if channel_options.alpha() {
rng.gen_range(low, high)
rng.gen_range(low..high)
} else {
255
},
@ -311,22 +311,22 @@ impl BitmapData {
} else {
Color::argb(
if channel_options.alpha() {
rng.gen_range(low, high)
rng.gen_range(low..high)
} else {
255
},
if channel_options.red() {
rng.gen_range(low, high)
rng.gen_range(low..high)
} else {
0
},
if channel_options.green() {
rng.gen_range(low, high)
rng.gen_range(low..high)
} else {
0
},
if channel_options.blue() {
rng.gen_range(low, high)
rng.gen_range(low..high)
} else {
0
},

2
core/src/avm1/object/script_object.rs
View File

@ -888,7 +888,7 @@ mod tests {
player_version: 32,
swf: &swf,
levels: &mut levels,
rng: &mut SmallRng::from_seed([0u8; 16]),
rng: &mut SmallRng::from_seed([0u8; 32]),
action_queue: &mut crate::context::ActionQueue::new(),
audio: &mut NullAudioBackend::new(),
input: &mut NullInputBackend::new(),

2
core/src/avm1/test_utils.rs
View File

@ -49,7 +49,7 @@ where
player_version: 32,
swf: &swf,
levels: &mut levels,
rng: &mut SmallRng::from_seed([0u8; 16]),
rng: &mut SmallRng::from_seed([0u8; 32]),
audio: &mut NullAudioBackend::new(),
input: &mut NullInputBackend::new(),
action_queue: &mut ActionQueue::new(),

2
core/src/avm2/globals/math.rs
View File

@ -214,5 +214,5 @@ pub fn random<'gc>(
_this: Option<Object<'gc>>,
_args: &[Value<'gc>],
) -> Result<Value<'gc>, Error> {
Ok(activation.context.rng.gen_range(0.0f64, 1.0f64).into())
Ok(activation.context.rng.gen_range(0.0f64..1.0f64).into())
}

1
web/Cargo.toml
View File

@ -35,6 +35,7 @@ url = "2.2.0"
wasm-bindgen = "0.2.69"
wasm-bindgen-futures = "0.4.19"
chrono = { version = "0.4", features = ["wasmbind"] }
getrandom = { version = "0.2", features = ["js"] }
[dependencies.ruffle_core]
path = "../core"