Rollup of 7 pull requests #75276

JohnTitor · 2020-08-08T02:36:14Z

Successful merges:

Don't call a function in function-arguments-naked.rs #75224 (Don't call a function in function-arguments-naked.rs)
Display elided lifetime for non-reference type in doc #75237 (Display elided lifetime for non-reference type in doc)
make MaybeUninit::as_(mut_)ptr const #75250 (make MaybeUninit::as_(mut_)ptr const)
clean up const-hacks in int endianess conversion functions #75253 (clean up const-hacks in int endianess conversion functions)
Add missing backtick #75259 (Add missing backtick)
Small cleanup #75267 (Small cleanup)
fix a couple of clippy findings #75270 (fix a couple of clippy findings)

Failed merges:

Fixes rust-lang#75096 It's U.B. to use anything other than inline assmebling in a naked function. Fortunately, the `#break` directive works fine without anything in the function body.

We need to use inline assembly, which is inherently platform-specific.

Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>

* Add docstring to `Parser` field * Remove unnecessary `unwrap` * Remove unnecessary borrow * Fix indentation of some `teach`text output

…age from always being evaluated

…let Some(_) = ..

…ar pattern

…e mutable

…ctions directly

…break; }

…eferences.

…ked, r=Amanieu Don't call a function in function-arguments-naked.rs Fixes rust-lang#75096 It's U.B. to use anything other than inline assmebling in a naked function. Fortunately, the `#break` directive works fine without anything in the function body.

Display elided lifetime for non-reference type in doc In edition 2018 we encourage writing `<'_>` explicitly, so rustdoc should display like such as well. Fixes rust-lang#75225 ~~Somehow when I run the compiled rustdoc using `cargo +stage2 doc` on other crates, it correctly produces `<'_>`, but I couldn't get the std doc to do the same with `./x.py doc --stage 2`. Might this be related to the recent change to x.py about how the doc is built?~~

make MaybeUninit::as_(mut_)ptr const I think it was just an oversight that they are not const yet. I also changed their implementation as the old one created references to uninitialized memory.^^

@oli-obk

clean up const-hacks in int endianess conversion functions Cleans up the const hacks added in rust-lang#69373. r? @oli-obk

Add missing backtick

Small cleanup * Add docstring to `Parser` field * Remove unnecessary `unwrap` * Remove unnecessary borrow * Fix indentation of some `teach`text output

fix a couple of clippy findings

JohnTitor · 2020-08-08T02:36:44Z

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

bors · 2020-08-08T02:36:46Z

📌 Commit 21bfe52 has been approved by JohnTitor

bors · 2020-08-08T03:54:39Z

⌛ Testing commit 21bfe52 with merge 1d100ba...

bors · 2020-08-08T05:58:49Z

☀️ Test successful - checks-actions, checks-azure
Approved by: JohnTitor
Pushing 1d100ba to master...

Aaron1011 and others added 30 commits August 6, 2020 12:12

Don't call a function in function-arguments-naked.rs

bbcacdd

Fixes rust-lang#75096 It's U.B. to use anything other than inline assmebling in a naked function. Fortunately, the `#break` directive works fine without anything in the function body.

make MaybeUninit::as_(mut_)ptr const

0aee186

fix feature gate and tracking issue

ec5d78d

clean up const-hacks in int endianess conversion functions

a530934

Only test function-arguments-naked.rs on x86_64

91dda2c

We need to use inline assembly, which is inherently platform-specific.

Apply extern "C" calling convention

c34c77c

Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>

Add missing backtick

7d4565b

Small cleanup

7e9a848

* Add docstring to `Parser` field * Remove unnecessary `unwrap` * Remove unnecessary borrow * Fix indentation of some `teach`text output

fix clippy::expect_fun_call: use unwrap_or_else to prevent panic mess…

3ef8c72

…age from always being evaluated

fix clippy::filter_next: use .find(..) instead of .filter(..).next()

8bc1f91

fix clippy::iter_next_slice: use .get(0) instead of .iter().next()

fca81fa

fix clippy::map_identity: remove redundant .map(|x| x) call

fb975cd

fix clippy::redundant_clone: remove redundant clones

27bb689

fix clippy::redundant_pattern_matching: use .is_some() instead of if …

09e29e7

…let Some(_) = ..

fix clippy::single_char_pattern: use char instead of string single-ch…

f3ec5be

…ar pattern

fix clippy::unit_arg: make it explicit that Ok(()) is being returned

a1c2212

fix clippy::unnecessary_mut_passed: function arg is not required to b…

f6b1857

…e mutable

fix clippy::unneeded_wildcard_pattern: remove redundant wildcard pattern

eccc2fe

fix clippy::len_zero: use is_empty() instead of comparing .len() to zero

057730c

Display elided lifetime for non-reference type in doc

63c0d9c

Display elided lifetime for external paths

505d157

fix clippy::redundant_closure: remove redundant closures and call fun…

f95cfe5

…ctions directly

fix clippy::while_let_loop: use while let{} instead of loop { if ... …

ea9ccfa

…break; }

fix clippy::into_iter_on_ref: use .iter() instead of into_iter() on r…

4ba1a19

…eferences.

fix clippy::map_clone: use .cloned() instead of .map(|x| x.clone())

15dcda3

fix clippy::clone_on_copy: don't clone types that are copy

ff692ab

fix clippy::needless_return: remove unneeded return statements

a605e51

Cross-crate doc inlining test case for elided lifetime

541fbbb

JohnTitor added 5 commits August 8, 2020 11:36

Rollup merge of rust-lang#75250 - RalfJung:uninit-const-ptr, r=oli-obk

b032a15

make MaybeUninit::as_(mut_)ptr const I think it was just an oversight that they are not const yet. I also changed their implementation as the old one created references to uninitialized memory.^^

Rollup merge of rust-lang#75253 - RalfJung:cleanup-const-hack, r=oli-obk

02bf036

clean up const-hacks in int endianess conversion functions Cleans up the const hacks added in rust-lang#69373. r? @oli-obk

Rollup merge of rust-lang#75259 - giraffate:add_missing_backtick, r=lcnr

2c1fe50

Add missing backtick

Rollup merge of rust-lang#75267 - estebank:cleanup, r=Dylan-DPC

81546de

Small cleanup * Add docstring to `Parser` field * Remove unnecessary `unwrap` * Remove unnecessary borrow * Fix indentation of some `teach`text output

Rollup merge of rust-lang#75270 - matthiaskrgr:clippy_aug_1, r=Dylan-DPC

21bfe52

fix a couple of clippy findings

rustbot added the rollup A PR which is a rollup label Aug 8, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 8, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 8, 2020

bors merged commit 1d100ba into rust-lang:master Aug 8, 2020

This was referenced Aug 8, 2020

Update chalk to 0.19.0 #74700

Closed

Replacing log with tracing #75090

Closed

Upgrade Chalk to 0.21 #75173

Merged

JohnTitor deleted the rollup-rz4hs0w branch August 8, 2020 08:24

cuviper added this to the 1.47.0 milestone May 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #75276

Rollup of 7 pull requests #75276

JohnTitor commented Aug 8, 2020

JohnTitor commented Aug 8, 2020

bors commented Aug 8, 2020

bors commented Aug 8, 2020

bors commented Aug 8, 2020

Rollup of 7 pull requests #75276

Rollup of 7 pull requests #75276

Conversation

JohnTitor commented Aug 8, 2020

JohnTitor commented Aug 8, 2020

bors commented Aug 8, 2020

bors commented Aug 8, 2020

bors commented Aug 8, 2020