Skip to content

Commit f29ad33

Browse files
committed
Bump rustc version
1 parent cdb8f68 commit f29ad33

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

engine/lib/import_thir.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ end) : EXPR = struct
480480
(U.call Rust_primitives__hax__never_to_any [ c_expr source ] span typ)
481481
.e
482482
(* TODO: this is incorrect (NeverToAny) *)
483-
| Pointer { cast; source } -> c_pointer e typ span cast source
483+
| PointerCoercion { cast; source } -> c_pointer e typ span cast source
484484
| Loop { body } ->
485485
let body = c_expr body in
486486
Loop
@@ -907,7 +907,7 @@ end) : EXPR = struct
907907
(* ^ [%show: expr] source)) *)
908908
| _ ->
909909
unimplemented [ e.span ]
910-
("Pointer, with [cast] being " ^ [%show: Thir.pointer_cast] cast)
910+
("Pointer, with [cast] being " ^ [%show: Thir.pointer_coercion] cast)
911911

912912
and c_ty (span : Thir.span) (ty : Thir.ty) : ty =
913913
match ty with

frontend/exporter/src/types/copied.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,11 +1979,11 @@ pub enum Unsafety {
19791979
Normal,
19801980
}
19811981

1982-
/// Reflects [`rustc_middle::ty::adjustment::PointerCast`]
1982+
/// Reflects [`rustc_middle::ty::adjustment::PointerCoercion`]
19831983
#[derive(AdtInto)]
1984-
#[args(<S>, from: rustc_middle::ty::adjustment::PointerCast, state: S as gstate)]
1984+
#[args(<S>, from: rustc_middle::ty::adjustment::PointerCoercion, state: S as gstate)]
19851985
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
1986-
pub enum PointerCast {
1986+
pub enum PointerCoercion {
19871987
ReifyFnPointer,
19881988
UnsafeFnPointer,
19891989
ClosureFnPointer(Unsafety),
@@ -2338,8 +2338,8 @@ pub enum ExprKind {
23382338
NeverToAny {
23392339
source: Expr,
23402340
},
2341-
Pointer {
2342-
cast: PointerCast,
2341+
PointerCoercion {
2342+
cast: PointerCoercion,
23432343
source: Expr,
23442344
},
23452345
Loop {

frontend/exporter/src/types/mir.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ pub enum AggregateKind {
903903
pub enum CastKind {
904904
PointerExposeAddress,
905905
PointerFromExposedAddress,
906-
Pointer(PointerCast),
906+
PointerCoercion(PointerCoercion),
907907
DynStar,
908908
IntToInt,
909909
FloatToInt,

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2023-07-08"
2+
channel = "nightly-2023-07-10"
33
components = [ "rustc-dev", "llvm-tools-preview" , "rust-analysis" , "rust-src" , "rustfmt" ]

0 commit comments

Comments
 (0)