diff options
| author | bors <bors@rust-lang.org> | 2024-05-25 12:46:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-25 12:46:16 +0000 |
| commit | 331bb3f10d755f4c7fdf29b21d7a957a76f76c1a (patch) | |
| tree | 49508f89e82532e4551483117d3f6ad1162eb1e7 /src/tools | |
| parent | 008f6b3a3f454c23deae23c2660f9ff7f2854dd4 (diff) | |
| parent | 1d0ad049936322ddbafe9d9379ba3d860995ad19 (diff) | |
| download | rust-331bb3f10d755f4c7fdf29b21d7a957a76f76c1a.tar.gz rust-331bb3f10d755f4c7fdf29b21d7a957a76f76c1a.zip | |
Auto merge of #3630 - rust-lang:rustup-2024-05-25, r=saethlin
Automatic Rustup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/build_helper/src/lib.rs | 2 | ||||
| -rw-r--r-- | src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs | 2 | ||||
| -rw-r--r-- | src/tools/miri/rust-version | 2 | ||||
| -rw-r--r-- | src/tools/miri/tests/panic/mir-validation.stderr | 2 | ||||
| -rw-r--r-- | src/tools/tidy/src/allowed_run_make_makefiles.txt | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/src/tools/build_helper/src/lib.rs b/src/tools/build_helper/src/lib.rs index 6a4e86eb1df..2abda5d3ebf 100644 --- a/src/tools/build_helper/src/lib.rs +++ b/src/tools/build_helper/src/lib.rs @@ -1,5 +1,5 @@ pub mod ci; pub mod git; pub mod metrics; -pub mod util; pub mod stage0_parser; +pub mod util; diff --git a/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs b/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs index 8ee7d87acb3..81e94725a70 100644 --- a/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs +++ b/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs @@ -6,7 +6,7 @@ use clippy_config::msrvs::{self, Msrv}; use hir::LangItem; use rustc_attr::StableSince; -use rustc_const_eval::transform::check_consts::ConstCx; +use rustc_const_eval::check_consts::ConstCx; use rustc_hir as hir; use rustc_hir::def_id::DefId; use rustc_infer::infer::TyCtxtInferExt; diff --git a/src/tools/miri/rust-version b/src/tools/miri/rust-version index d3840775da9..aa06a0dbcdc 100644 --- a/src/tools/miri/rust-version +++ b/src/tools/miri/rust-version @@ -1 +1 @@ -78dd504f2fd87c0cfabff7d9174253411caf2f80 +21e6de7eb64c09102de3f100420a09edc1a2a8d7 diff --git a/src/tools/miri/tests/panic/mir-validation.stderr b/src/tools/miri/tests/panic/mir-validation.stderr index d158c996dc3..d5dd53d7b4e 100644 --- a/src/tools/miri/tests/panic/mir-validation.stderr +++ b/src/tools/miri/tests/panic/mir-validation.stderr @@ -1,4 +1,4 @@ -thread 'rustc' panicked at compiler/rustc_const_eval/src/transform/validate.rs:LL:CC: +thread 'rustc' panicked at compiler/rustc_mir_transform/src/validate.rs:LL:CC: broken MIR in Item(DefId) (after phase change to runtime-optimized) at bb0[1]: (*(_2.0: *mut i32)), has deref at the wrong place stack backtrace: diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index ad900ce0386..9a6ae18abea 100644 --- a/src/tools/tidy/src/allowed_run_make_makefiles.txt +++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt @@ -228,7 +228,6 @@ run-make/rmeta-preferred/Makefile run-make/rustc-macro-dep-files/Makefile run-make/rustdoc-io-error/Makefile run-make/rustdoc-verify-output-files/Makefile -run-make/rustdoc-with-output-option/Makefile run-make/sanitizer-cdylib-link/Makefile run-make/sanitizer-dylib-link/Makefile run-make/sanitizer-staticlib-link/Makefile |