forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#83731 - Dylan-DPC:rollup-v2z3gkt, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - rust-lang#83015 (Add regression tests for rust-lang#79825 and rust-lang#81555) - rust-lang#83699 (Add a regression test for issue-68830) - rust-lang#83700 (Fix documentation of conversion from String to OsString) - rust-lang#83711 (Clarify `--print target-list` is a rustc's option) - rust-lang#83712 (Update LLVM with another wasm simd fix) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
9 changed files
with
82 additions
and
11 deletions.
There are no files selected for viewing
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
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
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
Submodule llvm-project
updated
2 files
+1 −1 | llvm/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td | |
+2 −1 | llvm/test/MC/WebAssembly/simd-encodings.s |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
// force-host | ||
// no-prefer-dynamic | ||
#![crate_type = "proc-macro"] | ||
|
||
extern crate proc_macro; | ||
|
||
use proc_macro::TokenStream; | ||
|
||
#[proc_macro_attribute] | ||
pub fn assert_input(args: TokenStream, input: TokenStream) -> TokenStream { | ||
assert_eq!(input.to_string(), "trait Alias = Sized ;"); | ||
assert!(args.is_empty()); | ||
TokenStream::new() | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// check-pass | ||
// aux-build:issue-79825.rs | ||
#![feature(trait_alias)] | ||
|
||
extern crate issue_79825; | ||
|
||
#[issue_79825::assert_input] | ||
trait Alias = Sized; | ||
|
||
fn main() {} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
// check-pass | ||
// aux-build:test-macros.rs | ||
#![feature(stmt_expr_attributes, proc_macro_hygiene)] | ||
|
||
extern crate test_macros; | ||
|
||
use test_macros::identity_attr; | ||
|
||
#[identity_attr] | ||
fn main() { | ||
let _x; | ||
let y = (); | ||
#[identity_attr] | ||
_x = y; | ||
} |
23 changes: 23 additions & 0 deletions
23
src/test/ui/specialization/issue-68830-spurious-diagnostics.rs
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
// A regression test for #68830. This checks we don't emit | ||
// a verbose `conflicting implementations` error. | ||
|
||
#![feature(specialization)] | ||
#![allow(incomplete_features)] | ||
|
||
struct BadStruct { | ||
err: MissingType //~ ERROR: cannot find type `MissingType` in this scope | ||
} | ||
|
||
trait MyTrait<T> { | ||
fn foo(); | ||
} | ||
|
||
impl<T, D> MyTrait<T> for D { | ||
default fn foo() {} | ||
} | ||
|
||
impl<T> MyTrait<T> for BadStruct { | ||
fn foo() {} | ||
} | ||
|
||
fn main() {} |
9 changes: 9 additions & 0 deletions
9
src/test/ui/specialization/issue-68830-spurious-diagnostics.stderr
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
error[E0412]: cannot find type `MissingType` in this scope | ||
--> $DIR/issue-68830-spurious-diagnostics.rs:8:10 | ||
| | ||
LL | err: MissingType | ||
| ^^^^^^^^^^^ not found in this scope | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0412`. |