Skip to content

Commit

Permalink
Merge #124
Browse files Browse the repository at this point in the history
124: bump nightly -> 2023-01-26 r=xFrednet a=xFrednet

Closes #101

r? `@ghost`

Co-authored-by: xFrednet <[email protected]>
  • Loading branch information
bors[bot] and xFrednet authored Mar 9, 2023
2 parents 374befb + 3c3cbfa commit 639c70a
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-01-26
toolchain: nightly-2023-03-09
components: cargo, clippy, rustfmt
- run: rustc -vV
- run: cargo build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust_bors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-01-26
toolchain: nightly-2023-03-09
components: cargo, clippy, rustfmt
- run: rustc -vV
- run: cargo build
Expand Down
2 changes: 1 addition & 1 deletion cargo-marker/src/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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-2023-01-26".to_string(),
toolchain: "nightly-2023-03-09".to_string(),
version: "0.1.0".to_string(),
api_version: "0.1.0".to_string(),
});
Expand Down
1 change: 1 addition & 0 deletions marker_adapter/src/loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ macro_rules! gen_LoadedLintCrate {

// safe wrapper to external functions
$(
#[allow(clippy::extra_unused_lifetimes)]
fn $fn_name<'ast>(&self $(, $arg_name: $arg_ty)*) -> $ret_ty {
unsafe {
(self.$fn_name)($($arg_name,)*)
Expand Down
1 change: 0 additions & 1 deletion marker_driver_rustc/src/conversion/marker/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use marker_api::ast::{
};
use rustc_hir as hir;
use rustc_middle as mid;
use rustc_middle::ty::DefIdTree;

use crate::conversion::common::{
BodyIdLayout, ExprIdLayout, GenericIdLayout, ItemIdLayout, SpanSourceInfo, TyDefIdLayout, VarIdLayout,
Expand Down
2 changes: 1 addition & 1 deletion marker_driver_rustc/src/conversion/marker/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ impl<'ast, 'tcx> MarkerConverterInner<'ast, 'tcx> {
// order during HIR lowering. Marker can for now ignore this and
// convert the inner expression directly
hir::ExprKind::DropTemps(inner) => return self.to_expr(inner),
hir::ExprKind::Err => unreachable!("would have triggered a rustc error"),
hir::ExprKind::Err(..) => unreachable!("would have triggered a rustc error"),
_ => {
eprintln!("skipping not implemented expr at: {:?}", expr.span);
ExprKind::Unstable(
Expand Down
3 changes: 1 addition & 2 deletions marker_driver_rustc/src/conversion/marker/generics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ impl<'ast, 'tcx> MarkerConverterInner<'ast, 'tcx> {
hir::ParamName::Plain(ident) => self.to_symbol_id(ident.name),
_ => return None,
};
let def_id = self.rustc_cx.hir().local_def_id(rustc_param.hir_id);
let id = self.to_generic_id(def_id.to_def_id());
let id = self.to_generic_id(rustc_param.def_id);
let span = self.to_span_id(rustc_param.span);
match rustc_param.kind {
hir::GenericParamKind::Lifetime {
Expand Down
3 changes: 1 addition & 2 deletions marker_driver_rustc/src/conversion/marker/item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,8 @@ impl<'ast, 'tcx> MarkerConverterInner<'ast, 'tcx> {
self.alloc_slice(fields.iter().map(|field| {
// FIXME update Visibility creation to use the stored local def id inside the
// field after the next sync. See #55
let def_id = self.rustc_cx.hir().local_def_id(field.hir_id);
Field::new(
Visibility::new(self.to_item_id(def_id)),
Visibility::new(self.to_item_id(field.def_id)),
self.to_symbol_id(field.ident.name),
self.to_ty(field.ty),
self.to_span_id(field.span),
Expand Down
2 changes: 1 addition & 1 deletion marker_driver_rustc/src/conversion/marker/ty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ impl<'ast, 'tcx> MarkerConverterInner<'ast, 'tcx> {
},
hir::TyKind::Path(qpath) => self.to_syn_ty_from_qpath(data, qpath, rustc_ty),
// Continue ty conversion
hir::TyKind::Err => unreachable!("would have triggered a rustc error"),
hir::TyKind::Err(..) => unreachable!("would have triggered a rustc error"),
hir::TyKind::Typeof(_) => unreachable!("docs state: 'Unused for now.'"),
hir::TyKind::OpaqueDef(id, _, _) => {
// `impl Trait` in rustc are implemented as Items with the kind `OpaqueTy`
Expand Down
2 changes: 1 addition & 1 deletion marker_driver_rustc/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ use std::ops::Deref;
use std::path::{Path, PathBuf};
use std::process::{exit, Command};

const RUSTC_TOOLCHAIN_VERSION: &str = "nightly-2023-01-26";
const RUSTC_TOOLCHAIN_VERSION: &str = "nightly-2023-03-09";

struct DefaultCallbacks;
impl rustc_driver::Callbacks for DefaultCallbacks {}
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-01-26"
channel = "nightly-2023-03-09"
components = ["cargo", "llvm-tools-preview", "rust-src", "rust-std", "rustc", "rustc-dev", "rustfmt"]
# This has to be synced with the toolchain in `github/workflows`
2 changes: 1 addition & 1 deletion util/update-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

if [[ $1 == nightly-????-??-?? ]]
then
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
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
else
echo "Please enter a valid toolchain like \`nightly-2022-01-01\`"
fi;

0 comments on commit 639c70a

Please sign in to comment.