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.

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

Jump to bottom

Rollup of 6 pull requests #96414

Merged
merged 13 commits into from
Apr 26, 2022
Merged

Rollup of 6 pull requests #96414

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift click to select a range
c186460
Fix some confusing wording and improve slice-search-related docs
wooster0 Feb 19, 2022
3c1e166
Remove unused macro rules
est31 Apr 17, 2022
718f934
Remove .woff font files
GuillaumeGomez Apr 21, 2022
5c1965a
Update run-make test front-files from .woff to .woff2
GuillaumeGomez Apr 21, 2022
3587406
Better handle too many `#` recovery in raw str
estebank Apr 24, 2022
5165295
Delay bug when adjusting NeverToAny twice during diagnostic
PrestonFrom Apr 24, 2022
5863db0
do not consider two extern types to be similar
lcnr Apr 25, 2022
51b8684
Rollup merge of #90312 - r00ster91:search, r=Dylan-DPC
Dylan-DPC Apr 25, 2022
93db30a
Rollup merge of #96149 - est31:remove_unused_macro_matchers, r=petroc…
Dylan-DPC Apr 25, 2022
2381897
Rollup merge of #96279 - GuillaumeGomez:remove-woff-fonts, r=camelid,…
Dylan-DPC Apr 25, 2022
77031f3
Rollup merge of #96355 - estebank:issue-95030, r=compiler-errors
Dylan-DPC Apr 25, 2022
8038a9e
Rollup merge of #96379 - PrestonFrom:issue_96335, r=compiler-errors
Dylan-DPC Apr 25, 2022
f0b2dcc
Rollup merge of #96384 - lcnr:extern-types-similar, r=compiler-errors
Dylan-DPC Apr 25, 2022
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
Update run-make test front-files from .woff to .woff2
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Apr 21, 2022
commit 5c1965aa7deac8e3031875108c3bdb78776a991a
6 changes: 3 additions & 3 deletions src/test/run-make/emit-shared-files/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 14,7 @@ invocation-only:
[ -e $(INVOCATION_ONLY)/x/index.html ]
[ -e $(INVOCATION_ONLY)/theme-xxx.css ] # generated from z.css
! [ -e $(INVOCATION_ONLY)/storage-xxx.js ]
! [ -e $(INVOCATION_ONLY)/SourceSerif4-It.ttf.woff ]
! [ -e $(INVOCATION_ONLY)/SourceSerif4-It.ttf.woff2 ]

# FIXME: this probably shouldn't have a suffix
[ -e $(INVOCATION_ONLY)/y-xxx.css ]
Expand All @@ -24,7 24,7 @@ invocation-only:
toolchain-only:
$(RUSTDOC) -Z unstable-options --emit=toolchain-shared-resources --output $(TOOLCHAIN_ONLY) --resource-suffix=-xxx --extend-css z.css x.rs
[ -e $(TOOLCHAIN_ONLY)/storage-xxx.js ]
! [ -e $(TOOLCHAIN_ONLY)/SourceSerif4-It.ttf.woff ]
! [ -e $(TOOLCHAIN_ONLY)/SourceSerif4-It.ttf.woff2 ]
! [ -e $(TOOLCHAIN_ONLY)/search-index-xxx.js ]
! [ -e $(TOOLCHAIN_ONLY)/x/index.html ]
! [ -e $(TOOLCHAIN_ONLY)/theme.css ]
Expand All @@ -35,7 35,7 @@ toolchain-only:
all-shared:
$(RUSTDOC) -Z unstable-options --emit=toolchain-shared-resources,unversioned-shared-resources --output $(ALL_SHARED) --resource-suffix=-xxx --extend-css z.css x.rs
[ -e $(ALL_SHARED)/storage-xxx.js ]
[ -e $(ALL_SHARED)/SourceSerif4-It.ttf.woff ]
[ -e $(ALL_SHARED)/SourceSerif4-It.ttf.woff2 ]
! [ -e $(ALL_SHARED)/search-index-xxx.js ]
! [ -e $(ALL_SHARED)/settings.html ]
! [ -e $(ALL_SHARED)/x ]
Expand Down