Skip to content

Rustup #2573

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 16 commits into from
Sep 30, 2022
Merged

Rustup #2573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
66b6b9c
Stabilize bench_black_box
Urgau Sep 24, 2022
a537b94
Rollup merge of #102232 - Urgau:stabilize-bench_black_box, r=TaKO8Ki
JohnTitor Sep 28, 2022
8c1bc24
Rollup merge of #102288 - mejrs:inner, r=compiler-errors
JohnTitor Sep 28, 2022
ed31674
Rollup merge of #102338 - compiler-errors:assoc-ty-binding-in-assoc-t…
JohnTitor Sep 28, 2022
88c5b83
Rollup merge of #102347 - nnethercote:unescaping-cleanups, r=matklad
JohnTitor Sep 28, 2022
855e568
Rollup merge of #102348 - nnethercote:tweak-FulfillProcessor, r=jackh726
JohnTitor Sep 28, 2022
dbe20ff
Rollup merge of #102378 - compiler-errors:issue-102289, r=jackh726
JohnTitor Sep 28, 2022
2ccd978
Rollup merge of #102380 - notriddle:notriddle/rustdoc-source-sidebar,…
JohnTitor Sep 28, 2022
6ed6339
Auto merge of #102388 - JohnTitor:rollup-mbyw6fl, r=JohnTitor
bors Sep 28, 2022
01d5812
Auto merge of #102302 - nnethercote:more-lexer-improvements, r=matklad
bors Sep 28, 2022
b1bbb11
Auto merge of #101619 - Xiretza:rustc_parse-session-diagnostics, r=da…
bors Sep 28, 2022
986f0f1
Auto merge of #101454 - cjgillot:concat-binders, r=estebank
bors Sep 28, 2022
dd4cf23
Auto merge of #100719 - CohenArthur:rust-safe-intrinsic-attribute, r=…
bors Sep 28, 2022
f2d257e
Auto merge of #102384 - camelid:extrainfo, r=GuillaumeGomez
bors Sep 28, 2022
1bdac65
Merge remote-tracking branch 'josh/master' into rustup
RalfJung Sep 29, 2022
5dc209f
rustup
RalfJung Sep 29, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
21265dd0d209e7b682f249a3a45034f02d32650b
1536a53ea4798df052dc31a611c2f29c8f529be7
1 change: 0 additions & 1 deletion tests/fail/invalid_bool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Validation makes this fail in the wrong place
// Make sure we find these even with many checks disabled.
//@compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
#![feature(bench_black_box)]

fn main() {
let b = unsafe { std::mem::transmute::<u8, bool>(2) };
Expand Down
2 changes: 1 addition & 1 deletion tests/pass/float.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(stmt_expr_attributes, bench_black_box)]
#![feature(stmt_expr_attributes)]
#![allow(arithmetic_overflow)]
use std::fmt::Debug;
use std::hint::black_box;
Expand Down
1 change: 0 additions & 1 deletion tests/pass/u128.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#![feature(bench_black_box)]
use std::hint::black_box as b;

fn main() {
Expand Down