Make core::nonzero private #1

SimonSapin · 2018-02-16T11:11:35Z

It is now an implementation detail of ptr::NonNull and num::NonZero*

SimonSapin · 2018-02-16T11:16:22Z

This PR goes into the branch of another PR. It is intended to give a permanent URL to a specific diff. Assuming the other PR lands and after an appropriate deprecation period, a new PR to upstream will need to be opened with these changes.

Make compiletest do exact matching on triples This avoids the issues of the previous substring matching, ensuring `ARCH_TABLE` and `OS_TABLE` will no longer contain redundant entries. Fixes rust-lang#48893. r? @rkruppe

…uietMisdreavus Put `#[macro_use] extern crate <crate>` before fn main() in doctests Closes rust-lang#49174.

@QuietMisdreavus

…-links, r=QuietMisdreavus Fix automatic urls with backticks Fixes rust-lang#49164. r? @QuietMisdreavus

Add back 1.24.1 release notes

Update CONTRIBUTING.md The current link is a 404, just link to the main repo page

Rollup of 11 pull requests - Successful merges: rust-lang#48639, rust-lang#49223, rust-lang#49333, rust-lang#49369, rust-lang#49381, rust-lang#49395, rust-lang#49399, rust-lang#49401, rust-lang#49417, rust-lang#49202, rust-lang#49426 - Failed merges:

…dreavus Rustdoc support for universal_impl_trait Hides type parameters synthesized by `impl Trait`-in-argument-position, and enables links to trait names. <img alt="before" src="https://user-images.githubusercontent.com/7091080/37831646-a61413c6-2ee9-11e8-8ec2-a6137956d922.png" width="450"/> ↓ <img alt="after" src="https://user-images.githubusercontent.com/7091080/37831657-b2ff0ae6-2ee9-11e8-8797-fdad904782bf.png" width="450"/> Fixes rust-lang#49309

@eddyb

Allow niche-filling dataful variants to be represented as a ScalarPair r? @eddyb

This includes a submodule update to rustfmt in order to allow a stable feature declaration.

