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 8 pull requests #134492

Merged
merged 28 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
30f5a03
Move `tests/ui/associated-path-shl.rs` to `tests/ui/parser/`
jieyouxu Dec 17, 2024
4ca2d9f
Move `tests/ui/attempted-access-non-fatal.rs` to `tests/ui/typeck/`
jieyouxu Dec 17, 2024
0fc6be7
Adjust `tests/ui/attr-bad-crate-attr.rs`
jieyouxu Dec 17, 2024
88f8bf7
Adjust `tests/ui/attr-shebang.rs`
jieyouxu Dec 17, 2024
7424b89
Adjust `tests/ui/attr-usage-inline.rs`
jieyouxu Dec 17, 2024
836a0e0
Adjust `tests/ui/attrs-resolution-errors.rs`
jieyouxu Dec 17, 2024
47ad3b2
Adjust `tests/ui/attrs-resolution.rs`
jieyouxu Dec 17, 2024
bfd02d8
Improve testing coverage for `#[diagnostic::do_not_recommend]`
weiznich Oct 22, 2024
ecb6fd8
Check `#[diagnostic::do_not_recommend]` for arguments
weiznich Oct 23, 2024
dd31713
Stabilize `#[diagnostic::do_not_recommend]`
weiznich Oct 23, 2024
ad29947
Also warn against `#[diagnostic::do_not_recommend]` on plain impls
weiznich Oct 25, 2024
38ce731
canonicalizer: keep 'static in the param_env
lcnr Nov 26, 2024
6734a04
chore: fix some typos
acceptacross Dec 18, 2024
d5a0c5c
update new solver candidate assembly
lcnr Nov 26, 2024
f0ae48d
add tests
lcnr Nov 29, 2024
5fa4b09
resolve FIXME
lcnr Dec 18, 2024
19e44f4
Point at lint name instead of whole attr for gated lints
estebank Dec 18, 2024
0075869
Add nnethercote to the `triagebot.toml` vacation list.
nnethercote Dec 18, 2024
9839306
Update books
rustbot Dec 16, 2024
f8cd8c1
fix typo in ptr/mod.rs
Dec 19, 2024
e018796
Rollup merge of #132056 - weiznich:diagnostic_do_not_recommend_final_…
jhpratt Dec 19, 2024
4cd157e
Rollup merge of #133643 - lcnr:merge-candidates, r=compiler-errors
jhpratt Dec 19, 2024
fa75b4d
Rollup merge of #134388 - rustbot:docs-update, r=ehuss
jhpratt Dec 19, 2024
871c2d8
Rollup merge of #134418 - jieyouxu:ui-cleanup-3, r=compiler-errors
jhpratt Dec 19, 2024
0391770
Rollup merge of #134473 - acceptacross:master, r=compiler-errors
jhpratt Dec 19, 2024
033fbe0
Rollup merge of #134481 - estebank:unstable-lint-span, r=compiler-errors
jhpratt Dec 19, 2024
ba2ccc3
Rollup merge of #134484 - nnethercote:nnethercote-vacation, r=nnether…
jhpratt Dec 19, 2024
80cf85d
Rollup merge of #134490 - hong9lol:typo, r=jhpratt
jhpratt Dec 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adjust tests/ui/attrs-resolution-errors.rs
- Move `tests/ui/attrs-resolution-errors.rs` to `tests/ui/resolve/`.
- Document test intent.
- Rename test to `attr-macros-positional-rejection.rs` to better reflect
  test intent.
  • Loading branch information
jieyouxu committed Dec 17, 2024
commit 836a0e00e5d29b845748cf42713445076418473b
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
//! Check that certain positions (listed below) only permit *non-macro* attributes and reject
//! attribute macros:
//!
//! - Enum variants
//! - Struct fields
//! - Field in a struct pattern
//! - Match arm
//! - Field in struct initialization expression

enum FooEnum {
#[test]
//~^ ERROR expected non-macro attribute, found attribute macro
Expand Down Expand Up @@ -32,7 +41,7 @@ fn main() {
_ => {}
}

let _another_foo_strunct = FooStruct {
let _another_foo_struct = FooStruct {
#[test]
//~^ ERROR expected non-macro attribute, found attribute macro
bar: 1,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
error: expected non-macro attribute, found attribute macro `test`
--> $DIR/attrs-resolution-errors.rs:2:7
--> $DIR/attr-macros-positional-rejection.rs:11:7
|
LL | #[test]
| ^^^^ not a non-macro attribute

error: expected non-macro attribute, found attribute macro `test`
--> $DIR/attrs-resolution-errors.rs:8:7
--> $DIR/attr-macros-positional-rejection.rs:17:7
|
LL | #[test]
| ^^^^ not a non-macro attribute

error: expected non-macro attribute, found attribute macro `test`
--> $DIR/attrs-resolution-errors.rs:23:15
--> $DIR/attr-macros-positional-rejection.rs:32:15
|
LL | #[test] bar
| ^^^^ not a non-macro attribute

error: expected non-macro attribute, found attribute macro `test`
--> $DIR/attrs-resolution-errors.rs:30:11
--> $DIR/attr-macros-positional-rejection.rs:39:11
|
LL | #[test]
| ^^^^ not a non-macro attribute

error: expected non-macro attribute, found attribute macro `test`
--> $DIR/attrs-resolution-errors.rs:36:11
--> $DIR/attr-macros-positional-rejection.rs:45:11
|
LL | #[test]
| ^^^^ not a non-macro attribute
Expand Down