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

bump ui_test to 0.22 #3279

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

bump ui_test to 0.22 #3279

wants to merge 2 commits into from

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jan 25, 2024

No description provided.

Comment on lines +95 to +96
// keep in sync with `./miri run`
config.comment_defaults.base().edition = Some(Spanned::dummy("2021".into())).into();
Copy link
Member

Choose a reason for hiding this comment

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

It's a bit unclear what should be kept in sync.

Suggested change
// keep in sync with `./miri run`
config.comment_defaults.base().edition = Some(Spanned::dummy("2021".into())).into();
let edition = "2021"; // keep in sync with `./miri run`
config.comment_defaults.base().edition = Some(Spanned::dummy(edition.into())).into();

But also... this is quite confusing, why do we need to Spanned everything?

@@ -66,8 +67,6 @@ fn test_config(target: &str, path: &str, mode: Mode, with_dependencies: bool) ->
}
}
program.args.push("-Zui-testing".into());
program.args.push("--target".into());
program.args.push(target.into());
Copy link
Member

Choose a reason for hiding this comment

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

From the CI errors, removing --target doesn't seem to be right.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yea ^^ looks like it

@RalfJung
Copy link
Member

@rustbot author

@rustbot rustbot added the S-waiting-on-author Status: Waiting for the PR author to address review comments label Feb 10, 2024
@bors
Copy link
Collaborator

bors commented Feb 23, 2024

☔ The latest upstream changes (presumably #3314) made this pull request unmergeable. Please resolve the merge conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: Waiting for the PR author to address review comments
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants