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

Relax a test to permit warnings to be emitted, too. #13415

Merged
merged 1 commit into from
Feb 7, 2024

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Feb 7, 2024

This change is necessary to allow rustc to actually start emitting the warning about the unused mut

See the test failure in rust-lang/rust#120550 (comment) for where this happens.

@rustbot
Copy link
Collaborator

rustbot commented Feb 7, 2024

r? @weihanglo

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 7, 2024
Comment on lines 32 to 35
.with_stderr_line_without(
&["[ERROR] could not compile `foo` (lib) due to 1 previous error"],
&[],
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before rust-lang/rust#120550:

error[E0308]: mismatched types
 --> src/lib.rs:8:35
  |
8 |                     let _x: u32 = "a";
  |                             ---   ^^^ expected `u32`, found `&str`
  |                             |
  |                             expected due to this

For more information about this error, try `rustc --explain E0308`.
error: could not compile `foo` (lib test) due to 1 previous error
warning: build failed, waiting for other jobs to finish...
error: could not compile `foo` (lib) due to 1 previous error

This is what we'll have after rust-lang/rust#120550:

error[E0308]: mismatched types
Error:  --> src/lib.rs:8:35
  |
8 |                     let _x: u32 = "a";
  |                             ---   ^^^ expected `u32`, found `&str`
  |                             |
  |                             expected due to this

warning: variable does not need to be mutable
Warning:  --> src/lib.rs:3:25
  |
3 |                     let mut x = 3;
  |                         ----^
  |                         |
  |                         help: remove this `mut`
  |
  = note: `#[warn(unused_mut)]` on by default

For more information about this error, try `rustc --explain E0308`.
warning: `foo` (lib) generated 1 warning
error: could not compile `foo` (lib) due to 1 previous error; 1 warning emitted
warning: build failed, waiting for other jobs to finish...
warning: `foo` (lib test) generated 1 warning (1 duplicate)
error: could not compile `foo` (lib test) due to 1 previous error; 1 warning emitted

I wonder if we could

Suggested change
.with_stderr_line_without(
&["[ERROR] could not compile `foo` (lib) due to 1 previous error"],
&[],
)
.with_stderr_contains("[ERROR] could not compile `foo` (lib) due to 1 previous error[..]")

And have a TODO for updating this after rust-lang/rust#120550 landed. (though not required since it's not the point of this test)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, that works.

This change is necessary to allow rustc to actually start emitting the warning about the unused `mut`
@oli-obk oli-obk force-pushed the relax_test_for_rustc_changes branch from a7bd71e to e60678f Compare February 7, 2024 15:16
@weihanglo
Copy link
Member

@bors r+

Thanks! I'll update the submodule shortly.

@bors
Copy link
Contributor

bors commented Feb 7, 2024

📌 Commit e60678f has been approved by weihanglo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 7, 2024
@bors
Copy link
Contributor

bors commented Feb 7, 2024

⌛ Testing commit e60678f with merge ccc84cc...

@bors
Copy link
Contributor

bors commented Feb 7, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing ccc84cc to master...

@bors bors merged commit ccc84cc into rust-lang:master Feb 7, 2024
21 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 7, 2024
Update cargo

14 commits in cdf84b69d0416c57ac9dc3459af80dfb4883d27a..ccc84ccec4b7340eb916aefda1cb3e2fe17d8e7b
2024-02-02 19:39:16 +0000 to 2024-02-07 15:37:49 +0000
- Relax a test to permit warnings to be emitted, too. (rust-lang/cargo#13415)
- test: disable lldb test as it requires privileges to run on macOS (rust-lang/cargo#13416)
- Update git2 (rust-lang/cargo#13412)
- fix: Switch more notes/warnings to lowercase (rust-lang/cargo#13410)
- Don't add the new package to workspace.members if there is no existing workspace in Cargo.toml. (rust-lang/cargo#13391)
- Remove build metadata from curl-sys version. (rust-lang/cargo#13401)
- Fix markdown line break in cargo-add (rust-lang/cargo#13400)
- Remove `package.documentation` from the “before publishing” list. (rust-lang/cargo#13398)
- chore(deps): update gix (rust-lang/cargo#13380)
- chore(deps): update compatible (rust-lang/cargo#13379)
- feat(update): Tell users when they are still behind (rust-lang/cargo#13372)
- docs(changelog): Slight cleanup (rust-lang/cargo#13396)
- Bump to 0.79.0; update changelog (rust-lang/cargo#13392)
- doc: `[package]` doesn't require `version` field (rust-lang/cargo#13390)

r? ghost
@rustbot rustbot added this to the 1.78.0 milestone Feb 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants