Skip to content

Commit b6b951d

Browse files
andyleisersondevsnek
authored andcommitted
Update to deno 2.3.2
(cherry picked from denoland/deno#29166) Co-authored-by: snek <[email protected]>
1 parent 3ebae1b commit b6b951d

26 files changed

+203
-85
lines changed

Cargo.lock

Lines changed: 35 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,13 @@ web-sys = { version = "0.3.77", default-features = false }
236236
web-time = "1.1.0"
237237

238238
# deno dependencies
239-
deno_console = "0.203.0"
240-
deno_core = "0.343.0"
241-
deno_url = "0.203.0"
242-
deno_web = "0.234.0"
243-
deno_webidl = "0.203.0"
244-
deno_webgpu = { version = "0.170.0", path = "./deno_webgpu" }
239+
deno_console = "0.205.0"
240+
deno_core = "0.347.0"
241+
deno_features = "0.2.0"
242+
deno_url = "0.205.0"
243+
deno_web = "0.236.0"
244+
deno_webidl = "0.205.0"
245+
deno_webgpu = { version = "0.171.0", path = "./deno_webgpu" }
245246
deno_unsync = "0.4.2"
246247
deno_error = "0.5.6"
247248
tokio = "1.45.1"

cts_runner/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ env_logger.workspace = true
1515
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
1616
deno_console.workspace = true
1717
deno_core.workspace = true
18+
deno_features.workspace = true
1819
deno_url.workspace = true
1920
deno_web.workspace = true
2021
deno_webidl.workspace = true

cts_runner/src/main.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,19 @@ pub async fn run() -> Result<(), AnyError> {
3030
.ok_or_else(|| anyhow!("missing specifier in first command line argument"))?;
3131
let specifier = resolve_url_or_path(&url, &env::current_dir()?)?;
3232

33-
let mut feature_checker = deno_core::FeatureChecker::default();
34-
feature_checker.enable_feature(deno_webgpu::UNSTABLE_FEATURE_NAME);
35-
3633
let options = RuntimeOptions {
3734
module_loader: Some(Rc::new(deno_core::FsModuleLoader)),
3835
extensions: vec![
39-
deno_webidl::deno_webidl::init_ops_and_esm(),
40-
deno_console::deno_console::init_ops_and_esm(),
41-
deno_url::deno_url::init_ops_and_esm(),
42-
deno_web::deno_web::init_ops_and_esm::<Permissions>(
36+
deno_webidl::deno_webidl::init(),
37+
deno_console::deno_console::init(),
38+
deno_url::deno_url::init(),
39+
deno_web::deno_web::init::<Permissions>(
4340
Arc::new(BlobStore::default()),
4441
None,
4542
),
46-
deno_webgpu::deno_webgpu::init_ops_and_esm(),
47-
cts_runner::init_ops_and_esm(),
43+
deno_webgpu::deno_webgpu::init(),
44+
cts_runner::init(),
4845
],
49-
feature_checker: Some(Arc::new(feature_checker)),
5046
..Default::default()
5147
};
5248
let mut js_runtime = JsRuntime::new(options);
@@ -84,6 +80,9 @@ deno_core::extension!(
8480
esm_entry_point = "ext:cts_runner/src/bootstrap.js",
8581
esm = ["src/bootstrap.js"],
8682
state = |state| {
83+
let mut feature_checker = deno_features::FeatureChecker::default();
84+
feature_checker.enable_feature(deno_webgpu::UNSTABLE_FEATURE_NAME);
85+
state.put(feature_checker);
8786
state.put(Permissions {});
8887
}
8988
);

deno_webgpu/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[package]
44
name = "deno_webgpu"
5-
version = "0.170.0"
5+
version = "0.171.0"
66
authors = ["the Deno authors"]
77
edition.workspace = true
88
license = "MIT"

deno_webgpu/adapter.rs

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ impl Drop for GPUAdapter {
6060
}
6161
}
6262

63-
impl GarbageCollected for GPUAdapter {}
63+
impl GarbageCollected for GPUAdapter {
64+
fn get_name(&self) -> &'static std::ffi::CStr {
65+
c"GPUAdapter"
66+
}
67+
}
6468

6569
#[op2]
6670
impl GPUAdapter {
@@ -211,7 +215,11 @@ pub enum CreateDeviceError {
211215

212216
pub struct GPUSupportedLimits(pub wgpu_types::Limits);
213217

214-
impl GarbageCollected for GPUSupportedLimits {}
218+
impl GarbageCollected for GPUSupportedLimits {
219+
fn get_name(&self) -> &'static std::ffi::CStr {
220+
c"GPUSupportedLimits"
221+
}
222+
}
215223

216224
#[op2]
217225
impl GPUSupportedLimits {
@@ -368,7 +376,11 @@ impl GPUSupportedLimits {
368376

369377
pub struct GPUSupportedFeatures(v8::Global<v8::Value>);
370378

371-
impl GarbageCollected for GPUSupportedFeatures {}
379+
impl GarbageCollected for GPUSupportedFeatures {
380+
fn get_name(&self) -> &'static std::ffi::CStr {
381+
c"GPUSupportedFeatures"
382+
}
383+
}
372384

373385
impl GPUSupportedFeatures {
374386
#[allow(clippy::disallowed_types)]
@@ -402,7 +414,11 @@ pub struct GPUAdapterInfo {
402414
pub subgroup_max_size: u32,
403415
}
404416

405-
impl GarbageCollected for GPUAdapterInfo {}
417+
impl GarbageCollected for GPUAdapterInfo {
418+
fn get_name(&self) -> &'static std::ffi::CStr {
419+
c"GPUAdapterInfo"
420+
}
421+
}
406422

407423
#[op2]
408424
impl GPUAdapterInfo {

deno_webgpu/bind_group.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ impl WebIdlInterfaceConverter for GPUBindGroup {
3535
const NAME: &'static str = "GPUBindGroup";
3636
}
3737

38-
impl GarbageCollected for GPUBindGroup {}
38+
impl GarbageCollected for GPUBindGroup {
39+
fn get_name(&self) -> &'static std::ffi::CStr {
40+
c"GPUBindGroup"
41+
}
42+
}
3943

4044
#[op2]
4145
impl GPUBindGroup {

deno_webgpu/bind_group_layout.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ impl deno_core::webidl::WebIdlInterfaceConverter for GPUBindGroupLayout {
2323
const NAME: &'static str = "GPUBindGroupLayout";
2424
}
2525

26-
impl GarbageCollected for GPUBindGroupLayout {}
26+
impl GarbageCollected for GPUBindGroupLayout {
27+
fn get_name(&self) -> &'static std::ffi::CStr {
28+
c"GPUBindGroupLayout"
29+
}
30+
}
2731

2832
#[op2]
2933
impl GPUBindGroupLayout {

deno_webgpu/buffer.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@ impl WebIdlInterfaceConverter for GPUBuffer {
7272
const NAME: &'static str = "GPUBuffer";
7373
}
7474

75-
impl GarbageCollected for GPUBuffer {}
75+
impl GarbageCollected for GPUBuffer {
76+
fn get_name(&self) -> &'static std::ffi::CStr {
77+
c"GPUBuffer"
78+
}
79+
}
7680

7781
#[op2]
7882
impl GPUBuffer {

deno_webgpu/byow.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,11 @@ pub struct UnsafeWindowSurface {
8383
pub context: SameObject<GPUCanvasContext>,
8484
}
8585

86-
impl GarbageCollected for UnsafeWindowSurface {}
86+
impl GarbageCollected for UnsafeWindowSurface {
87+
fn get_name(&self) -> &'static std::ffi::CStr {
88+
c"UnsafeWindowSurface"
89+
}
90+
}
8791

8892
#[op2]
8993
impl UnsafeWindowSurface {

0 commit comments

Comments
 (0)