Skip to content

Commit 5b3e278

Browse files
committed
1 parent 5362db8 commit 5b3e278

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

completion/tests/suggest.rs

-1
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,6 @@ let { ab } = { x = 1, abc = "", abcd = 2 }
394394

395395
fn find_gluon_root() -> PathBuf {
396396
use std::env;
397-
use std::fs;
398397
let mut dir = env::current_dir().unwrap();
399398
while fs::metadata(dir.join("std")).is_err() {
400399
dir = dir.parent().unwrap().into();

vm/src/gc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -942,12 +942,12 @@ mod tests {
942942

943943
impl PartialEq for Data_ {
944944
fn eq(&self, other: &Data_) -> bool {
945-
self.fields.ptr == other.fields.ptr
945+
self.fields.0 == other.fields.0
946946
}
947947
}
948948
impl fmt::Debug for Data_ {
949949
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
950-
self.fields.ptr.fmt(f)
950+
self.fields.0.fmt(f)
951951
}
952952
}
953953

vm/src/value.rs

+5
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,11 @@ mod gc_str {
350350
#[derive(Copy, Clone, PartialEq)]
351351
pub struct GcStr(GcPtr<ValueArray>);
352352

353+
// Needed due to https://github.com/rust-lang/rust/pull/60444, unsure if that is due to a bug
354+
// or not
355+
unsafe impl Send for GcStr {}
356+
unsafe impl Sync for GcStr {}
357+
353358
impl fmt::Debug for GcStr {
354359
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
355360
f.debug_tuple("GcStr").field(&&**self).finish()

0 commit comments

Comments
 (0)