Skip to content
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.

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

Rollup of 9 pull requests #67352

Closed
wants to merge 24 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Dec 16, 2019

Successful merges:

Failed merges:

r? @ghost

CAD97 and others added 24 commits November 9, 2019 13:43
The comparison can be performed on the raw bytes, as the chars can
only match if their UTF8 encoding matches.

This avoids the `is_char_boundary` checks and translates to a straight
`u8` slice comparison which is optimized to a memcmp or inline
comparison where appropriate.
This enables constant folding when matching a literal char.

Fixes rust-lang#41993.
.gitignore should not ignore files that exist in the repository. The
ignore of .cargo applies to the committed .cargo directory used in an
example:

$ git ls-files --exclude-standard --ignored
src/test/run-make/thumb-none-qemu/example/.cargo/config

Explicitly un-ignore that file.
Make Layout::new const

This seems like a reasonable change to make. If we don't provide `Layout::new::<T>` as `const`, then users can just instead do the more error prone `Layout::from_size_align_unchecked(mem::size_of::<T>(), mem::align_of::<T>())` for the same effect and an extra `unsafe { }` incantation.
…-char, r=BurntSushi

Improve code generated for `starts_with(<literal char>)`

This PR includes two minor improvements to the code generated when checking for string prefix/suffix.

The first commit simplifies the str/str operation, by taking advantage of the raw UTF-8 representation.

The second commit replaces the current str/char matching logic with a char->str encoding and then the previous method.

The resulting code should be equivalent in the generic case (one char is being encoded versus one char being decoded), but it becomes easy to optimize in the case of a literal char, which in most cases a developer might expect to be at least as simple as that of a literal string.

This PR should fix rust-lang#41993
Delete flaky test net::tcp::tests::fast_rebind

This test is unreliable for at least 3 users on two platforms: see rust-lang#57509 and rust-lang#51006. It was added 5 years ago in rust-lang#22015. Do we know whether this is testing something important that would indicate a bug in our implementation, or if it's fine to remove?

r? @sfackler @alexcrichton because this somewhat resembles rust-lang#59018

Closes rust-lang#57509. Closes rust-lang#51006.
make transparent enums more ordinary

By recognizing that structs & unions have one variant, we can make the treatment of transparent enums less ad-hoc.

cc rust-lang#60405

r? @davidtwco
…n-DPC

Fix JS error when loading page with search

For example when you load this page: https://doc.rust-lang.org/nightly/std/num/struct.NonZeroI8.html?search=foo, you get a nice JS error:

```
TypeError: ev is undefined
```

r? @kinnison
…ted-files, r=Dylan-DPC

.gitignore: Don't ignore a file that exists in the repository

.gitignore should not ignore files that exist in the repository. The
ignore of .cargo applies to the committed .cargo directory used in an
example:

$ git ls-files --exclude-standard --ignored
src/test/run-make/thumb-none-qemu/example/.cargo/config

Explicitly un-ignore that file.
@Centril
Copy link
Contributor Author

Centril commented Dec 16, 2019

@bors r+ p=9 rollup=never

@bors
Copy link
Contributor

bors commented Dec 16, 2019

📌 Commit 175118f has been approved by Centril

@bors
Copy link
Contributor

bors commented Dec 16, 2019

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 16, 2019
@Centril
Copy link
Contributor Author

Centril commented Dec 16, 2019

@bors p=200

@Centril Centril added the rollup A PR which is a rollup label Dec 16, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-12-16T15:45:28.9692890Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-16T15:45:28.9712364Z ##[command]git config gc.auto 0
2019-12-16T15:45:28.9721782Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-16T15:45:28.9733527Z ##[command]git config --get-all http.proxy
2019-12-16T15:45:28.9739416Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67352/merge:refs/remotes/pull/67352/merge
---
2019-12-16T16:14:41.4184391Z    Compiling backtrace-sys v0.1.32
2019-12-16T16:14:41.5282737Z error: stable const functions must have either `rustc_const_stable` or `rustc_const_unstable` attribute
2019-12-16T16:14:41.5283245Z    --> src/libcore/alloc.rs:122:5
2019-12-16T16:14:41.5283508Z     |
2019-12-16T16:14:41.5283816Z 122 | /     pub const fn new<T>() -> Self {
2019-12-16T16:14:41.5284154Z 123 | |         let (size, align) = size_align::<T>();
2019-12-16T16:14:41.5284518Z 124 | |         // Note that the align is guaranteed by rustc to be a power of two and
2019-12-16T16:14:41.5284891Z 125 | |         // the size+align combo is guaranteed to fit in our address space. As a
2019-12-16T16:14:41.5285430Z 130 | |         }
2019-12-16T16:14:41.5285738Z 131 | |     }
2019-12-16T16:14:41.5285978Z     | |_____^
2019-12-16T16:14:41.5286010Z 
---
2019-12-16T16:14:43.5136752Z   local time: Mon Dec 16 16:14:43 UTC 2019
2019-12-16T16:14:43.8084033Z   network time: Mon, 16 Dec 2019 16:14:43 GMT
2019-12-16T16:14:43.8087878Z == end clock drift check ==
2019-12-16T16:14:46.6389293Z 
2019-12-16T16:14:46.6499357Z ##[error]Bash exited with code '1'.
2019-12-16T16:14:46.6540413Z ##[section]Starting: Checkout
2019-12-16T16:14:46.6564473Z ==============================================================================
2019-12-16T16:14:46.6564536Z Task         : Get sources
2019-12-16T16:14:46.6564592Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@tesuji tesuji mentioned this pull request Dec 16, 2019
@Centril Centril closed this Dec 16, 2019
@Centril Centril deleted the rollup-6uotc8t branch December 16, 2019 16:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants