Skip to content

Commit 19399ca

Browse files
authored
Merge pull request #2121 from Kobzol/remove-regex-1.5.5
Remove `regex-1.5.5`
2 parents fce276d + 6c5b3e2 commit 19399ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+7
-26309
lines changed

ci/check-profiling.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ test -f results/eprintln-Test-helloworld-Check-Full
137137
test ! -s results/eprintln-Test-helloworld-Check-Full
138138

139139
# llvm-lines. `Debug` not `Check` because it doesn't support `Check` profiles.
140-
# Including both `helloworld` and `regex-1.5.5` benchmarks, as they exercise the
140+
# Including both `helloworld` and `regex-automata-0.4.8` benchmarks, as they exercise the
141141
# zero dependency and the greater than zero dependency cases, respectively, the
142142
# latter of which has broken before.
143143
RUST_BACKTRACE=1 RUST_LOG=raw_cargo_messages=trace,collector=debug,rust_sysroot=debug \
@@ -146,12 +146,12 @@ RUST_BACKTRACE=1 RUST_LOG=raw_cargo_messages=trace,collector=debug,rust_sysroot=
146146
--id Test \
147147
--profiles Debug \
148148
--cargo $bindir/cargo \
149-
--include helloworld,regex-1.5.5 \
149+
--include helloworld,regex-automata-0.4.8 \
150150
--scenarios Full
151151
test -f results/ll-Test-helloworld-Debug-Full
152152
grep -q "Lines.*Copies.*Function name" results/ll-Test-helloworld-Debug-Full
153-
test -f results/ll-Test-regex-1.5.5-Debug-Full
154-
grep -q "Lines.*Copies.*Function name" results/ll-Test-regex-1.5.5-Debug-Full
153+
test -f results/ll-Test-regex-automata-0.4.8-Debug-Full
154+
grep -q "Lines.*Copies.*Function name" results/ll-Test-regex-automata-0.4.8-Debug-Full
155155

156156
# llvm-ir. `Debug` not `Check` because it works better that way.
157157
RUST_BACKTRACE=1 RUST_LOG=raw_cargo_messages=trace,collector=debug,rust_sysroot=debug \

collector/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,14 @@ Finally, while most of the options you can pass to the collector are supported,
235235
the profilers used in the `profile_local` command are not. In Windows, the only currently supported
236236
profiler is the `self-profiler`.
237237

238-
As a complete example, let's run just the `regex-1.5.5` benchmark in the `Debug`
238+
As a complete example, let's run just the `regex-automata-0.4.8` benchmark in the `Debug`
239239
profile with self-profiling results available:
240240

241241
```pwsh
242242
$env:XPERF="C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\xperf.exe"
243243
$env:TRACELOG="C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\tracelog.exe"
244-
.\target\release\collector.exe bench_local $env:RUST_ORIGINAL --id Original --profiles Debug --include regex-1.5.5 --self-profile
245-
.\target\release\collector.exe bench_local $env:RUST_MODIFIED --id Modified --profiles Debug --include regex-1.5.5 --self-profile
244+
.\target\release\collector.exe bench_local $env:RUST_ORIGINAL --id Original --profiles Debug --include regex-automata-0.4.8 --self-profile
245+
.\target\release\collector.exe bench_local $env:RUST_MODIFIED --id Modified --profiles Debug --include regex-automata-0.4.8 --self-profile
246246
.\target\release\site.exe .\results.db
247247
```
248248

collector/compile-benchmarks/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ They mostly consist of real-world crates.
3737
types, constants, and functions, but relatively little normal code. Stresses the parser. A very widely-used crate.
3838
- **nalgebra-0.33.0**: A linear algebra library. It exercises the new trait solver
3939
in different ways than the old solver.
40-
- **regex-1.5.5**: A regular expression parser. Used by many Rust programs.
4140
- **regex-automata-0.4.8**: A regular expression matching engine. Used by `regex`, which is used by
4241
many Rust programs.
4342
- **ripgrep-14.1.1**: A line-oriented search tool. A widely-used utility, and a

collector/compile-benchmarks/REUSE.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,6 @@ path = "regex/**"
180180
SPDX-FileCopyrightText = "The Rust Project Developers (see https://thanks.rust-lang.org)"
181181
SPDX-License-Identifier = "MIT OR Apache-2.0"
182182

183-
[[annotations]]
184-
path = "regex-1.5.5/**"
185-
SPDX-FileCopyrightText = "The Rust Project Developers (see https://thanks.rust-lang.org)"
186-
SPDX-License-Identifier = "MIT OR Apache-2.0"
187-
188183
[[annotations]]
189184
path = "regex-automata-0.4.8/**"
190185
SPDX-FileCopyrightText = "The Rust Project Developers (see https://thanks.rust-lang.org)"

collector/compile-benchmarks/regex-1.5.5/.cargo_vcs_info.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

collector/compile-benchmarks/regex-1.5.5/.gitignore

Lines changed: 0 additions & 7 deletions
This file was deleted.

collector/compile-benchmarks/regex-1.5.5/0-compile-one.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

collector/compile-benchmarks/regex-1.5.5/1-is-valid-cap-letter.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

collector/compile-benchmarks/regex-1.5.5/2-Compiler-new.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

collector/compile-benchmarks/regex-1.5.5/3-reverse.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

collector/compile-benchmarks/regex-1.5.5/4-byte-frequencies.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

collector/compile-benchmarks/regex-1.5.5/5-Job.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

collector/compile-benchmarks/regex-1.5.5/6-println.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)