Merge #100

100: Bump nightly -> 2023-01-26 r=xFrednet a=xFrednet

r? `@ghost`

Closes #70

Co-authored-by: xFrednet <[email protected]>

Author: bors[bot]

.github/workflows/rust.yml

@@ -38,7 +38,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly-2022-12-15
+        toolchain: nightly-2023-01-26
         components: cargo, clippy, rustfmt
     - run: rustc -vV
     - run: cargo build

.github/workflows/rust_bors.yml

@@ -27,7 +27,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
-          toolchain: nightly-2022-12-15
+          toolchain: nightly-2023-01-26
           components: cargo, clippy, rustfmt
     - run: rustc -vV
     - run: cargo build

cargo-marker/src/driver.rs

@@ -21,7 +21,7 @@ use crate::ExitStatus;
 /// This is the driver version and toolchain, that is used by the setup command
 /// to install the driver.
 static DEFAULT_DRIVER_INFO: Lazy<RustcDriverInfo> = Lazy::new(|| RustcDriverInfo {
-    toolchain: "nightly-2022-12-15".to_string(),
+    toolchain: "nightly-2023-01-26".to_string(),
     version: "0.1.0".to_string(),
     api_version: "0.1.0".to_string(),
 });

marker_driver_rustc/src/conversion/marker/ty.rs

@@ -51,7 +51,7 @@ impl<'ast, 'tcx> MarkerConversionContext<'ast, 'tcx> {
                     self.to_syn_ty(mut_ty.ty),
                 )
             })),
-            hir::TyKind::Rptr(rust_lt, mut_ty) => TyKind::Ref(self.alloc(|| {
+            hir::TyKind::Ref(rust_lt, mut_ty) => TyKind::Ref(self.alloc(|| {
                 RefTy::new(
                     data,
                     self.to_lifetime(rust_lt),

marker_driver_rustc/src/main.rs

@@ -39,7 +39,7 @@ use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use std::process::{exit, Command};
 
-const RUSTC_TOOLCHAIN_VERSION: &str = "nightly-2022-12-15";
+const RUSTC_TOOLCHAIN_VERSION: &str = "nightly-2023-01-26";
 
 struct DefaultCallbacks;
 impl rustc_driver::Callbacks for DefaultCallbacks {}

rust-toolchain

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2022-12-15"
+channel = "nightly-2023-01-26"
 components = ["cargo", "llvm-tools-preview", "rust-src", "rust-std", "rustc", "rustc-dev", "rustfmt"]
 # This has to be synced with the toolchain in `github/workflows`

util/update-toolchain.sh

@@ -2,7 +2,7 @@
 
 if [[ $1 == nightly-????-??-?? ]]
 then
-    sed -i "s/nightly-2022-12-15/$1/g" ./marker_driver_rustc/src/main.rs ./rust-toolchain .github/workflows/* ./util/update-toolchain.sh cargo-marker/src/driver.rs
+    sed -i "s/nightly-2023-01-26/$1/g" ./marker_driver_rustc/src/main.rs ./rust-toolchain .github/workflows/* ./util/update-toolchain.sh cargo-marker/src/driver.rs
 else
     echo "Please enter a valid toolchain like \`nightly-2022-01-01\`"
 fi;