diff options
| author | bors <bors@rust-lang.org> | 2022-11-05 17:39:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-05 17:39:16 +0000 |
| commit | 371100b1fb811e604f7451eff3b06960587fe1af (patch) | |
| tree | 95bc243b8344a6f4efdccc70d7658bfa2974fcff /src/test/rustdoc | |
| parent | 6b8d9dd0a09851b3e4f400ddd1303857945be25d (diff) | |
| parent | e51e4a4ecf6c0b60bac71ac310b773c057e2cd1a (diff) | |
| download | rust-371100b1fb811e604f7451eff3b06960587fe1af.tar.gz rust-371100b1fb811e604f7451eff3b06960587fe1af.zip | |
Auto merge of #104017 - matthiaskrgr:rollup-k8i0j9m, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #101702 (rustdoc: add hash to filename of toolchain files) - #103920 (Move browser opening logic in `Builder`) - #103927 (Do not make typo suggestions when suggesting pattern matching) - #103972 (Remove an option and choose a behaviour-preserving default instead.) - #103988 (Fix search result bottom border color) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/static-root-path.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/rustdoc/static-root-path.rs b/src/test/rustdoc/static-root-path.rs index 08c055c5b8d..86928b0fb0a 100644 --- a/src/test/rustdoc/static-root-path.rs +++ b/src/test/rustdoc/static-root-path.rs @@ -1,18 +1,18 @@ // compile-flags:-Z unstable-options --static-root-path /cache/ // @has static_root_path/struct.SomeStruct.html -// @matchesraw - '"/cache/main\.js"' -// @!matchesraw - '"\.\./main\.js"' +// @matchesraw - '"/cache/main-' +// @!matchesraw - '"\.\./main' // @matchesraw - 'data-root-path="\.\./"' // @!matchesraw - '"/cache/search-index\.js"' pub struct SomeStruct; // @has src/static_root_path/static-root-path.rs.html -// @matchesraw - '"/cache/source-script\.js"' -// @!matchesraw - '"\.\./\.\./source-script\.js"' +// @matchesraw - '"/cache/source-script-' +// @!matchesraw - '"\.\./\.\./source-script' // @matchesraw - '"\.\./\.\./source-files.js"' // @!matchesraw - '"/cache/source-files\.js"' // @has settings.html -// @matchesraw - '/cache/settings\.js' -// @!matchesraw - '\./settings\.js' +// @matchesraw - '/cache/settings-' +// @!matchesraw - '\../settings' |