Skip to content

Commit 0273bc9

Browse files
committed
Fix more merge
1 parent 65086a3 commit 0273bc9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

crates/compiler-core/src/bytecode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use num_complex::Complex64;
1515
use rustpython_wtf8::{Wtf8, Wtf8Buf};
1616

1717
pub use crate::bytecode::{
18-
instruction::{Arg, Instruction, encode_load_super_attr_arg},
18+
instruction::{Arg, Instruction, decode_load_super_attr_arg, encode_load_super_attr_arg},
1919
oparg::{
2020
BinaryOperator, BuildSliceArgCount, ComparisonOperator, ConvertValueOparg,
2121
IntrinsicFunction1, IntrinsicFunction2, Invert, Label, MakeFunctionFlags, NameIdx, OpArg,

crates/compiler-core/src/bytecode/instruction.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ pub const fn encode_load_super_attr_arg(name_idx: u32, load_method: bool, has_cl
926926

927927
/// Decode LOAD_SUPER_ATTR oparg: returns (name_idx, load_method, has_class).
928928
#[inline]
929-
const fn decode_load_super_attr_arg(oparg: u32) -> (u32, bool, bool) {
929+
pub const fn decode_load_super_attr_arg(oparg: u32) -> (u32, bool, bool) {
930930
let load_method = (oparg & 1) == 1;
931931
let has_class = (oparg & 2) == 2;
932932
let name_idx = oparg >> 2;

0 commit comments

Comments
 (0)