Skip to content

Rollup of 3 pull requests #115398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 31, 2023
Merged

Rollup of 3 pull requests #115398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7272552
clean up `local_overflow_limit` computation
lqd Aug 30, 2023
76ee9ac
`ignore-cross-compile` remaining tests that run binaries
Veykril Aug 30, 2023
da86cdf
Make `termcolor` types public in `rustc_errors`
LegNeato Aug 30, 2023
0b62835
Rollup merge of #115373 - lqd:come-on-bors, r=compiler-errors
matthiaskrgr Aug 31, 2023
a0d2cb0
Rollup merge of #115378 - ferrocene:ignore-cross-compile, r=lqd
matthiaskrgr Aug 31, 2023
82675f6
Rollup merge of #115393 - LegNeato:patch-1, r=oli-obk
matthiaskrgr Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_errors/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 1 addition & 5 deletions compiler/rustc_trait_selection/src/solve/search_graph/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
}
Expand Down
1 change: 1 addition & 0 deletions tests/run-make/pgo-branch-weights/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 1 addition & 0 deletions tests/run-make/pgo-gen-lto/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 1 addition & 0 deletions tests/run-make/pgo-gen/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 1 addition & 0 deletions tests/run-make/pgo-indirect-call-promotion/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 1 addition & 0 deletions tests/run-make/pgo-use/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 1 addition & 0 deletions tests/run-make/pointer-auth-link-with-c/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include ../tools.mk

# only-aarch64
# ignore-cross-compile

all:
$(COMPILE_OBJ) $(TMPDIR)/test.o test.c
Expand Down
1 change: 1 addition & 0 deletions tests/run-make/profile/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# needs-profiler-support
# ignore-cross-compile

include ../tools.mk

Expand Down