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 7 pull requests #81621

Closed

Conversation

henryboisdequin
Copy link
Contributor

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

camelid and others added 16 commits January 24, 2021 17:45
- Fix typos
- Add more information
- General cleanup
Also switches on formatting of the mir build module
Bless tests

Update with changes from comments
The highest-priority item is the *first* in the list, not the last.
See [this code][1] for more.

[this code]: /~https://github.com/rust-lang/rust/blob/0e63af5da3400ace48a0345117980473fd21ad73/compiler/rustc_mir_build/src/build/matches/mod.rs#L1334-L1335
Let io::copy reuse BufWriter buffers

This optimization will allow users to implicitly set the buffer size for io::copy by wrapping the writer into a `BufWriter` if the default block size is insufficient, which should fix rust-lang#49921

Due to min_specialization limitations this approach only works with `BufWriter` but not for `BufReader<R>` since `R` is unconstrained and thus the necessary specialization on `R: Read` is not always applicable. Once specialization becomes more powerful this optimization could be extended to look at the reader and writer side and use whichever buffer is larger.
Add error message for private fn

Attempts to add a more detailed error when a `const_evaluatable` fn from another scope is used inside of a scope which cannot access it.

r? ``@lcnr``
… r=varkor

Improve `rustc_mir_build::matches` docs

- Fix typos
- Add more information
- General cleanup
…chenkov

Move some tests to more reasonable directories - 3

cc rust-lang#73494
r? ``@petrochenkov``

/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-56202.rs <sup>/~https://github.com/rust-lang/rust/issues/56202</sup>: traits 1.008
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-69841.rs <sup>/~https://github.com/rust-lang/rust/issues/69841</sup>: for-loop-while 1.014
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-10763.rs <sup>/~https://github.com/rust-lang/rust/issues/10763</sup>: extern 1.016
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-50599.rs <sup>/~https://github.com/rust-lang/rust/issues/50599</sup>: resolve 1.018
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-6128.rs <sup>/~https://github.com/rust-lang/rust/issues/6128</sup>: traits 1.043
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-20616-8.rs <sup>/~https://github.com/rust-lang/rust/issues/20616</sup>: parser 1.045
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-46553.rs <sup>/~https://github.com/rust-lang/rust/issues/46553</sup>: consts 1.081
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-33140-hack-boundaries.rs <sup>/~https://github.com/rust-lang/rust/issues/33140</sup>: traits 1.101
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-25826.rs <sup>/~https://github.com/rust-lang/rust/issues/25826</sup>: consts 1.108
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-56488.rs <sup>/~https://github.com/rust-lang/rust/issues/56488</sup>: traits 1.110
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-58856-1.rs <sup>/~https://github.com/rust-lang/rust/issues/58856</sup>: parser 1.133
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-57819.rs <sup>/~https://github.com/rust-lang/rust/issues/57819</sup>: parser 1.138
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-54348.rs <sup>/~https://github.com/rust-lang/rust/issues/54348</sup>: consts 1.155
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-14309.rs <sup>/~https://github.com/rust-lang/rust/issues/14309</sup>: lint 1.160
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-4446.rs <sup>/~https://github.com/rust-lang/rust/issues/4446</sup>: threads-sendsync 1.203
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-53675-a-test-called-panic.rs <sup>/~https://github.com/rust-lang/rust/issues/53675</sup>: test-attrs 1.211
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-40231-2.rs <sup>/~https://github.com/rust-lang/rust/issues/40231</sup>: consts 1.213
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-22037.rs <sup>/~https://github.com/rust-lang/rust/issues/22037</sup>: associated-types 1.214
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-59029-2.rs <sup>/~https://github.com/rust-lang/rust/issues/59029</sup>: traits 1.219
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-18425.rs <sup>/~https://github.com/rust-lang/rust/issues/18425</sup>: consts 1.237
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-6157.rs <sup>/~https://github.com/rust-lang/rust/issues/6157</sup>: regions 1.238
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-33819.rs <sup>/~https://github.com/rust-lang/rust/issues/33819</sup>: borrowck 1.280
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-3683.rs <sup>/~https://github.com/rust-lang/rust/issues/3683</sup>: traits 1.283
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-8709.rs <sup>/~https://github.com/rust-lang/rust/issues/8709</sup>: macros 1.291
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-20616-9.rs <sup>/~https://github.com/rust-lang/rust/issues/20616</sup>: parser 1.293
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-64732.rs <sup>/~https://github.com/rust-lang/rust/issues/64732</sup>: parser 1.296
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-18655.rs <sup>/~https://github.com/rust-lang/rust/issues/18655</sup>: associated-types 1.305
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-32947.rs <sup>/~https://github.com/rust-lang/rust/issues/32947</sup>: simd 1.322
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-57198.rs <sup>/~https://github.com/rust-lang/rust/issues/57198</sup>: parser 1.342
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-10764-rpass.rs <sup>/~https://github.com/rust-lang/rust/issues/10764</sup>: extern 1.392
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-73541-2.rs <sup>/~https://github.com/rust-lang/rust/issues/73541</sup>: async-await 1.422
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-7970b.rs <sup>/~https://github.com/rust-lang/rust/issues/7970</sup>: parser 1.439
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-57684.rs <sup>/~https://github.com/rust-lang/rust/issues/57684</sup>: parser 1.512
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-33264.rs <sup>/~https://github.com/rust-lang/rust/issues/33264</sup>: llvm-asm 1.523
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-65284-suggest-generic-trait-bound.rs <sup>/~https://github.com/rust-lang/rust/issues/65284</sup>: suggestions 1.647
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-17458.rs <sup>/~https://github.com/rust-lang/rust/issues/17458</sup>: consts 1.711
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-56762.rs <sup>/~https://github.com/rust-lang/rust/issues/56762</sup>: consts 1.787
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-2216.rs <sup>/~https://github.com/rust-lang/rust/issues/2216</sup>: for-loop-while 1.856
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs <sup>/~https://github.com/rust-lang/rust/issues/45696</sup>: nll 2.009
/~https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-46036.rs <sup>/~https://github.com/rust-lang/rust/issues/46036</sup>: nll 2.059

