Skip to content

Commit

Permalink
Auto merge of #8739 - ehuss:normalize-raw-strings, r=alexcrichton
Browse files Browse the repository at this point in the history 
Normalize raw string indentation.

It has always slightly bugged me how strings were indented after rustfmt was run across the repo (#5176). This attempts to normalize the strings so that they open and close on the same column.  This only touches the `tests` directory.
  • Loading branch information
@bors
bors committed Sep 27, 2020
2 parents fd0628b + 6f8c7d5 commit fe0b844
Show file tree
Hide file tree
Showing 86 changed files with 12,666 additions and 12,629 deletions.
308 changes: 154 additions & 154 deletions tests/testsuite/alt_registry.rs
View file

Large diffs are not rendered by default.

666 changes: 333 additions & 333 deletions tests/testsuite/bad_config.rs
View file

Large diffs are not rendered by default.

676 changes: 345 additions & 331 deletions tests/testsuite/bench.rs
View file

Large diffs are not rendered by default.

2,124 changes: 1,063 additions & 1,061 deletions tests/testsuite/build.rs
View file

Large diffs are not rendered by default.

252 changes: 126 additions & 126 deletions tests/testsuite/build_plan.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,28 @@ fn cargo_build_plan_simple() {
.masquerade_as_nightly_cargo()
.with_json(
r#"
{
"inputs": [
"[..]/foo/Cargo.toml"
],
"invocations": [
{
"args": "{...}",
"cwd": "[..]/cit/[..]/foo",
"deps": [],
"env": "{...}",
"kind": null,
"links": "{...}",
"outputs": "{...}",
"package_name": "foo",
"package_version": "0.5.0",
"program": "rustc",
"target_kind": ["bin"],
"compile_mode": "build"
"inputs": [
"[..]/foo/Cargo.toml"
],
"invocations": [
{
"args": "{...}",
"cwd": "[..]/cit/[..]/foo",
"deps": [],
"env": "{...}",
"kind": null,
"links": "{...}",
"outputs": "{...}",
"package_name": "foo",
"package_version": "0.5.0",
"program": "rustc",
"target_kind": ["bin"],
"compile_mode": "build"
}
]
}
]
}
"#,
"#,
)
.run();
assert!(!p.bin("foo").is_file());
Expand All @@ -47,24 +47,24 @@ fn cargo_build_plan_single_dep() {
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
authors = []
version = "0.5.0"
[package]
name = "foo"
authors = []
version = "0.5.0"
[dependencies]
bar = { path = "bar" }
"#,
[dependencies]
bar = { path = "bar" }
"#,
)
.file(
"src/lib.rs",
r#"
extern crate bar;
pub fn foo() { bar::bar(); }
extern crate bar;
pub fn foo() { bar::bar(); }
#[test]
fn test() { foo(); }
"#,
#[test]
fn test() { foo(); }
"#,
)
.file("bar/Cargo.toml", &basic_manifest("bar", "0.0.1"))
.file("bar/src/lib.rs", "pub fn bar() {}")
Expand All @@ -73,49 +73,49 @@ fn cargo_build_plan_single_dep() {
.masquerade_as_nightly_cargo()
.with_json(
r#"
{
"inputs": [
"[..]/foo/Cargo.toml",
"[..]/foo/bar/Cargo.toml"
],
"invocations": [
{
"args": "{...}",
"cwd": "[..]/cit/[..]/foo",
"deps": [],
"env": "{...}",
"kind": null,
"links": "{...}",
"outputs": [
"[..]/foo/target/debug/deps/libbar-[..].rlib",
"[..]/foo/target/debug/deps/libbar-[..].rmeta"
],
"package_name": "bar",
"package_version": "0.0.1",
"program": "rustc",
"target_kind": ["lib"],
"compile_mode": "build"
},
{
"args": "{...}",
"cwd": "[..]/cit/[..]/foo",
"deps": [0],
"env": "{...}",
"kind": null,
"links": "{...}",
"outputs": [
"[..]/foo/target/debug/deps/libfoo-[..].rlib",
"[..]/foo/target/debug/deps/libfoo-[..].rmeta"
"inputs": [
"[..]/foo/Cargo.toml",
"[..]/foo/bar/Cargo.toml"
],
"package_name": "foo",
"package_version": "0.5.0",
"program": "rustc",
"target_kind": ["lib"],
"compile_mode": "build"
"invocations": [
{
"args": "{...}",
"cwd": "[..]/cit/[..]/foo",
"deps": [],
"env": "{...}",
"kind": null,
"links": "{...}",
"outputs": [
"[..]/foo/target/debug/deps/libbar-[..].rlib",
"[..]/foo/target/debug/deps/libbar-[..].rmeta"
],
"package_name": "bar",
"package_version": "0.0.1",
"program": "rustc",
"target_kind": ["lib"],
"compile_mode": "build"
},
{
"args": "{...}",
"cwd": "[..]/cit/[..]/foo",
"deps": [0],
"env": "{...}",
"kind": null,
"links": "{...}",
"outputs": [
"[..]/foo/target/debug/deps/libfoo-[..].rlib",
"[..]/foo/target/debug/deps/libfoo-[..].rmeta"
],
"package_name": "foo",
"package_version": "0.5.0",
"program": "rustc",
"target_kind": ["lib"],
"compile_mode": "build"
}
]
}
]
}
"#,
"#,
)
.run();
}
Expand All @@ -126,13 +126,13 @@ fn cargo_build_plan_build_script() {
.file(
"Cargo.toml",
r#"
[project]
[project]
name = "foo"
version = "0.5.0"
authors = ["wycats@example.com"]
build = "build.rs"
"#,
name = "foo"
version = "0.5.0"
authors = ["wycats@example.com"]
build = "build.rs"
"#,
)
.file("src/main.rs", r#"fn main() {}"#)
.file("build.rs", r#"fn main() {}"#)
Expand All @@ -142,56 +142,56 @@ fn cargo_build_plan_build_script() {
.masquerade_as_nightly_cargo()
.with_json(
r#"
{
"inputs": [
"[..]/foo/Cargo.toml"
],
"invocations": [
{
"args": "{...}",
"cwd": "[..]/cit/[..]/foo",
"deps": [],
"env": "{...}",
"kind": null,
"links": "{...}",
"outputs": "{...}",
"package_name": "foo",
"package_version": "0.5.0",
"program": "rustc",
"target_kind": ["custom-build"],
"compile_mode": "build"
},
{
"args": "{...}",
"cwd": "[..]/cit/[..]/foo",
"deps": [0],
"env": "{...}",
"kind": null,
"links": "{...}",
"outputs": [],
"package_name": "foo",
"package_version": "0.5.0",
"program": "[..]/build-script-build",
"target_kind": ["custom-build"],
"compile_mode": "run-custom-build"
},
{
"args": "{...}",
"cwd": "[..]/cit/[..]/foo",
"deps": [1],
"env": "{...}",
"kind": null,
"links": "{...}",
"outputs": "{...}",
"package_name": "foo",
"package_version": "0.5.0",
"program": "rustc",
"target_kind": ["bin"],
"compile_mode": "build"
"inputs": [
"[..]/foo/Cargo.toml"
],
"invocations": [
{
"args": "{...}",
"cwd": "[..]/cit/[..]/foo",
"deps": [],
"env": "{...}",
"kind": null,
"links": "{...}",
"outputs": "{...}",
"package_name": "foo",
"package_version": "0.5.0",
"program": "rustc",
"target_kind": ["custom-build"],
"compile_mode": "build"
},
{
"args": "{...}",
"cwd": "[..]/cit/[..]/foo",
"deps": [0],
"env": "{...}",
"kind": null,
"links": "{...}",
"outputs": [],
"package_name": "foo",
"package_version": "0.5.0",
"program": "[..]/build-script-build",
"target_kind": ["custom-build"],
"compile_mode": "run-custom-build"
},
{
"args": "{...}",
"cwd": "[..]/cit/[..]/foo",
"deps": [1],
"env": "{...}",
"kind": null,
"links": "{...}",
"outputs": "{...}",
"package_name": "foo",
"package_version": "0.5.0",
"program": "rustc",
"target_kind": ["bin"],
"compile_mode": "build"
}
]
}
]
}
"#,
"#,
)
.run();
}
Expand Down
Loading

0 comments on commit fe0b844

Please sign in to comment.