Merge #79

79: Bump rust nightly -> 2022-12-15 r=xFrednet a=xFrednet

Closes #55 

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-11-03
+        toolchain: nightly-2022-12-15
         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-11-03
+          toolchain: nightly-2022-12-15
           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-11-03".to_string(),
+    toolchain: "nightly-2022-12-15".to_string(),
     version: "0.1.0".to_string(),
     api_version: "0.1.0".to_string(),
 });

marker_driver_rustc/src/conversion/common/ast_path.rs

@@ -5,7 +5,7 @@ use crate::{context::RustcContext, conversion::generic::to_api_generic_args_opt}
 
 use super::to_symbol_id;
 
-pub fn to_api_path<'ast, 'tcx>(cx: &'ast RustcContext<'ast, 'tcx>, path: &hir::Path<'tcx>) -> AstPath<'ast> {
+pub fn to_api_path<'ast, 'tcx, T>(cx: &'ast RustcContext<'ast, 'tcx>, path: &hir::Path<'tcx, T>) -> AstPath<'ast> {
     AstPath::new(
         cx.storage
             .alloc_slice_iter(path.segments.iter().map(|seg| conv_segment(cx, seg))),

marker_driver_rustc/src/conversion/generic.rs

@@ -11,20 +11,18 @@ pub fn to_api_lifetime<'ast, 'tcx>(
     _cx: &'ast RustcContext<'ast, 'tcx>,
     rust_lt: &rustc_hir::Lifetime,
 ) -> Option<Lifetime<'ast>> {
-    let kind = match rust_lt.name {
-        rustc_hir::LifetimeName::Param(local_id, rustc_hir::ParamName::Plain(ident)) => {
-            LifetimeKind::Label(to_symbol_id(ident.name), to_generic_id(local_id.to_def_id()))
+    let kind = match rust_lt.res {
+        rustc_hir::LifetimeName::Param(_) if rust_lt.is_anonymous() => return None,
+        rustc_hir::LifetimeName::Param(local_id) => {
+            LifetimeKind::Label(to_symbol_id(rust_lt.ident.name), to_generic_id(local_id.to_def_id()))
         },
-        rustc_hir::LifetimeName::Param(_local_id, rustc_hir::ParamName::Fresh) => return None,
         rustc_hir::LifetimeName::ImplicitObjectLifetimeDefault => return None,
         rustc_hir::LifetimeName::Infer => LifetimeKind::Infer,
         rustc_hir::LifetimeName::Static => LifetimeKind::Static,
-        rustc_hir::LifetimeName::Param(_, rustc_hir::ParamName::Error) | rustc_hir::LifetimeName::Error => {
-            unreachable!("would have triggered a rustc error")
-        },
+        rustc_hir::LifetimeName::Error => unreachable!("would have triggered a rustc error"),
     };
 
-    Some(Lifetime::new(Some(to_span_id(rust_lt.span)), kind))
+    Some(Lifetime::new(Some(to_span_id(rust_lt.ident.span)), kind))
 }
 
 pub fn to_api_generic_args_from_path<'ast, 'tcx>(

marker_driver_rustc/src/conversion/item.rs

@@ -425,8 +425,8 @@ impl<'ast, 'tcx> ItemConverter<'ast, 'tcx> {
     fn conv_variant_data(&self, var_data: &'tcx hir::VariantData) -> AdtKind<'ast> {
         match var_data {
             hir::VariantData::Struct(fields, _recovered) => AdtKind::Field(self.conv_field_defs(fields).into()),
-            hir::VariantData::Tuple(fields, _) => AdtKind::Tuple(self.conv_field_defs(fields).into()),
-            hir::VariantData::Unit(_) => AdtKind::Unit,
+            hir::VariantData::Tuple(fields, ..) => AdtKind::Tuple(self.conv_field_defs(fields).into()),
+            hir::VariantData::Unit(..) => AdtKind::Unit,
         }
     }
 

marker_driver_rustc/src/main.rs

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

rust-toolchain

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2022-11-03"
+channel = "nightly-2022-12-15"
 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-11-03/$1/g" ./marker_driver_rustc/src/main.rs ./rust-toolchain .github/workflows/* ./util/update-toolchain.sh cargo-marker/src/main.rs
+    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
 else
     echo "Please enter a valid toolchain like \`nightly-2022-01-01\`"
 fi;