Introduce a TargetTriple enum to support absolute target paths This PR replaces target triple strings with a `TargetTriple` enum, which represents either a target triple or a path to a JSON target file. The path variant is used if the `--target` argument has a `.json` extension, else the target triple variant is used. The motivation of this PR is support for absolute target paths to avoid the need for setting the `RUST_TARGET_PATH` environment variable (see rust-lang/cargo#4905 for more information). For places where some kind of triple is needed (e.g. in the sysroot folder), we use the file name (without extension). For compatibility, we keep the old behavior of searching for a file named `$(target_triple).json` in `RUST_TARGET_PATH` for non-official target triples.

@nikomatsakis

…omatsakis Stabilize match_default_bindings This includes a submodule update to rustfmt in order to allow a stable feature declaration. r? @nikomatsakis cc rust-lang#42640 Many of the tests this PR touches are merely testing the current lack of desired future behavior around rust-lang#44849 and rust-lang#44848 (cc @tschottdorf). I noticed the bullets for those items were checked on the tracking issue-- I've unchecked them, as they don't appear to have been completed and I don't see any comments indicating that we don't want to pursue them further. Still, I think it's fine to stabilize the current behavior, as I think expanding it in the future should be backwards-compatible.

It is now an implementation detail of ptr::NonNull and num::NonZero*

Building for x86_64-unknown-linux-musl currently results in an executable lacking debug information for musl libc itself. If you request a backtrace in GDB while control flow is within musl – including sycalls made by musl – the result looks like: #0 0x0000000000434b46 in __cp_end () #1 0x0000000000432dbd in __syscall_cp_c () rust-lang#2 0x0000000000000000 in ?? () i.e. not very helpful. Adding --enable-debug resolves this, and --enable-optimize re-enables optimisations which default to off given the previous flag.

Add --enable-debug flag to musl CI build script Building for x86_64-unknown-linux-musl currently results in an executable lacking debug information for musl libc itself. If you request a backtrace in GDB while control flow is within musl – including sycalls made by musl – the result looks like: ``` #0 0x0000000000434b46 in __cp_end () #1 0x0000000000432dbd in __syscall_cp_c () rust-lang#2 0x0000000000000000 in ?? () ``` i.e. not very helpful. Adding --enable-debug resolves this, and --enable-optimize re-enables optimisations which default to off given the previous flag.

Merge upstream changes

There is a hot path through `opt_normalize_projection_type`: - `try_start` does a cache lookup (#1). - The result is a `NormalizedTy`. - There are no unresolved type vars, so we call `complete`. - `complete` does *another* cache lookup (rust-lang#2), then calls `SnapshotMap::insert`. - `insert` does *another* cache lookup (rust-lang#3), inserting the same value that's already in the cache. This patch optimizes this hot path by introducing `complete_normalized`, for use when the value is known in advance to be a `NormalizedTy`. It always avoids lookup rust-lang#2. Furthermore, if the `NormalizedTy`'s obligations are empty (the common case), we know that lookup rust-lang#3 would be a no-op, so we avoid it, while inserting a Noop into the `SnapshotMap`'s undo log.

When encountering an unexisting method for a given trait where an associated function has the same name, suggest using the appropriate syntax, instead of using `help` text. When only one candidate is found, do not call it "candidate #1", just call it "the candidate".

Tweak output on E0599 for assoc fn used as method - Use suggestion instead of `help` when possible - Add primary span label - Remove incorrect `help` suggestion using incorrect syntax - Do not refer to only one possible candidate as `candidate #1`, refer to it as `the candidate`

Suggestion for 'static impl Trait return When encountering a named or anonymous sup requirement (for example, `&'a self`) and a `'static` impl Trait return type, suggest adding the `'_` lifetime constraing to the return type. Fix rust-lang#43719, rust-lang#51282. ``` error: cannot infer an appropriate lifetime --> $DIR/static-return-lifetime-infered.rs:17:16 | LL | fn iter_values_anon(&self) -> impl Iterator<Item=u32> { | ----------------------- this return type evaluates to the `'static` lifetime... LL | self.x.iter().map(|a| a.0) | ------ ^^^^ | | | ...but this borrow... | note: ...can't outlive the anonymous lifetime #1 defined on the method body at 16:5 --> $DIR/static-return-lifetime-infered.rs:16:5 | LL | / fn iter_values_anon(&self) -> impl Iterator<Item=u32> { LL | | self.x.iter().map(|a| a.0) LL | | } | |_____^ help: you can add a constraint to the return type to make it last less than `'static` and match the anonymous lifetime #1 defined on the method body at 16:5 | LL | fn iter_values_anon(&self) -> impl Iterator<Item=u32> + '_ { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ```

@matthewjasper

…-box, r=eddyb [NLL] Dangly paths for box Special-case `Box` in `rustc_mir::borrow_check`. Since we know dropping a box will not access any `&mut` or `&` references, it is safe to model its destructor as only touching the contents *owned* by the box. ---- There are three main things going on here: 1. The first main thing, this PR is fixing a bug in NLL where `rustc` previously would issue a diagnostic error in a case like this: ```rust fn foo(x: Box<&mut i32>) -> &mut i32 { &mut **x } ``` such code was accepted by the AST-borrowck in the past, but NLL was rejecting it with the following message ([playground](https://play.rust-lang.org/?gist=13c5560f73bfb16d6dab3ceaad44c0f8&version=nightly&mode=release&edition=2015)) ``` error[E0597]: `**x` does not live long enough --> src/main.rs:3:40 | 3 | fn foo(x: Box<&mut i32>) -> &mut i32 { &mut **x } | ^^^^^^^^ - `**x` dropped here while still borrowed | | | borrowed value does not live long enough | note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 3:1... --> src/main.rs:3:1 | 3 | fn foo(x: Box<&mut i32>) -> &mut i32 { &mut **x } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error ``` 2. The second main thing: The reason such code was previously rejected was because NLL (MIR-borrowck) incorporates a fix for issue rust-lang#31567, where it models a destructor's execution as potentially accessing any borrows held by the thing being destructed. The tests with `Scribble` model this, showing that the compiler now catches such unsoundness. However, that fix for issue rust-lang#31567 is too strong, in that NLL (MIR-borrowck) includes `Box` as one of the types with a destructor that potentially accesses any borrows held by the box. This thus was the cause of the main remaining discrepancy between AST-borrowck and MIR-borrowck, as documented in issue rust-lang#45696, specifically in [the last example of this comment](rust-lang#45696 (comment)), which I have adapted into the `fn foo` shown above. We did close issue rust-lang#45696 back in December of 2017, but AFAICT that example was not fixed by PR rust-lang#46268. (And we did not include a test, etc etc.) This PR fixes that case, by trying to model the so-called `DerefPure` semantics of `Box<T>` when we traverse the type of the input to `visit_terminator_drop`. 3. The third main thing is that during a review of the first draft of this PR, @matthewjasper pointed out that the new traversal of `Box<T>` could cause the compiler to infinite loop. I have adjusted the PR to avoid this (by tracking what types we have previously seen), and added a much needed test of this somewhat odd scenario. (Its an odd scenario because the particular case only arises for things like `struct A(Box<A>);`, something which cannot be constructed in practice.) Fix rust-lang#45696.

fix typos

sync fork with upstream (master)

Explain safety for `vec.set_len(0)`

Use arenas to avoid Lrc in queries #1 Based on rust-lang#59536.

Merge recent changes into master

update for vxWorks

Pull from newest repo

HWAddressSanitizer support # Motivation Compared to regular ASan, HWASan has a [smaller overhead](https://source.android.com/devices/tech/debug/hwasan). The difference in practice is that HWASan'ed code is more usable, e.g. Android device compiled with HWASan can be used as a daily driver. # Example ``` fn main() { let xs = vec![0, 1, 2, 3]; let _y = unsafe { *xs.as_ptr().offset(4) }; } ``` ``` ==223==ERROR: HWAddressSanitizer: tag-mismatch on address 0xefdeffff0050 at pc 0xaaaad00b3468 READ of size 4 at 0xefdeffff0050 tags: e5/00 (ptr/mem) in thread T0 #0 0xaaaad00b3464 (/root/main+0x53464) #1 0xaaaad00b39b4 (/root/main+0x539b4) rust-lang#2 0xaaaad00b3dd0 (/root/main+0x53dd0) rust-lang#3 0xaaaad00b61dc (/root/main+0x561dc) rust-lang#4 0xaaaad00c0574 (/root/main+0x60574) rust-lang#5 0xaaaad00b6290 (/root/main+0x56290) rust-lang#6 0xaaaad00b6170 (/root/main+0x56170) rust-lang#7 0xaaaad00b3578 (/root/main+0x53578) rust-lang#8 0xffff81345e70 (/lib64/libc.so.6+0x20e70) rust-lang#9 0xaaaad0096310 (/root/main+0x36310) [0xefdeffff0040,0xefdeffff0060) is a small allocated heap chunk; size: 32 offset: 16 0xefdeffff0050 is located 0 bytes to the right of 16-byte region [0xefdeffff0040,0xefdeffff0050) allocated here: #0 0xaaaad009bcdc (/root/main+0x3bcdc) #1 0xaaaad00b1eb0 (/root/main+0x51eb0) rust-lang#2 0xaaaad00b20d4 (/root/main+0x520d4) rust-lang#3 0xaaaad00b2800 (/root/main+0x52800) rust-lang#4 0xaaaad00b1cf4 (/root/main+0x51cf4) rust-lang#5 0xaaaad00b33d4 (/root/main+0x533d4) rust-lang#6 0xaaaad00b39b4 (/root/main+0x539b4) rust-lang#7 0xaaaad00b61dc (/root/main+0x561dc) rust-lang#8 0xaaaad00b3578 (/root/main+0x53578) rust-lang#9 0xaaaad0096310 (/root/main+0x36310) Thread: T0 0xeffe00002000 stack: [0xffffc0590000,0xffffc0d90000) sz: 8388608 tls: [0xffff81521020,0xffff815217d0) Memory tags around the buggy address (one tag corresponds to 16 bytes): 0xfefcefffef80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefcefffef90: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefcefffefa0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefcefffefb0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefcefffefc0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefcefffefd0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefcefffefe0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefcefffeff0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 =>0xfefceffff000: a2 a2 05 00 e5 [00] 00 00 00 00 00 00 00 00 00 00 0xfefceffff010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefceffff020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefceffff030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefceffff040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefceffff050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefceffff060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefceffff070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0xfefceffff080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 Tags for short granules around the buggy address (one tag corresponds to 16 bytes): 0xfefcefffeff0: .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. =>0xfefceffff000: .. .. c5 .. .. [..] .. .. .. .. .. .. .. .. .. .. 0xfefceffff010: .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. See https://clang.llvm.org/docs/HardwareAssistedAddressSanitizerDesign.html#short-granules for a description of short granule tags Registers where the failure occurred (pc 0xaaaad00b3468): x0 e500efdeffff0050 x1 0000000000000004 x2 0000ffffc0d8f5a0 x3 0200efff00000000 x4 0000ffffc0d8f4c0 x5 000000000000004f x6 00000ffffc0d8f36 x7 0000efff00000000 x8 e500efdeffff0050 x9 0200efff00000000 x10 0000000000000000 x11 0200efff00000000 x12 0200effe000006b0 x13 0200effe000006b0 x14 0000000000000008 x15 00000000c00000cf x16 0000aaaad00a0afc x17 0000000000000003 x18 0000000000000001 x19 0000ffffc0d8f718 x20 ba00ffffc0d8f7a0 x21 0000aaaad00962e0 x22 0000000000000000 x23 0000000000000000 x24 0000000000000000 x25 0000000000000000 x26 0000000000000000 x27 0000000000000000 x28 0000000000000000 x29 0000ffffc0d8f650 x30 0000aaaad00b3468 ``` # Comments/Caveats * HWASan is only supported on arm64. * I'm not sure if I should add a feature gate or piggyback on the existing one for sanitizers. * HWASan requires `-C target-feature=+tagged-globals`. That flag should probably be set transparently to the user. Not sure how to go about that. # TODO * Need more tests. * Update documentation. * Fix symbolization. * Integrate with CI

SimonSapin mentioned this pull request Feb 16, 2018

RFC: Add std::num::NonZeroU32 and friends, deprecate core::nonzero rust-lang/rfcs#2307

Merged

SimonSapin force-pushed the nonzero branch from f2f8679 to bb36499 Compare February 16, 2018 11:18

SimonSapin force-pushed the private-core-nonzero branch from 6834ec7 to 47ede47 Compare February 16, 2018 11:25

SimonSapin force-pushed the nonzero branch from bb36499 to fc8d2e6 Compare February 16, 2018 11:32

SimonSapin force-pushed the private-core-nonzero branch from 47ede47 to f4a6348 Compare February 16, 2018 11:33

SimonSapin force-pushed the nonzero branch from fc8d2e6 to fd78575 Compare February 16, 2018 12:02

SimonSapin force-pushed the private-core-nonzero branch from f4a6348 to 8c54fd5 Compare February 16, 2018 12:02

SimonSapin force-pushed the nonzero branch from fd78575 to c819a2e Compare February 16, 2018 14:58

SimonSapin force-pushed the private-core-nonzero branch from 8c54fd5 to 6925c12 Compare February 16, 2018 14:58

SimonSapin force-pushed the nonzero branch from c819a2e to 593b332 Compare February 16, 2018 15:36

SimonSapin force-pushed the private-core-nonzero branch from 6925c12 to 17a41ea Compare February 16, 2018 15:36

SimonSapin mentioned this pull request Feb 16, 2018

Tracking issue for NonZero/Unique/Shared stabilization rust-lang/rust#27730

Closed

SimonSapin force-pushed the private-core-nonzero branch from 17a41ea to 0c5e0f6 Compare February 16, 2018 19:11

SimonSapin force-pushed the nonzero branch from cabc4f1 to 90a7a4b Compare February 16, 2018 21:29

SimonSapin force-pushed the nonzero branch from 90a7a4b to 113e83c Compare March 8, 2018 15:53

SimonSapin force-pushed the private-core-nonzero branch from 0c5e0f6 to 1641b19 Compare March 8, 2018 16:57

SimonSapin force-pushed the nonzero branch from 94ac682 to fe39656 Compare March 8, 2018 17:22

SimonSapin force-pushed the private-core-nonzero branch from 1641b19 to 2cbcd09 Compare March 8, 2018 17:22

SimonSapin force-pushed the nonzero branch from fe39656 to a7ca6b2 Compare March 9, 2018 08:42

SimonSapin force-pushed the private-core-nonzero branch from 2cbcd09 to fe4b5b5 Compare March 9, 2018 09:10

SimonSapin force-pushed the nonzero branch 2 times, most recently from 9645b5a to 73c0537 Compare March 17, 2018 22:59

SimonSapin force-pushed the private-core-nonzero branch from fe4b5b5 to cb25107 Compare March 18, 2018 22:55

SimonSapin mentioned this pull request Mar 18, 2018

Add 12 num::NonZero* types for primitive integers, deprecate core::nonzero rust-lang/rust#48265

Merged

SimonSapin force-pushed the private-core-nonzero branch 2 times, most recently from f332ac0 to 4a661fd Compare March 18, 2018 23:18

kennytm added 3 commits March 22, 2018 22:43

Rollup merge of rust-lang#49188 - memoryleak47:macro_use_doctest, r=Q…

95967c7

…uietMisdreavus Put `#[macro_use] extern crate <crate>` before fn main() in doctests Closes rust-lang#49174.

Rollup merge of rust-lang#49189 - GuillaumeGomez:fix-implied-shortcut…

d7eda77

…-links, r=QuietMisdreavus Fix automatic urls with backticks Fixes rust-lang#49164. r? @QuietMisdreavus

kennytm and others added 11 commits March 28, 2018 03:03

Rollup merge of rust-lang#49407 - WiSaGaN:patch-1, r=alexcrichton

19fe9d1

Add back 1.24.1 release notes

Rollup merge of rust-lang#49426 - lukaslueg:patch-1, r=kennytm

605ea7c

Update CONTRIBUTING.md The current link is a 404, just link to the main repo page

Auto merge of rust-lang#49383 - nox:scalarpair, r=eddyb

bcffdf1

Allow niche-filling dataful variants to be represented as a ScalarPair r? @eddyb

Stabilize match_default_bindings

3c65f53

This includes a submodule update to rustfmt in order to allow a stable feature declaration.

Deprecate signed std::num::NonZeroI* with a call for use cases

3d64648

Make core::nonzero private

8adea83

It is now an implementation detail of ptr::NonNull and num::NonZero*

Remove unstable deprecated num::NonZeroI* types

d43ca37

SimonSapin force-pushed the private-core-nonzero branch from 4a661fd to d43ca37 Compare March 28, 2018 20:23

SimonSapin closed this Mar 30, 2018

SimonSapin pushed a commit that referenced this pull request Apr 20, 2018

Merge pull request #1 from rust-lang/master

5e94d54

Merge upstream changes

SimonSapin pushed a commit that referenced this pull request Oct 17, 2018

Merge pull request #1 from ubsan/ptr-docs

c44e88c

fix typos

SimonSapin pushed a commit that referenced this pull request Nov 11, 2018

Merge pull request #1 from rust-lang/master

fa76d42

sync fork with upstream (master)

SimonSapin pushed a commit that referenced this pull request Jan 17, 2019

Merge pull request #1 from Centril/redo-vec-set_len-docs-adjust

986e49d

Explain safety for `vec.set_len(0)`

SimonSapin pushed a commit that referenced this pull request May 6, 2019

Auto merge of rust-lang#59540 - Zoxc:the-arena-2, r=michaelwoerister

cfeb917

Use arenas to avoid Lrc in queries #1 Based on rust-lang#59536.

SimonSapin pushed a commit that referenced this pull request Jul 27, 2019

Avoid cloning Place in assign #1

b490032

SimonSapin pushed a commit that referenced this pull request Aug 16, 2019

Merge pull request #1 from rust-lang/master

fb3a013

Merge recent changes into master

SimonSapin pushed a commit that referenced this pull request Aug 19, 2019

Merge pull request #1 from Wind-River/vxworks_bpang_static

403e672

update for vxWorks

oli-obk pushed a commit that referenced this pull request Sep 20, 2019

Merge pull request #1 from rust-lang/master

92f08b7

Pull from newest repo

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make core::nonzero private #1

Make core::nonzero private #1

SimonSapin commented Feb 16, 2018

SimonSapin commented Feb 16, 2018

Make core::nonzero private #1

Make core::nonzero private #1

Conversation

SimonSapin commented Feb 16, 2018

SimonSapin commented Feb 16, 2018