From 52c80ea181a0c0e71a32f36d7003c84197e05787 Mon Sep 17 00:00:00 2001 From: y21 <30553356+y21@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:55:52 +0100 Subject: [PATCH] bump nightly --- Cargo.lock | 4 ++-- cli/src/main.rs | 2 +- lints/Cargo.toml | 2 +- lints/src/main.rs | 8 ++++---- rust-toolchain | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ccce5c0c..370bd3e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -229,7 +229,7 @@ dependencies = [ [[package]] name = "clippy_utils" version = "0.1.85" -source = "git+https://github.com/rust-lang/rust-clippy?rev=af1f78a#af1f78af05af5ff7dd2d8b31386f96ce9bfc7a8a" +source = "git+https://github.com/rust-lang/rust-clippy?rev=988042e#988042e0b2c806352cb3e6583a2e093d3ee086fa" dependencies = [ "arrayvec", "itertools 0.12.1", diff --git a/cli/src/main.rs b/cli/src/main.rs index 998ed8c1..1f98b9cd 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -1,6 +1,6 @@ use std::backtrace::{Backtrace, BacktraceStatus}; -use anyhow::{bail, Context}; +use anyhow::{Context, bail}; use clap::{Arg, Command}; use colorful::Colorful; use dash_optimizer::OptLevel; diff --git a/lints/Cargo.toml b/lints/Cargo.toml index 437a27d8..e4c85f3d 100644 --- a/lints/Cargo.toml +++ b/lints/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "af1f78a" } +clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "988042e" } [dev-dependencies] prettydiff = "0.7.0" diff --git a/lints/src/main.rs b/lints/src/main.rs index 0de56817..95754089 100644 --- a/lints/src/main.rs +++ b/lints/src/main.rs @@ -1,10 +1,10 @@ #![feature(rustc_private, let_chains, box_patterns, if_let_guard)] #![deny(rust_2018_idioms)] -use missing_root::{MissingRoot, MISSING_ROOT}; +use missing_root::{MISSING_ROOT, MissingRoot}; use rustc_driver::{Callbacks, RunCompiler}; -use rustc_session::config::{ErrorOutputType, OptLevel}; use rustc_session::EarlyDiagCtxt; +use rustc_session::config::{ErrorOutputType, OptLevel}; extern crate rustc_ast; extern crate rustc_driver; @@ -45,9 +45,9 @@ fn main() { if args.iter().any(|arg| arg == "--cap-lints") || !args.iter().any(|arg| arg.contains("dash_vm")) { // dependencies - RunCompiler::new(&args[1..], &mut RustcCallbacks).run().unwrap(); + RunCompiler::new(&args[1..], &mut RustcCallbacks).run(); } else { args.extend(["--cfg", "dash_lints"].map(String::from)); - RunCompiler::new(&args[1..], &mut PrimaryCallbacks).run().unwrap(); + RunCompiler::new(&args[1..], &mut PrimaryCallbacks).run(); } } diff --git a/rust-toolchain b/rust-toolchain index 3f42abf4..64878662 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-11-28" +channel = "nightly-2024-12-15" components = ["clippy", "rust-src", "rustc-dev", "llvm-tools-preview"]