Rollup of 7 pull requests #70040
Merged
Rollup of 7 pull requests #70040
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For some reason the absolute paths were formatted differently on the
armhf-gnu target.
thread '<unnamed>' panicked at 'assertion failed: `(left == right)`
left: `"Backtrace [\n { fn: \"__rust_maybe_catch_panic\" },\n { fn: \"std::rt::lang_start_internal\", file: \"./rust/rt.rs\", line: 300 },\n { fn: \"std::rt::lang_start\", file: \"./rust/rt.rs\", line: 400 },\n]"`,
right: `"Backtrace [\n { fn: \"__rust_maybe_catch_panic\" },\n { fn: \"std::rt::lang_start_internal\", file: \"/rust/rt.rs\", line: 300 },\n { fn: \"std::rt::lang_start\", file: \"/rust/rt.rs\", line: 400 },\n]"`', src/libstd/backtrace.rs:486:5
Co-Authored-By: Dylan DPC <dylan.dpc@gmail.com>
Co-Authored-By: Dylan DPC <dylan.dpc@gmail.com>
`modern_and_legacy` -> `normalize_to_macro_rules`
…ddyb Refactor the `Qualif` trait This PR attempts to preserve the existing semantics of the `Qualif` trait while reducing its API to two significant methods with descriptive names, `in_any_value_of_ty` and `in_adt_inherently`. The other `in_*` methods have been made into free functions, since they should never be overloaded. Finally, I changed the bounds on the `in_local` argument to be less restrictive (`FnMut` instead of `Fn`), which addresses a FIXME in the const-checker. r? @eddyb cc @pnkfelix @oli-obk
Backtrace Debug tweaks
- Change Debug representation of disabled and unsupported backtraces to use \<placeholder\> style, same as what we do for debug printing locked mutexes and mutably borrowed refcells;
```diff
- Error { msg: "...", backtrace: disabled backtrace }
+ Error { msg: "...", backtrace: <disabled> }
```
- Remove quotes around unresolved symbol names;
```diff
- Backtrace [{ fn: "<unknown>" }]
+ Backtrace [{ fn: <unknown> }]
```
- Add quotes around file paths;
```diff
- Backtrace [{ fn: "krate::main", file: /path/to/main.rs, line: 10 }]
+ Backtrace [{ fn: "krate::main", file: "/path/to/main.rs", line: 10 }]
```
- Add test.
Make error message clearer about creating new module This is a partial improvement for rust-lang#69492
More Method -> AssocFn renaming r? @Centril @eddyb cc rust-lang#60163 Blocked on rust-lang#69674
…error-code-e0628, r=Dylan-DPC Add long error explanation for E0628 Add long explanation for the E0628 error code Part of rust-lang#61137 r? @GuillaumeGomez
…hewjasper resolve/hygiene: `macro_rules` are not "legacy" The "modern" vs "legacy" naming was introduced by jseyfried during initial implementation of macros 2.0. At this point it's clear that `macro_rules` are not going anywhere and won't be deprecated in the near future. So this PR changes the naming "legacy" (when it implies "macro_rules") to "macro_rules". This should also help people reading this code because it's wasn't obvious that "legacy" actually meant "macro_rules" in these contexts. The most contentious renaming here is probably ``` fn modern -> fn normalize_to_macros_2_0 fn modern_and_legacy -> fn normalize_to_macro_rules ``` Other alternatives that I could think of are `normalize_to_opaque`/`normalize_to_semitransparent`, or `strip_non_opaque`/`strip_transparent`, but they seemed less intuitive. The documentation to these functions can be found in `symbol.rs`. r? @matthewjasper
Make article_and_description primarily use def_kind r? @eddyb cc @matthewjasper
|
@bors r+ rollup=never p=7 |
|
📌 Commit d8dbb3c has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-azure |
This was referenced Mar 16, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
Qualiftrait #67335 (Refactor theQualiftrait)macro_rulesare not "legacy" #69989 (resolve/hygiene:macro_rulesare not "legacy")Failed merges:
r? @ghost