Merge #131

131: bump nightly -> 2023-04-20 r=xFrednet a=xFrednet

Closes: #123

r? `@ghost`

Co-authored-by: xFrednet <xFrednet@gmail.com>

.github/workflows/rust.yml

@@ -38,7 +38,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly-2023-03-09
+        toolchain: nightly-2023-04-20
         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-2023-03-09
+          toolchain: nightly-2023-04-20
           components: cargo, clippy, rustfmt
     - run: rustc -vV
     - run: cargo build

cargo-marker/src/driver.rs

@@ -21,7 +21,7 @@ use crate::{cli::Flags, 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-2023-03-09".to_string(),
+    toolchain: "nightly-2023-04-20".to_string(),
     version: "0.1.0".to_string(),
     api_version: "0.1.0".to_string(),
 });

marker_driver_rustc/src/conversion/marker/common.rs

@@ -225,7 +225,7 @@ impl<'ast, 'tcx> MarkerConverterInner<'ast, 'tcx> {
 
         self.to_qpath(qpath, || match res_resolution_parent(self.rustc_cx, rustc_ty.hir_id) {
             hir::Node::Expr(_) | hir::Node::Stmt(_) => Some(self.resolve_qpath_in_body(qpath, rustc_ty.hir_id)),
-            hir::Node::Item(item) => self.resolve_qpath_in_item(qpath, item.owner_id.to_def_id(), rustc_ty),
+            hir::Node::Item(item) => self.resolve_qpath_in_item(qpath, item.owner_id.def_id, rustc_ty),
             hir::Node::TypeBinding(_) => None,
             _ => unreachable!("types will always have a statement, expression or item as their parent"),
         })
@@ -249,7 +249,7 @@ impl<'ast, 'tcx> MarkerConverterInner<'ast, 'tcx> {
     fn resolve_qpath_in_item(
         &self,
         qpath: &hir::QPath<'tcx>,
-        item_id: hir::def_id::DefId,
+        item_id: hir::def_id::LocalDefId,
         rustc_ty: &hir::Ty<'_>,
     ) -> Option<hir::def::Res> {
         match qpath {

marker_driver_rustc/src/main.rs

@@ -2,7 +2,6 @@
 #![feature(rustc_private)]
 #![feature(lint_reasons)]
 #![feature(let_chains)]
-#![feature(once_cell)]
 #![warn(rustc::internal)]
 #![warn(clippy::pedantic)]
 #![allow(clippy::missing_panics_doc)]
@@ -41,7 +40,7 @@ use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use std::process::{exit, Command};
 
-const RUSTC_TOOLCHAIN_VERSION: &str = "nightly-2023-03-09";
+const RUSTC_TOOLCHAIN_VERSION: &str = "nightly-2023-04-20";
 
 struct DefaultCallbacks;
 impl rustc_driver::Callbacks for DefaultCallbacks {}

rust-toolchain

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2023-03-09"
+channel = "nightly-2023-04-20"
 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-2023-03-09/$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-04-20/$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;