Skip to content

Commit 227f4c4

Browse files
committed
Auto merge of #10376 - joshtriplett:strip-no-off, r=alexcrichton
Remove `strip = "off"` (and undocumented `strip = "n"`/`strip = "no"`)
2 parents 8e48665 + b3e5782 commit 227f4c4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/cargo/core/profiles.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ fn merge_profile(profile: &mut Profile, toml: &TomlProfile) {
632632
profile.strip = match toml.strip {
633633
Some(StringOrBool::Bool(true)) => Strip::Named(InternedString::new("symbols")),
634634
None | Some(StringOrBool::Bool(false)) => Strip::None,
635-
Some(StringOrBool::String(ref n)) if is_off(n.as_str()) => Strip::None,
635+
Some(StringOrBool::String(ref n)) if n.as_str() == "none" => Strip::None,
636636
Some(StringOrBool::String(ref n)) => Strip::Named(InternedString::new(n)),
637637
};
638638
}

src/doc/src/reference/profiles.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ strip either symbols or debuginfo from a binary. This can be enabled like so:
106106
strip = "debuginfo"
107107
```
108108

109-
Other possible string values of `strip` are `none`, `symbols`, and `off`. The
110-
default is `none`.
109+
Possible string values of `strip` are `"none"`, `"debuginfo"`, and `"symbols"`.
110+
The default is `"none"`.
111111

112-
You can also configure this option with the two absolute boolean values
113-
`true` and `false`. The former enables `strip` at its higher level, `symbols`,
114-
while the latter disables `strip` completely.
112+
You can also configure this option with the boolean values `true` or `false`.
113+
`strip = true` is equivalent to `strip = "symbols"`. `strip = false` is
114+
equivalent to `strip = "none"` and disables `strip` completely.
115115

116116
[`-C strip` flag]: ../../rustc/codegen-options/index.html#strip
117117

0 commit comments

Comments
 (0)