Skip to content

Commit ec1dd3b

Browse files
authored
fix(core): fix incompatibilities caused by the latest cargo fix (#847)
1 parent f1c1d91 commit ec1dd3b

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

llrt_core/src/modules/console.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ pub fn init(ctx: &Ctx<'_>) -> Result<()> {
183183
#[inline(always)]
184184
fn write_sep(result: &mut String, add_comma: bool, has_indentation: bool, newline: bool) {
185185
const SEPARATOR_TABLE: [&str; 8] = ["", ",", "\r", ",\r", " ", ", ", "\n", ",\n"];
186-
let index = (add_comma as usize) | (has_indentation as usize) << 1 | (newline as usize) << 2;
186+
let index =
187+
(add_comma as usize) | ((has_indentation as usize) << 1) | ((newline as usize) << 2);
187188
result.push_str(SEPARATOR_TABLE[index]);
188189
}
189190

llrt_core/src/modules/llrt/uuid.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,18 @@ fn uuidv6_to_v1<'js>(ctx: Ctx<'js>, v6_value: Value<'js>) -> Result<String> {
102102
let mut v1_bytes = [0u8; 16];
103103

104104
// time_low
105-
v1_bytes[0] = (v6_bytes[3] & 0x0f) << 4 | (v6_bytes[4] & 0xf0) >> 4;
106-
v1_bytes[1] = (v6_bytes[4] & 0x0f) << 4 | (v6_bytes[5] & 0xf0) >> 4;
107-
v1_bytes[2] = (v6_bytes[5] & 0x0f) << 4 | (v6_bytes[6] & 0x0f);
105+
v1_bytes[0] = ((v6_bytes[3] & 0x0f) << 4) | ((v6_bytes[4] & 0xf0) >> 4);
106+
v1_bytes[1] = ((v6_bytes[4] & 0x0f) << 4) | ((v6_bytes[5] & 0xf0) >> 4);
107+
v1_bytes[2] = ((v6_bytes[5] & 0x0f) << 4) | (v6_bytes[6] & 0x0f);
108108
v1_bytes[3] = v6_bytes[7];
109109

110110
// time_mid
111-
v1_bytes[4] = (v6_bytes[1] & 0x0f) << 4 | (v6_bytes[2] & 0xf0) >> 4;
112-
v1_bytes[5] = (v6_bytes[2] & 0x0f) << 4 | (v6_bytes[3] & 0xf0) >> 4;
111+
v1_bytes[4] = ((v6_bytes[1] & 0x0f) << 4) | ((v6_bytes[2] & 0xf0) >> 4);
112+
v1_bytes[5] = ((v6_bytes[2] & 0x0f) << 4) | ((v6_bytes[3] & 0xf0) >> 4);
113113

114114
// version and time_high
115-
v1_bytes[6] = 0x10 | (v6_bytes[0] & 0xf0) >> 4;
116-
v1_bytes[7] = (v6_bytes[0] & 0x0f) << 4 | (v6_bytes[1] & 0xf0) >> 4;
115+
v1_bytes[6] = 0x10 | ((v6_bytes[0] & 0xf0) >> 4);
116+
v1_bytes[7] = ((v6_bytes[0] & 0x0f) << 4) | ((v6_bytes[1] & 0xf0) >> 4);
117117

118118
// clock_seq and node
119119
v1_bytes[8..16].copy_from_slice(&v6_bytes[8..16]);

0 commit comments

Comments
 (0)