Skip to content

Commit 2aa1acd

Browse files
UebelAndreUebelAndre
authored
Merge branch 'main' into revert
2 parents 6475fa9 + 89aec55 commit 2aa1acd

25 files changed

+144
-107
lines changed

‎MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ use_repo(
6969
"buildkite_config",
7070
"generated_inputs_in_external_repo",
7171
"libc",
72+
"rtra",
73+
"rtra__serde-1.0.216",
74+
"rtra__serde_json-1.0.133",
7275
"rules_rust_test_load_arbitrary_tool",
7376
"rules_rust_toolchain_test_target_json",
74-
"t3p",
75-
"t3p__serde-1.0.215",
76-
"t3p__serde_json-1.0.133",
7777
)
7878

7979
bazel_dep(

‎WORKSPACE.bazel

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,3 @@ http_archive(
4949
#
5050
# load("@bazel_ci_rules//:rbe_repo.bzl", "rbe_preconfig")
5151
# rbe_preconfig(name = "buildkite_config", toolchain = "ubuntu2004-bazel-java11")
52-
53-
http_archive(
54-
name = "rules_testing",
55-
sha256 = "02c62574631876a4e3b02a1820cb51167bb9cdcdea2381b2fa9d9b8b11c407c4",
56-
strip_prefix = "rules_testing-0.6.0",
57-
url = "https://github.com/bazelbuild/rules_testing/releases/download/v0.6.0/rules_testing-v0.6.0.tar.gz",
58-
)
59-
60-
load("//test/3rdparty/crates:crates.bzl", test_crate_repositories = "crate_repositories")
61-
62-
test_crate_repositories()

‎test/deps.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
55
load("//test/generated_inputs:external_repo.bzl", "generated_inputs_in_external_repo")
66
load("//test/load_arbitrary_tool:load_arbitrary_tool_test.bzl", "load_arbitrary_tool_test")
7+
load("//test/rust_analyzer/3rdparty/crates:crates.bzl", rust_analyzer_test_crate_repositories = "crate_repositories")
78
load("//test/unit/toolchain:toolchain_test_utils.bzl", "rules_rust_toolchain_test_target_json_repository")
89

910
_LIBC_BUILD_FILE_CONTENT = """\
@@ -38,6 +39,7 @@ def rules_rust_test_deps(is_bzlmod = False):
3839

3940
direct_deps = load_arbitrary_tool_test()
4041
direct_deps.extend(generated_inputs_in_external_repo())
42+
direct_deps.extend(rust_analyzer_test_crate_repositories())
4143

4244
maybe(
4345
http_archive,

‎test/3rdparty/BUILD.bazel renamed to ‎test/rust_analyzer/3rdparty/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//crate_universe:defs.bzl", "crate", "crates_vendor")
1+
load("@rules_rust//crate_universe:defs.bzl", "crate", "crates_vendor")
22

33
package(default_visibility = ["//visibility:public"])
44

@@ -14,10 +14,10 @@ crates_vendor(
1414
version = "1",
1515
),
1616
},
17-
# Short for 'test 3rdparty'. Keep this short to reduce the risk to
18-
# bump into absolute path length issues on Windows. See:
17+
# Short for 'rust_test_rust_analyzer'. Keep this short to reduce
18+
# the risk to bump into absolute path length issues on Windows. See:
1919
# https://github.com/bazelbuild/rules_rust/issues/1120
20-
repository_name = "t3p",
20+
repository_name = "rtra",
2121
tags = ["manual"],
2222
vendor_path = "crates",
2323
)

‎test/3rdparty/crates/BUILD.bazel renamed to ‎test/rust_analyzer/3rdparty/crates/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//test/3rdparty:crates_vendor
6+
# bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
77
###############################################################################
88

99
package(default_visibility = ["//visibility:public"])
@@ -33,12 +33,12 @@ filegroup(
3333
# Workspace Member Dependencies
3434
alias(
3535
name = "serde",
36-
actual = "@t3p__serde-1.0.215//:serde",
36+
actual = "@rtra__serde-1.0.216//:serde",
3737
tags = ["manual"],
3838
)
3939

4040
alias(
4141
name = "serde_json",
42-
actual = "@t3p__serde_json-1.0.133//:serde_json",
42+
actual = "@rtra__serde_json-1.0.133//:serde_json",
4343
tags = ["manual"],
4444
)

‎test/3rdparty/crates/BUILD.itoa-1.0.14.bazel renamed to ‎test/rust_analyzer/3rdparty/crates/BUILD.itoa-1.0.14.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//test/3rdparty:crates_vendor
6+
# bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")

‎test/3rdparty/crates/BUILD.memchr-2.7.4.bazel renamed to ‎test/rust_analyzer/3rdparty/crates/BUILD.memchr-2.7.4.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//test/3rdparty:crates_vendor
6+
# bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")

‎test/3rdparty/crates/BUILD.proc-macro2-1.0.92.bazel renamed to ‎test/rust_analyzer/3rdparty/crates/BUILD.proc-macro2-1.0.92.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//test/3rdparty:crates_vendor
6+
# bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
@@ -83,8 +83,8 @@ rust_library(
8383
}),
8484
version = "1.0.92",
8585
deps = [
86-
"@t3p__proc-macro2-1.0.92//:build_script_build",
87-
"@t3p__unicode-ident-1.0.14//:unicode_ident",
86+
"@rtra__proc-macro2-1.0.92//:build_script_build",
87+
"@rtra__unicode-ident-1.0.14//:unicode_ident",
8888
],
8989
)
9090

‎test/3rdparty/crates/BUILD.quote-1.0.37.bazel renamed to ‎test/rust_analyzer/3rdparty/crates/BUILD.quote-1.0.37.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//test/3rdparty:crates_vendor
6+
# bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")
@@ -82,6 +82,6 @@ rust_library(
8282
}),
8383
version = "1.0.37",
8484
deps = [
85-
"@t3p__proc-macro2-1.0.92//:proc_macro2",
85+
"@rtra__proc-macro2-1.0.92//:proc_macro2",
8686
],
8787
)

‎test/3rdparty/crates/BUILD.ryu-1.0.18.bazel renamed to ‎test/rust_analyzer/3rdparty/crates/BUILD.ryu-1.0.18.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//test/3rdparty:crates_vendor
6+
# bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")

‎test/3rdparty/crates/BUILD.serde-1.0.215.bazel renamed to ‎test/rust_analyzer/3rdparty/crates/BUILD.serde-1.0.216.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//test/3rdparty:crates_vendor
6+
# bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
@@ -38,7 +38,7 @@ rust_library(
3838
crate_root = "src/lib.rs",
3939
edition = "2018",
4040
proc_macro_deps = [
41-
"@t3p__serde_derive-1.0.215//:serde_derive",
41+
"@rtra__serde_derive-1.0.216//:serde_derive",
4242
],
4343
rustc_flags = [
4444
"--cap-lints=allow",
@@ -87,9 +87,9 @@ rust_library(
8787
"@rules_rust//rust/platform:x86_64-unknown-none": [],
8888
"//conditions:default": ["@platforms//:incompatible"],
8989
}),
90-
version = "1.0.215",
90+
version = "1.0.216",
9191
deps = [
92-
"@t3p__serde-1.0.215//:build_script_build",
92+
"@rtra__serde-1.0.216//:build_script_build",
9393
],
9494
)
9595

@@ -144,7 +144,7 @@ cargo_build_script(
144144
"noclippy",
145145
"norustfmt",
146146
],
147-
version = "1.0.215",
147+
version = "1.0.216",
148148
visibility = ["//visibility:private"],
149149
)
150150

‎test/3rdparty/crates/BUILD.serde_derive-1.0.215.bazel renamed to ‎test/rust_analyzer/3rdparty/crates/BUILD.serde_derive-1.0.216.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//test/3rdparty:crates_vendor
6+
# bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
@@ -80,10 +80,10 @@ rust_proc_macro(
8080
"@rules_rust//rust/platform:x86_64-unknown-none": [],
8181
"//conditions:default": ["@platforms//:incompatible"],
8282
}),
83-
version = "1.0.215",
83+
version = "1.0.216",
8484
deps = [
85-
"@t3p__proc-macro2-1.0.92//:proc_macro2",
86-
"@t3p__quote-1.0.37//:quote",
87-
"@t3p__syn-2.0.90//:syn",
85+
"@rtra__proc-macro2-1.0.92//:proc_macro2",
86+
"@rtra__quote-1.0.37//:quote",
87+
"@rtra__syn-2.0.90//:syn",
8888
],
8989
)

‎test/3rdparty/crates/BUILD.serde_json-1.0.133.bazel renamed to ‎test/rust_analyzer/3rdparty/crates/BUILD.serde_json-1.0.133.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//test/3rdparty:crates_vendor
6+
# bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
@@ -84,11 +84,11 @@ rust_library(
8484
}),
8585
version = "1.0.133",
8686
deps = [
87-
"@t3p__itoa-1.0.14//:itoa",
88-
"@t3p__memchr-2.7.4//:memchr",
89-
"@t3p__ryu-1.0.18//:ryu",
90-
"@t3p__serde-1.0.215//:serde",
91-
"@t3p__serde_json-1.0.133//:build_script_build",
87+
"@rtra__itoa-1.0.14//:itoa",
88+
"@rtra__memchr-2.7.4//:memchr",
89+
"@rtra__ryu-1.0.18//:ryu",
90+
"@rtra__serde-1.0.216//:serde",
91+
"@rtra__serde_json-1.0.133//:build_script_build",
9292
],
9393
)
9494

‎test/3rdparty/crates/BUILD.syn-2.0.90.bazel renamed to ‎test/rust_analyzer/3rdparty/crates/BUILD.syn-2.0.90.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//test/3rdparty:crates_vendor
6+
# bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")
@@ -86,8 +86,8 @@ rust_library(
8686
}),
8787
version = "2.0.90",
8888
deps = [
89-
"@t3p__proc-macro2-1.0.92//:proc_macro2",
90-
"@t3p__quote-1.0.37//:quote",
91-
"@t3p__unicode-ident-1.0.14//:unicode_ident",
89+
"@rtra__proc-macro2-1.0.92//:proc_macro2",
90+
"@rtra__quote-1.0.37//:quote",
91+
"@rtra__unicode-ident-1.0.14//:unicode_ident",
9292
],
9393
)

‎test/3rdparty/crates/BUILD.unicode-ident-1.0.14.bazel renamed to ‎test/rust_analyzer/3rdparty/crates/BUILD.unicode-ident-1.0.14.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//test/3rdparty:crates_vendor
6+
# bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")

‎test/3rdparty/crates/alias_rules.bzl renamed to ‎test/rust_analyzer/3rdparty/crates/alias_rules.bzl

File renamed without changes.

‎test/3rdparty/crates/crates.bzl renamed to ‎test/rust_analyzer/3rdparty/crates/crates.bzl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
1212
load("@rules_rust//crate_universe/private:crates_vendor.bzl", "crates_vendor_remote_repository")
1313

1414
# buildifier: disable=bzl-visibility
15-
load("//test/3rdparty/crates:defs.bzl", _crate_repositories = "crate_repositories")
15+
load("//test/rust_analyzer/3rdparty/crates:defs.bzl", _crate_repositories = "crate_repositories")
1616

1717
def crate_repositories():
1818
"""Generates repositories for vendored crates.
@@ -22,11 +22,11 @@ def crate_repositories():
2222
"""
2323
maybe(
2424
crates_vendor_remote_repository,
25-
name = "t3p",
26-
build_file = Label("//test/3rdparty/crates:BUILD.bazel"),
27-
defs_module = Label("//test/3rdparty/crates:defs.bzl"),
25+
name = "rtra",
26+
build_file = Label("//test/rust_analyzer/3rdparty/crates:BUILD.bazel"),
27+
defs_module = Label("//test/rust_analyzer/3rdparty/crates:defs.bzl"),
2828
)
2929

30-
direct_deps = [struct(repo = "t3p", is_dev_dep = False)]
30+
direct_deps = [struct(repo = "rtra", is_dev_dep = False)]
3131
direct_deps.extend(_crate_repositories())
3232
return direct_deps

0 commit comments

Comments
 (0)