Rollup of 9 pull requests #93048
Merged
Rollup of 9 pull requests #93048
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
Currently fails:
error: expected identifier, found `ToOwned`
--> src/test/ui/macros/macro-interpolation.rs:23:19
|
LL | <$type as $trait>::$name
| ^^^^^^ expected identifier
...
LL | let _: qpath!(ty, <str as ToOwned>::Owned);
| -----------------------------------
| |
| this macro call doesn't expand to a type
| in this macro invocation
Co-authored-by: Jubilee <46493976+workingjubilee@users.noreply.github.com>
PR rust-lang#93016 was merged with the stdarch submodule pointing to a commit in a PR branch and not in master. This was due to a circular dependency between the rust and stdarch changes which would cause the other to fail to build. cc rust-lang#75109
This switches to just use size, weight, and spacing to distinguish headings in the sidebar. We no longer use boxes, horizontal bars, or centering to distinguish headings. This makes it much easier to understand the hierarchy of headings, and reduces visual noise. I also refactored how the mobile topbar works. Previously, we tried to shift around elements from the sidebar to make the topbar. Now, the topbar gets its own elements, which can be styled on their own. This makes styling and reasoning about those elements simpler. Because the heading font sizes are bigger, increase the sidebar width slightly. As a very minor change, removed version from the "All types" page. It's now only on the crate page.
…woerister Implement raw-dylib support for windows-gnu Add support for `#[link(kind = "raw-dylib")]` on windows-gnu targets. Work around binutils's linker's inability to read import libraries produced by LLVM by calling out to the binutils `dlltool` utility to create an import library from a temporary .DEF file; this approach is effectively a slightly refined version of `@mati865's` earlier attempt at this strategy in PR rust-lang#88801. (In particular, this attempt at this strategy adds support for `#[link_ordinal(...)]` as well.) In support of rust-lang#58713.
Let qpath contain NtTy: `<$:ty as $:ty>::…`
Example:
```rust
macro_rules! m {
(<$type:ty as $trait:ty>::$name:ident) => {
<$type as $trait>::$name
};
}
fn main() {
let _: m!(<str as ToOwned>::Owned);
}
```
Previous behavior:
```console
error: expected identifier, found `ToOwned`
--> src/main.rs:3:19
|
3 | <$type as $trait>::$name
| ^^^^^^ expected identifier
...
8 | let _: m!(<str as ToOwned>::Owned);
| ---------------------------
| |
| this macro call doesn't expand to a type
| in this macro invocation
```
The <code>expected identifier, found \`ToOwned\`</code> error is particularly silly. I think it should be fine to accept this code as long as $trait is of the form `TyKind::Path(None, path)`; if it is any other kind of `NtTy`, we'll keep the same behavior as before.
…ubilee Improve SIMD casts * Allows `simd_cast` intrinsic to take `usize` and `isize` * Adds `simd_as` intrinsic, which is the same as `simd_cast` except for saturating float-to-int conversions (matching the behavior of `as`). cc `@workingjubilee`
Simplify and unify rustdoc sidebar styles Fixes rust-lang#59860 This switches to just use size, weight, and spacing to distinguish headings in the sidebar. We no longer use boxes, horizontal bars, or centering to distinguish headings. This makes it much easier to understand the hierarchy of headings, and reduces visual noise. I also refactored how the mobile topbar works. Previously, we tried to shift around elements from the sidebar to make the topbar. Now, the topbar gets its own elements, which can be styled on their own. This makes styling and reasoning about those elements simpler. Because the heading font sizes are bigger, increase the sidebar width slightly. As a very minor change, removed version from the "All types" page. It's now only on the crate page. struct - https://rustdoc.crud.net/jsha/cool-sidebar/std/vec/struct.Vec.html trait - https://rustdoc.crud.net/jsha/cool-sidebar/std/io/trait.Read.html crate - https://rustdoc.crud.net/jsha/cool-sidebar/std/index.html mod - https://rustdoc.crud.net/jsha/cool-sidebar/std/any/index.html macro - https://rustdoc.crud.net/jsha/cool-sidebar/std/macro.panic.html fn - https://rustdoc.crud.net/jsha/cool-sidebar/std/io/fn.stdin.html type alias - https://rustdoc.crud.net/jsha/cool-sidebar/std/io/type.Result.html keyword - https://rustdoc.crud.net/jsha/cool-sidebar/std/keyword.as.html primitive - https://rustdoc.crud.net/jsha/cool-sidebar/std/primitive.pointer.html r? `@GuillaumeGomez` cc `@camelid` [Discussed on Zulip](https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/sidebar.20headings). Note: This has a lot of smaller commits, but I plan to squash them before merging.
…ce, r=lcnr Directly use ConstValue for single literals in blocks Addresses the minimal repro in rust-lang#92186, but doesn't fix the underlying problem (which would be solved by solving the anon subst problem afaict). I do, however, think that it makes sense in general to treat single literals in anon blocks as const values directly, especially in light of the problem that the issue refers to (anon const evaluation being postponed until infer variables in substs can be resolved, which was introduced by rust-lang#90023), i.e. while we do get warnings for those unnecessary braces, we should try to avoid errors caused by those braces if possible.
Delete pretty printer tracing These are left over from 2011. I did not find these helpful at all in my work on https://github.com/dtolnay/prettyplease despite doing significant refactors to this code. Learning what these messages all refer to is harder than putting in your own messages to log exactly what is relevant to specifically the thing that you are working on debugging.
Remove some unused `Ord` derives based on `Span` Remove some `Ord`, `PartialOrd` derivations that rely on underlying ordering of `Span`. These ordering traits appear to be unused right now. If we're going to attempt to remove ordering traits from `Span` as suggested in rust-lang#90317 (comment), we might want to slowly remove code that depends on this ordering (as opposed to the all-at-once approach in rust-lang#90749 and rust-lang#90408). cc `@tmiasko` `@cjgillot`
fix typo in `max` description for f32/f64
Fix stdarch submodule pointing to commit outside tree PR rust-lang#93016 was merged with the stdarch submodule pointing to a commit in a PR branch and not in master. This was due to a circular dependency between the rust and stdarch changes which would cause the other to fail to build. cc rust-lang#75109
rustbot
added
T-compiler
|
@bors r+ rollup=never p=9 |
|
📌 Commit f851a84 has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
This was referenced Jan 19, 2022
|
Finished benchmarking commit (e5e2b0b): comparison url. Summary: This benchmark run did not return any relevant changes. If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf. @rustbot label: -perf-regression |
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:
<$:ty as $:ty>::…#91150 (Let qpath contain NtTy:<$:ty as $:ty>::…)Ordderives based onSpan#93018 (Remove some unusedOrdderives based onSpan)maxdescription for f32/f64 #93026 (fix typo inmaxdescription for f32/f64)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup