Skip to content

Rollup of 7 pull requests #106758

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.

Sign up for GitHub

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

Closed
Dylan-DPC wants to merge 19 commits into from
Closed

Rollup of 7 pull requests #106758

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ad79b20
std tests: use __OsLocalKeyInner from realstd
RalfJung Jan 9, 2023
1a99361
Revert "warn newer available version of the x tool"
DebugSteven Jan 11, 2023
0d834d9
keep --wrapper-version argument in x
DebugSteven Jan 11, 2023
4e30ad8
Reuse ErrorGuaranteed during relation
compiler-errors Dec 30, 2022
83fbc71
Filter impl and where-clause candidates that reference errors
compiler-errors Jan 1, 2023
24bb36e
Consolidate two almost duplicated fn info extraction routines
compiler-errors Dec 27, 2022
2024aa4
Make `&`-removal suggestion verbose
estebank Jan 2, 2023
ce83be4
Account for type params
estebank Jan 2, 2023
bb72117
fix rebase
estebank Jan 7, 2023
8b8cce1
Use the root trait predicate to determine whether to remove references
estebank Jan 9, 2023
48b7e2a
Stabilize `::{core,std}::pin::pin!`
danielhenrymantilla Oct 31, 2022
621d412
Fix invalid syntax in impl Trait parameter type suggestions for E0311
Dec 26, 2022
8fa79a1
Rollup merge of #103800 - danielhenrymantilla:stabilize-pin-macro, r=…
Dylan-DPC Jan 12, 2023
989503e
Rollup merge of #106167 - yanchen4791:issue-105544-fix, r=oli-obk
Dylan-DPC Jan 12, 2023
c09bd57
Rollup merge of #106171 - compiler-errors:consolidate-extract_callabl…
Dylan-DPC Jan 12, 2023
11e4a4f
Rollup merge of #106309 - compiler-errors:prefer-non-err-candidates, …
Dylan-DPC Jan 12, 2023
22001ef
Rollup merge of #106360 - estebank:remove-borrow-suggestion, r=compil…
Dylan-DPC Jan 12, 2023
40ccb98
Rollup merge of #106638 - RalfJung:realstd, r=thomcc
Dylan-DPC Jan 12, 2023
1c9e2d4
Rollup merge of #106733 - DebugSteven:revert-104552-warn-newer-x, r=j…
Dylan-DPC Jan 12, 2023
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
Revert "warn newer available version of the x tool"
  • Loading branch information
@DebugSteven
DebugSteven authored Jan 11, 2023
commit 1a993611d2f539eeea272694e5efbb30bdeff04e
21 changes: 10 additions & 11 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5034,18 +5034,18 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af"

[[package]]
name = "semver"
version = "1.0.14"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"
dependencies = [
"serde",
]

[[package]]
name = "serde"
version = "1.0.152"
version = "1.0.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
dependencies = [
"serde_derive",
]
Expand All @@ -5062,9 +5062,9 @@ dependencies = [

[[package]]
name = "serde_derive"
version = "1.0.152"
version = "1.0.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
dependencies = [
"proc-macro2",
"quote",
Expand All @@ -5082,9 +5082,9 @@ dependencies = [

[[package]]
name = "serde_json"
version = "1.0.91"
version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
dependencies = [
"indexmap",
"itoa",
Expand Down Expand Up @@ -5400,9 +5400,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"

[[package]]
name = "syn"
version = "1.0.107"
version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
dependencies = [
"proc-macro2",
"quote",
Expand Down Expand Up @@ -5576,7 +5576,6 @@ dependencies = [
"lazy_static",
"miropt-test-tools",
"regex",
"semver",
"termcolor",
"walkdir",
]
Expand Down
3 changes: 2 additions & 1 deletion src/bootstrap/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,8 @@ def main():
if len(sys.argv) > 1 and sys.argv[1] == 'help':
sys.argv = [sys.argv[0], '-h'] + sys.argv[2:]

help_triggered = len(sys.argv) == 1 or any(x in ["-h", "--help", "--version"] for x in sys.argv)
help_triggered = (
'-h' in sys.argv) or ('--help' in sys.argv) or (len(sys.argv) == 1)
try:
bootstrap(help_triggered)
if not help_triggered:
Expand Down
1 change: 0 additions & 1 deletion src/tools/tidy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ miropt-test-tools = { path = "../miropt-test-tools" }
lazy_static = "1"
walkdir = "2"
ignore = "0.4.18"
semver = "1.0.14"
termcolor = "1.1.3"

[[bin]]
Expand Down
1 change: 0 additions & 1 deletion src/tools/tidy/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,3 @@ pub mod ui_tests;
pub mod unit_tests;
pub mod unstable_book;
pub mod walk;
pub mod x_version;
4 changes: 1 addition & 3 deletions src/tools/tidy/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ fn main() {

let handle = s.spawn(|| {
let mut flag = false;
$p::check($($args, )* &mut flag);
$p::check($($args),* , &mut flag);
if (flag) {
bad.store(true, Ordering::Relaxed);
}
Expand Down Expand Up @@ -112,8 +112,6 @@ fn main() {
check!(alphabetical, &compiler_path);
check!(alphabetical, &library_path);

check!(x_version, &root_path, &cargo);

let collected = {
drain_handles(&mut handles);

Expand Down
65 changes: 0 additions & 65 deletions src/tools/tidy/src/x_version.rs
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/tools/x/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,6 @@ fn exec_or_status(command: &mut Command) -> io::Result<ExitStatus> {
}

fn main() {
match env::args().skip(1).next().as_deref() {
Some("--wrapper-version") => {
let version = env!("CARGO_PKG_VERSION");
println!("{}", version);
return;
}
_ => {}
}
let current = match env::current_dir() {
Ok(dir) => dir,
Err(err) => {
Expand Down