nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 07:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #115398 - matthiaskrgr:rollup-88lj9gk, r=matthiaskrgr

Browse Source 
Rollup of 3 pull requests

Successful merges:

 - #115373 (Fix bors missing a commit when merging #115355)
 - #115378 (`ignore-cross-compile` remaining tests that run binaries)
 - #115393 (Make `termcolor` types public in `rustc_errors`)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2023-08-31 06:02:49 +00:00
commit 8cbd2c847b
9 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_errors/src/lib.rs
View File

@ -55,7 +55,7 @@ use std::num::NonZeroUsize;
use std::panic;
use std::path::{Path, PathBuf};
use termcolor::{Color, ColorSpec};
pub use termcolor::{Color, ColorSpec, WriteColor};
pub mod annotate_snippet_emitter_writer;
mod diagnostic;

6
compiler/rustc_trait_selection/src/solve/search_graph/mod.rs
View File

@ -51,13 +51,9 @@ pub(super) struct SearchGraph<'tcx> {
impl<'tcx> SearchGraph<'tcx> {
pub(super) fn new(tcx: TyCtxt<'tcx>, mode: SolverMode) -> SearchGraph<'tcx> {
let local_overflow_limit = {
let recursion_limit = tcx.recursion_limit().0;
if recursion_limit == 0 { 0 } else { recursion_limit.ilog2() as usize }
};
Self {
mode,
local_overflow_limit,
local_overflow_limit: tcx.recursion_limit().0.checked_ilog2().unwrap_or(0) as usize,
stack: Default::default(),
provisional_cache: ProvisionalCache::empty(),
}

1
tests/run-make/pgo-branch-weights/Makefile
View File

@ -1,5 +1,6 @@
# needs-profiler-support
# ignore-windows-gnu
# ignore-cross-compile
# FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works
# properly. Since we only have GCC on the CI ignore the test for now.

1
tests/run-make/pgo-gen-lto/Makefile
View File

@ -1,5 +1,6 @@
# needs-profiler-support
# ignore-windows-gnu
# ignore-cross-compile
# FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works
# properly. Since we only have GCC on the CI ignore the test for now.

1
tests/run-make/pgo-gen/Makefile
View File

@ -1,5 +1,6 @@
# needs-profiler-support
# ignore-windows-gnu
# ignore-cross-compile
# FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works
# properly. Since we only have GCC on the CI ignore the test for now.

1
tests/run-make/pgo-indirect-call-promotion/Makefile
View File

@ -1,5 +1,6 @@
# needs-profiler-support
# ignore-windows-gnu
# ignore-cross-compile
# FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works
# properly. Since we only have GCC on the CI ignore the test for now.

1
tests/run-make/pgo-use/Makefile
View File

@ -1,5 +1,6 @@
# needs-profiler-support
# ignore-windows-gnu
# ignore-cross-compile
# FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works
# properly. Since we only have GCC on the CI ignore the test for now.

1
tests/run-make/pointer-auth-link-with-c/Makefile
View File

@ -1,6 +1,7 @@
include ../tools.mk
# only-aarch64
# ignore-cross-compile
all:
$(COMPILE_OBJ) $(TMPDIR)/test.o test.c

1
tests/run-make/profile/Makefile
View File

@ -1,4 +1,5 @@
# needs-profiler-support
# ignore-cross-compile
include ../tools.mk