``@petrochenkov`` Can you put a place holder (like `N/A`) for tests without GitHub issues? It is a lot easier to parse fixed sized rows.
Rename NLL* to Nll* accordingly to C-CASE

Given [C-CASE](https://rust-lang.github.io/api-guidelines/naming.html#casing-conforms-to-rfc-430-c-case), `NLLRegionVariableOrigin` and `NLL` are encouraged to be `NllRegionVariableOrigin` and `Nll` respectively.
Fix invalid camel case suggestion involving unicode idents

Follow up to rust-lang#77805.
@rustbot
Copy link
Collaborator

rustbot commented Feb 1, 2021

Error: Label rollup can only be set by Rust team members

Please let @rust-lang/release know if you're having trouble with this bot.

@henryboisdequin henryboisdequin deleted the rollup-vmvj9xq branch February 1, 2021 12:19
@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
configure: rust.channel         := nightly
configure: rust.debug-assertions := True
configure: llvm.assertions      := True
configure: dist.missing-tools   := True
configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
configure: writing `config.toml` in current directory
configure: 
configure: run `python /checkout/x.py --help`
configure: 
---
skip untracked path cpu-usage.csv during rustfmt invocations
skip untracked path src/doc/book/ during rustfmt invocations
skip untracked path src/doc/rust-by-example/ during rustfmt invocations
skip untracked path src/llvm-project/ during rustfmt invocations
Running `"/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/rustfmt" "--config-path" "/checkout" "--edition" "2018" "--unstable-features" "--skip-children" "--check" "/checkout/compiler/rustc_mir_build/src/build/expr/into.rs"` failed.
Diff in /checkout/compiler/rustc_mir_build/src/build/expr/into.rs at line 319:
                                         .field(n, ty)
If you're running `tidy`, try again with `--bless`. Or, if you just want to format code, run `./x.py fmt` instead.
                                         .into_place(this.hir.tcx(), this.hir.typeck_results()),
-                            },
+                            }
                         })
                         .collect()

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.