Skip to content
Merged

Rustup #2756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3522af9
Auto merge of #106340 - saethlin:propagate-operands, r=oli-obk
bors Jan 9, 2023
91ef675
Rollup merge of #105034 - HintringerFabian:improve_iterator_flatten_d…
Jan 9, 2023
ddf8d06
Rollup merge of #105708 - tomerze:enable-atomic-cas-bpf, r=nagisa
Jan 9, 2023
b0b9556
Rollup merge of #106175 - compiler-errors:bad-import-sugg, r=oli-obk
Jan 9, 2023
768e138
Rollup merge of #106639 - RalfJung:miri, r=RalfJung
Jan 9, 2023
e602ee4
Rollup merge of #106640 - lcnr:update-test, r=jackh726
Jan 9, 2023
171870a
Rollup merge of #106647 - notriddle:notriddle/a, r=GuillaumeGomez
Jan 9, 2023
6835235
Auto merge of #106656 - JohnTitor:rollup-rk2qltg, r=JohnTitor
bors Jan 10, 2023
5863e52
Auto merge of #106607 - compiler-errors:be-more-accurate-abt-method-s…
bors Jan 10, 2023
32ff9ab
Auto merge of #105919 - uweigand:s390x-stack-overflow, r=Nilstrieb
bors Jan 11, 2023
4529030
Stabilize `::{core,std}::pin::pin!`
danielhenrymantilla Oct 31, 2022
464db61
Rollup merge of #103236 - tspiteri:redoc-int-adc-sbb, r=m-ou-se
compiler-errors Jan 12, 2023
71e2f3f
Rollup merge of #103800 - danielhenrymantilla:stabilize-pin-macro, r=…
compiler-errors Jan 12, 2023
672747e
Rollup merge of #106097 - mejrs:mir_build2, r=oli-obk
compiler-errors Jan 12, 2023
297e329
Rollup merge of #106170 - compiler-errors:autoderef-to-analysis, r=lcnr
compiler-errors Jan 12, 2023
93552ae
Rollup merge of #106323 - starkat99:stabilize-f16c_target_feature, r=…
compiler-errors Jan 12, 2023
9f65fe7
Rollup merge of #106360 - estebank:remove-borrow-suggestion, r=compil…
compiler-errors Jan 12, 2023
6e218b2
Rollup merge of #106524 - compiler-errors:constructor-note, r=cjgillot
compiler-errors Jan 12, 2023
2df9d7b
Rollup merge of #106739 - WaffleLapkin:astconv, r=estebank
compiler-errors Jan 12, 2023
71faf0a
Harden the pre-tyctxt query system against accidental recomputation
oli-obk Dec 12, 2022
0f94521
Auto merge of #106760 - compiler-errors:rollup-0bogyco, r=compiler-er…
bors Jan 12, 2023
eb010df
Auto merge of #105603 - oli-obk:non_repeatable_queries, r=petrochenkov
bors Jan 12, 2023
806f93b
Rollup merge of #105806 - mejrs:eager2, r=davidtwco
Noratrieb Jan 12, 2023
2505b01
Rollup merge of #106322 - compiler-errors:CollectAllMismatches-infer-…
Noratrieb Jan 12, 2023
2f6bb94
Rollup merge of #106579 - estebank:issue-52144, r=Nilstrieb
Noratrieb Jan 12, 2023
d35228e
Rollup merge of #106714 - Ezrashaw:remove-e0490, r=davidtwco
Noratrieb Jan 12, 2023
ff8f56d
Rollup merge of #106751 - clubby789:const-intrinsic, r=GuillaumeGomez
Noratrieb Jan 12, 2023
737b97d
Rollup merge of #106761 - WaffleLapkin:waffle-is-CompilerReviewer, r=…
Noratrieb Jan 12, 2023
f71e3c9
Auto merge of #106773 - Nilstrieb:rollup-sq73pyg, r=Nilstrieb
bors Jan 12, 2023
f35e92f
Auto merge of #101138 - Rejyr:diagnostic-migration-rustc-lint-pt2, r=…
bors Jan 13, 2023
d91464e
Auto merge of #106004 - fee1-dead-contrib:const-closures, r=oli-obk
bors Jan 13, 2023
fa622ae
Preparing for merge from rustc
RalfJung Jan 13, 2023
b1ce7ad
Merge from rustc
RalfJung Jan 13, 2023
5a267f8
clippy
RalfJung Jan 13, 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 rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c54c8cbac882e149e04a9e1f2d146fd548ae30ae
279f1c9d8c26a8d227ae8ab806d262bb784b251b
2 changes: 1 addition & 1 deletion src/bin/miri.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
) -> Compilation {
compiler.session().abort_if_errors();

queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
queries.global_ctxt().unwrap().enter(|tcx| {
init_late_loggers(tcx);
if !tcx.sess.crate_types().contains(&CrateType::Executable) {
tcx.sess.fatal("miri only makes sense on bin crates");
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
clippy::single_match,
clippy::useless_format,
clippy::derive_partial_eq_without_eq,
clippy::derive_hash_xor_eq,
clippy::derived_hash_with_manual_eq,
clippy::too_many_arguments,
clippy::type_complexity,
clippy::single_element_loop,
Expand Down
2 changes: 0 additions & 2 deletions tests/pass/issues/issue-miri-2068.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(pin_macro)]

use core::future::Future;
use core::pin::Pin;
use core::task::{Context, Poll};
Expand Down
2 changes: 0 additions & 2 deletions tests/pass/stacked-borrows/future-self-referential.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(pin_macro)]

use std::future::*;
use std::marker::PhantomPinned;
use std::pin::*;
Expand Down