Skip to content

Commit 021b8eb

Browse files
committed
typevar.rs
1 parent 685e413 commit 021b8eb

File tree

5 files changed

+975
-942
lines changed

5 files changed

+975
-942
lines changed

vm/src/frame.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@ impl ExecutingFrame<'_> {
12411241
bytecode::Instruction::TypeVar => {
12421242
let type_name = self.pop_value();
12431243
let type_var: PyObjectRef =
1244-
typing::make_typevar(vm, type_name.clone(), vm.ctx.none(), vm.ctx.none())
1244+
typing::TypeVar::new(vm, type_name.clone(), vm.ctx.none(), vm.ctx.none())
12451245
.into_ref(&vm.ctx)
12461246
.into();
12471247
self.push_value(type_var);
@@ -1251,7 +1251,7 @@ impl ExecutingFrame<'_> {
12511251
let type_name = self.pop_value();
12521252
let bound = self.pop_value();
12531253
let type_var: PyObjectRef =
1254-
typing::make_typevar(vm, type_name.clone(), bound, vm.ctx.none())
1254+
typing::TypeVar::new(vm, type_name.clone(), bound, vm.ctx.none())
12551255
.into_ref(&vm.ctx)
12561256
.into();
12571257
self.push_value(type_var);
@@ -1261,7 +1261,7 @@ impl ExecutingFrame<'_> {
12611261
let type_name = self.pop_value();
12621262
let constraint = self.pop_value();
12631263
let type_var: PyObjectRef =
1264-
typing::make_typevar(vm, type_name.clone(), vm.ctx.none(), constraint)
1264+
typing::TypeVar::new(vm, type_name.clone(), vm.ctx.none(), constraint)
12651265
.into_ref(&vm.ctx)
12661266
.into();
12671267
self.push_value(type_var);
@@ -1288,7 +1288,7 @@ impl ExecutingFrame<'_> {
12881288
}
12891289
bytecode::Instruction::ParamSpec => {
12901290
let param_spec_name = self.pop_value();
1291-
let param_spec: PyObjectRef = typing::make_paramspec(param_spec_name.clone())
1291+
let param_spec: PyObjectRef = typing::ParamSpec::new(param_spec_name.clone())
12921292
.into_ref(&vm.ctx)
12931293
.into();
12941294
self.push_value(param_spec);
@@ -1297,7 +1297,7 @@ impl ExecutingFrame<'_> {
12971297
bytecode::Instruction::TypeVarTuple => {
12981298
let type_var_tuple_name = self.pop_value();
12991299
let type_var_tuple: PyObjectRef =
1300-
typing::make_typevartuple(type_var_tuple_name.clone(), vm)
1300+
typing::TypeVarTuple::new(type_var_tuple_name.clone(), vm)
13011301
.into_ref(&vm.ctx)
13021302
.into();
13031303
self.push_value(type_var_tuple);

vm/src/stdlib/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ mod sysconfigdata;
2222
#[cfg(feature = "threading")]
2323
pub mod thread;
2424
pub mod time;
25+
mod typevar;
2526
pub mod typing;
2627
pub mod warnings;
2728
mod weakref;

0 commit comments

Comments
 (0)