Skip to content

Commit

Permalink
Merge pull request #1306 from hannobraun/update
Browse files Browse the repository at this point in the history
Upgrade to Rust 1.65.0
  • Loading branch information
hannobraun authored Nov 4, 2022
2 parents 412f1b2 + c06c25f commit 8cf82e9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion crates/fj/src/abi/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ impl<'a> From<&'a &dyn crate::models::Context> for Context<'a> {
let ctx = &*(user_data as *const &dyn crate::models::Context);

match std::panic::catch_unwind(AssertUnwindSafe(|| {
ctx.get_argument(&*name)
ctx.get_argument(&name)
})) {
Ok(Some(arg)) => StringSlice::from_str(arg),
Ok(None) => StringSlice::from_str(""),
Expand Down
4 changes: 2 additions & 2 deletions crates/fj/src/abi/ffi_safe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ impl Deref for String {
fn deref(&self) -> &Self::Target {
// Safety: The only way to create a FfiSafeString is from a valid Rust
// string, so we can skip the UTF-8 checks.
unsafe { std::str::from_utf8_unchecked(&*self.0) }
unsafe { std::str::from_utf8_unchecked(&self.0) }
}
}

Expand Down Expand Up @@ -296,7 +296,7 @@ impl Deref for StringSlice {

fn deref(&self) -> &Self::Target {
// Safety: the only way you can construct a StringSlice is via a string.
unsafe { std::str::from_utf8_unchecked(&*self.0) }
unsafe { std::str::from_utf8_unchecked(&self.0) }
}
}

Expand Down
2 changes: 1 addition & 1 deletion crates/fj/src/abi/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ fn on_panic(payload: Box<dyn Any + Send>) -> ! {
if let Some(s) = payload.downcast_ref::<std::string::String>() {
s.as_str()
} else if let Some(s) = payload.downcast_ref::<&str>() {
*s
s
} else {
"A panic occurred"
};
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.64.0"
channel = "1.65.0"
components = ["rustfmt", "clippy"]
targets = ["wasm32-unknown-unknown"]

0 comments on commit 8cf82e9

Please sign in to comment.