Skip to content

Commit 31164ed

Browse files
committed
Fix ci
1 parent dc5e759 commit 31164ed

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
2-
3-
chmod +x ./.github/scripts/uninstall-dotnet-linux
4-
./.github/scripts/uninstall-dotnet-linux
1+
#!/bin/bash
2+
3+
chmod +x ./.github/scripts/uninstall-dotnet-linux
4+
./.github/scripts/uninstall-dotnet-linux

src/hostfxr/library3_0.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
use widestring::U16CStr;
2-
31
use crate::{
42
bindings::hostfxr::{hostfxr_handle, hostfxr_initialize_parameters},
53
error::{HostingError, HostingResult, HostingSuccess},
64
hostfxr::{
75
Hostfxr, HostfxrContext, HostfxrHandle, InitializedForCommandLine,
86
InitializedForRuntimeConfig,
97
},
10-
pdcstring::PdCStr,
8+
pdcstring::{PdCStr, PdChar},
119
};
1210
use std::{iter, mem::MaybeUninit, ptr};
1311

@@ -430,16 +428,16 @@ impl Hostfxr {
430428
}
431429
}
432430

433-
type ErrorWriter = Box<dyn FnMut(&U16CStr)>;
431+
type ErrorWriter = Box<dyn FnMut(&PdCStr)>;
434432

435433
thread_local! {
436434
static CURRENT_ERROR_WRITER: std::cell::RefCell<Option<ErrorWriter>> = std::cell::RefCell::new(None);
437435
}
438436

439-
extern "C" fn error_writer_trampoline(raw_error: *const u16) {
437+
extern "C" fn error_writer_trampoline(raw_error: *const PdChar) {
440438
CURRENT_ERROR_WRITER.with(|writer_holder| {
441439
if let Some(writer) = writer_holder.borrow_mut().as_mut() {
442-
let error_message = unsafe { U16CStr::from_ptr_str(raw_error) };
440+
let error_message = unsafe { PdCStr::from_str_ptr(raw_error) };
443441
writer(error_message);
444442
}
445443
});

0 commit comments

Comments
 (0)